Merge lp:~artem-anufrij/noise/Bugfix-1318871 into lp:~elementary-apps/noise/trunk

[Artem Anufrij]

Allow changing the album art in the cache (not written to actual file yet)

[lp:~artem-anufrij/noise/Bugfix-1318871]

1683. By artem-anufrij on 2014-09-22

code cleaning... sorry for spam

[PerfectCarl (name-is-carl)]

The feature is very neat!
I don't know what the UI team thinks about it, but I like it.

That being said, I have remarks.

General
-------

Why did you use the CoverImporter and not the CoverCache?

You have the image for the album, so you don't need to re execute all the complicated cover import process but just to add the image to the cover cache and causes the album list to refresh.

Besides exposing the (now public) cover_importer is not a good idea.
It is best to simply add a new public method that would use the private member.

Formatting
----------

There must be a space between the function name and parenthesis.
  my_function () ;

[lp:~artem-anufrij/noise/Bugfix-1318871]

1684. By artem-anufrij on 2014-09-24

Switch from CoverImporter to CoverCache

1685. By artem-anufrij on 2014-09-24

Switch from CoverImporter to CoverCache

[Artem Anufrij (artem-anufrij)]

Sure! You are right!

Please check my changes!

Thank you for your feedback!

[Danielle Foré (danrabbit)]

Okay maybe I'm stupid, but I can't figure out how to add/change the album art

[Artem Anufrij (artem-anufrij)]

Hey Daniel,

look at this video:
https://bugs.launchpad.net/noise/+bug/1318871/+attachment/4211838/+files/Noise%20-%20Set%20custom%20album%20cover.ogv

[Victor Martinez (victored)]

I think the bug report was about writing a cover art image to the metadata tags. I don't see any code for that here.

review: Needs Information

[Artem Anufrij (artem-anufrij)]

It happens in the lines 271-306.

I hope I understand you correctly.

[Victor Martinez (victored)]

The code is actually just writing the new image to ~/.cache/noise/album-art-cache, which is where the program stores the cover arts retrieved from metadata tags and other sources such as Last FM.

These changes only affect the cover art displayed by Noise, and not the actual track metadata.

[Artem Anufrij (artem-anufrij)]

> These changes only affect the cover art displayed by Noise, and not the actual
> track metadata.

Yes, its correct. I have the bug description so understood.

[Cody Garver (codygarver)]

Needs trunk merged in and conflicts resolved

Code style violations throughout

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

Gody,
do you want to merge this branch? IE3 tag will not be updated In my solution only the cover in ./chache/....

It's ok for you?

[Artem Anufrij (artem-anufrij)]

I mean ID3-tag

[Cody Garver (codygarver)]

Yeah it's still an improvement, just detach the bug

[lp:~artem-anufrij/noise/Bugfix-1318871]

1686. By artem-anufrij on 2014-10-08

Resolve conflicts; Fixed code style

1687. By artem-anufrij on 2014-10-08

Fixed code style (spaces)

=== modified file 'src/FileOperator.vala'
--- src/FileOperator.vala	2014-08-07 12:05:52 +0000
+++ src/FileOperator.vala	2014-10-08 16:33:46 +0000
@@ -387,4 +387,4 @@
             return false;
         });
     }
-}
+}
\ No newline at end of file

=== modified file 'src/GStreamer/CoverImport.vala'
--- src/GStreamer/CoverImport.vala	2014-04-27 20:50:28 +0000
+++ src/GStreamer/CoverImport.vala	2014-10-08 16:33:46 +0000
@@ -21,7 +21,7 @@
  *              Corentin Noël <[e-mail]>
  */
 
-public class Noise.CoverImport : GLib.Object {
+public class Noise.CoverImport : GLib.Object {    
     private const int DISCOVER_SET_SIZE = 50;
     private const int DISCOVERER_TIMEOUT_MS = 10;
 
@@ -36,37 +36,40 @@
         original_queue = new Gee.LinkedList<Media> ();
     }
 
-    private void file_set_finished () {
-        if (cancelled) {
-            debug ("import cancelled");
-            d.stop ();
-            libraries_manager.local_library.media_imported (original_queue);
-            original_queue.clear ();
-        } else if (uri_queue.size == 0) {
-            debug ("queue finished");
-            d.stop ();
-            libraries_manager.local_library.media_imported (original_queue);
-            original_queue.clear ();
-        } else {
-            import_next_file_set.begin ();
-        }
-    }
-
-    private async void import_next_file_set () {
+    private void initialize_discoverer () {
         if (d == null) {
             try {
                 d = new Gst.PbUtils.Discoverer ((Gst.ClockTime) (10 * Gst.SECOND));
             } catch (Error err) {
                 critical ("Could not create Gst discoverer object: %s", err.message);
             }
-
             d.discovered.connect (import_media);
             d.finished.connect (file_set_finished);
         } else {
             d.stop ();
         }
         d.start ();
-
+    }
+
+    private void file_set_finished () {
+        if (cancelled) {
+            debug ("import cancelled");
+            d.stop ();
+            libraries_manager.local_library.media_imported (original_queue);
+            original_queue.clear ();
+        } else if (uri_queue.size == 0) {
+            debug ("queue finished");
+            d.stop ();
+            libraries_manager.local_library.media_imported (original_queue);
+            original_queue.clear ();
+        } else {
+            import_next_file_set.begin ();
+        }
+    }
+
+    private async void import_next_file_set () {
+        this.initialize_discoverer ();
+        
         for (int i = 0; i < DISCOVER_SET_SIZE; i++) {
             bool not_found = true;
             string uri = null;
@@ -79,7 +82,7 @@
             }
         }
     }
-
+   
     public void cancel_operations () {
         cancelled = true;
     }
@@ -163,7 +166,7 @@
 
         if (gstreamer_discovery_successful) {
             var m = libraries_manager.local_library.media_from_uri (uri);
-
+            
             // Get cover art
             if (m != null)
                 yield import_art_async (m, info);
@@ -178,9 +181,9 @@
 
         debug ("Importing cover art for: %s", info.get_uri ());
 
-        var pix = get_image (info.get_tags ());
-
-        if (pix != null)
+        var pix = get_image (info.get_tags ());     
+        
+        if (pix != null) 
             yield cache.cache_image_async (m, pix);
         else
             debug ("Could not find embedded image for '%s'", info.get_uri ());

=== modified file 'src/Objects/CoverartCache.vala'
--- src/Objects/CoverartCache.vala	2013-08-17 04:38:12 +0000
+++ src/Objects/CoverartCache.vala	2014-10-08 16:33:46 +0000
@@ -223,4 +223,4 @@
 
         return image_file;
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Views/GridView/PopupListView.vala'
--- src/Views/GridView/PopupListView.vala	2014-09-27 22:36:25 +0000
+++ src/Views/GridView/PopupListView.vala	2014-10-08 16:33:46 +0000
@@ -22,15 +22,18 @@
     public const int MIN_SIZE = 500;
 
     ViewWrapper view_wrapper;
-
+    Gtk.Image album_cover;
     Gtk.Label album_label;
     Gtk.Label artist_label;
+    
+    Gtk.Menu cover_action_menu;
+    Gtk.MenuItem cover_set_new;
+    
     Granite.Widgets.Rating rating;
-
     GenericList list_view;
 
     Gee.Collection<Media> media_list;
-
+    
     public PopupListView (GridView grid_view) {
         this.delete_event.connect (hide_on_delete);
         window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
@@ -42,10 +45,27 @@
         this.view_wrapper = grid_view.parent_view_wrapper;
         
         set_transient_for (App.main_window);
-        App.main_window.close_subwindows.connect (() => {this.hide_on_delete ();});
+        App.main_window.close_subwindows.connect (() => { this.hide_on_delete (); });
         destroy_with_parent = true;
         skip_taskbar_hint = true;
-
+        
+        // cover        
+        album_cover = new Gtk.Image ();
+        album_cover.margin_left = album_cover.margin_bottom = 12;
+        
+        Gtk.EventBox cover_event_box = new Gtk.EventBox ();
+        cover_event_box.add (album_cover);
+        
+        cover_action_menu = new Gtk.Menu ();
+      
+        cover_set_new = new Gtk.MenuItem.with_label (_("Set new album cover"));
+        cover_set_new.activate.connect (() => { this.set_new_cover(); });
+        
+        cover_action_menu.append (cover_set_new);
+        cover_action_menu.show_all ();
+        
+        cover_event_box.button_press_event.connect (show_cover_context_menu);
+        
         // album artist/album labels
         album_label = new Gtk.Label ("");
         artist_label = new Gtk.Label ("");
@@ -82,12 +102,20 @@
 
         // Add everything
         Gtk.Box content = get_content_area () as Gtk.Box;
-        content.pack_start (album_label, false, true, 0);
-        content.pack_start (artist_label, false, true, 0);
+        Gtk.Box header = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        Gtk.Box artist = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+
+        artist.pack_start (artist_label, false, true, 0);
+        artist.pack_start (album_label, false, true, 0);
+
+        header.pack_start (cover_event_box, false, false);
+        header.pack_start (artist, true, false);        
+
+        content.pack_start (header, false, true, 0);
         content.pack_start (list_view_scrolled, true, true, 0);
-        content.pack_start(rating, false, true, 0);
+        content.pack_start (rating, false, true, 0);
 
-        rating.rating_changed.connect(rating_changed);
+        rating.rating_changed.connect (rating_changed);
     }
 
     /**
@@ -104,10 +132,19 @@
         media_list = new Gee.LinkedList<Media> ();
         list_view.set_media (media_list);
 
+        album_cover.set_from_pixbuf (CoverartCache.instance.get_cover (new Media ("")));
+
         // Reset size request
         set_size (MIN_SIZE);
     }
 
+    public bool show_cover_context_menu (Gtk.Widget sender, Gdk.EventButton evt) {
+        if (evt.type == Gdk.EventType.BUTTON_PRESS && evt.button == 3)
+            cover_action_menu.popup (null, null, null, evt.button, evt.time);
+        
+        return true;
+    }
+
     public void set_parent_wrapper (ViewWrapper parent_wrapper) {
         this.view_wrapper = parent_wrapper;
         this.list_view.set_parent_wrapper (parent_wrapper);
@@ -115,8 +152,8 @@
 
     public void set_album (Album album) {
         reset ();
-
-        lock(media_list) {
+        
+        lock (media_list) {
 
             string name = album.get_display_name ();
             string artist = album.get_display_artist ();
@@ -124,6 +161,8 @@
             string title_format = C_("Title format used on Album View Popup: $ALBUM by $ARTIST", "%s by %s");
             set_title (title_format.printf (name, artist));
             
+            
+            show_album_cover (CoverartCache.instance.get_album_cover (album));
             album_label.set_label (name);
             artist_label.set_label (artist);
             
@@ -137,7 +176,6 @@
 
             // Search again to match the view wrapper's search
             list_view.do_search (App.main_window.searchField.text);
-
         }
 
         if (list_view.get_realized ())
@@ -148,10 +186,16 @@
         view_wrapper.library.media_updated.connect (update_album_rating);
     }
 
+    void show_album_cover (Gdk.Pixbuf pixbuf)
+    {
+        var cover_art_with_shadow = PixbufUtils.render_pixbuf_shadow (pixbuf);
+        album_cover.set_from_pixbuf (cover_art_with_shadow);
+    }
+
     void update_album_rating () {
         // We don't want to set the overall_rating as each media's rating.
         // See rating_changed() in case you want to figure out what would happen.
-        rating.rating_changed.disconnect(rating_changed);
+        rating.rating_changed.disconnect (rating_changed);
 
         // Use average rating for the album
         int total_rating = 0, n_media = 0;
@@ -173,7 +217,7 @@
 
     void rating_changed (int new_rating) {
         var updated = new Gee.LinkedList<Media> ();
-        lock(media_list) {
+        lock (media_list) {
 
             foreach (var media in media_list) {
                 if (media == null)
@@ -212,6 +256,35 @@
             }
         }
     }
+    
+    private void set_new_cover ()
+    {
+        var file = new Gtk.FileChooserDialog (_("Open"), this, Gtk.FileChooserAction.OPEN,
+            _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
+
+        var image_filter = new Gtk.FileFilter ();
+        image_filter.set_filter_name (_("Image files"));
+        image_filter.add_mime_type ("image/*");
+
+        file.add_filter (image_filter);
+
+        if (file.run () == Gtk.ResponseType.ACCEPT) {
+            Gdk.Pixbuf pix = null;
+            try {
+                pix = new Gdk.Pixbuf.from_file (file.get_filename ());
+            } catch (Error err) {
+                debug ("Set new cover failed: %s", err.message); 
+            }
+            
+            if (pix != null) {
+                CoverartCache cache =  CoverartCache.instance;
+                cache.changed.connect (() => { show_album_cover (cache.get_cover (media_list.to_array () [0])); });
+                cache.cache_image_async (media_list.to_array () [0], pix);
+            }
+        }
+        
+        file.destroy ();
+    }
 
     /**
      * Force squared layout