Merge lp:~stolowski/unity-lens-music/missing-cover-icon into lp:unity-lens-music

[Paweł Stołowski]

Use new icons when album cover is missing.

Use new icons when album cover is missing.

[lp:~stolowski/unity-lens-music/missing-cover-icon]

103. By Paweł Stołowski on 2012-09-13

Use u1-service icon for the 'Download' button in the preview.

[Michal Hruby (mhr3)]

93 +<<<<<<< TREE
94 var download_action = new Unity.PreviewAction ("download_album", _("Download"), null);
95 if (album.formatted_price != null)
96 download_action.extra_text = album.formatted_price;
97 +=======
98 + GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
99 + var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
100 +>>>>>>> MERGE-SOURCE

Uh oh :(

review: Needs Fixing

[lp:~stolowski/unity-lens-music/missing-cover-icon]

104. By Paweł Stołowski on 2012-09-14

Merged trunk.

[Paweł Stołowski (stolowski)]

Fixed the conflict.

=== modified file 'src/banshee-collection.vala'
--- src/banshee-collection.vala	2012-07-17 15:36:44 +0000
+++ src/banshee-collection.vala	2012-09-14 16:04:19 +0000
@@ -109,6 +109,8 @@
 	  break;
 	case Sqlite.ROW:
       string artwork_path = get_album_artwork_path (stmt.column_text (ALBUM_ARTWORKID));
+      if (artwork_path == null || artwork_path == "" || !FileUtils.test(artwork_path, FileTest.EXISTS))
+          artwork_path = ALBUM_MISSING_ICON_PATH;
 
       Track track = new Track ();
 	  track.title = stmt.column_text (TRACK_TITLE);
@@ -126,8 +128,8 @@
 	  uint category_id = Category.SONGS;
 	  if (category_override >= 0)
 	    category_id = category_override;
-
-	  helper_model.append (track.uri, track.artwork_path, category_id,
+      
+	  helper_model.append (track.uri, artwork_path, category_id,
                                track.mime_type, track.title, track.artist,
                                track.uri);
 
@@ -169,17 +171,12 @@
     }
 
     /**
-     * Computes path for album artwork; checks if cover file exists, defaults to generic audio icon.
+     * Computes path for album artwork.
      */
     private string get_album_artwork_path (string artwork_id)
     {
         string album_art_dir = "%s/media-art/".printf (Environment.get_user_cache_dir ());
         string artwork_path = "%s/%s.jpg".printf (album_art_dir, artwork_id);
-        File artwork_file = File.new_for_path (artwork_path);
-        if (!artwork_file.query_exists ())
-        {
-            artwork_path = "audio-x-generic";
-        }
         return artwork_path;
     }
 

=== modified file 'src/banshee-scope.vala'
--- src/banshee-scope.vala	2012-09-13 14:56:05 +0000
+++ src/banshee-scope.vala	2012-09-14 16:04:19 +0000
@@ -53,7 +53,8 @@
     public Unity.Preview preview (string uri)
     {
         Unity.MusicPreview? preview = null;
-        GLib.ThemedIcon? icon_file = null;
+        GLib.Icon? icon_file = null;
+        GLib.Icon? missing_icon_file = new GLib.FileIcon (File.new_for_path (ALBUM_MISSING_PREVIEW_ICON_PATH));
 
         if (Uri.parse_scheme (uri) == "album")
         {
@@ -65,10 +66,10 @@
             {
                 if (preview == null)
                 {
-                    if (track.artwork_path != null)
-                    {
+                    if (track.artwork_path != null && track.artwork_path != "" && FileUtils.test(track.artwork_path, FileTest.EXISTS))
                         icon_file = new GLib.ThemedIcon(track.artwork_path);
-                    }
+                    else
+                        icon_file = missing_icon_file;
                     preview = new Unity.MusicPreview (title, artist, icon_file);
                 }
                 var tm = new Unity.TrackMetadata();
@@ -84,10 +85,10 @@
             Track? track = collection.get_album_track (uri);
             if (track != null)
             {
-                if (track.artwork_path != null)
-                {
+                if (track.artwork_path != null && track.artwork_path != "" && FileUtils.test(track.artwork_path, FileTest.EXISTS))
                     icon_file = new GLib.ThemedIcon(track.artwork_path);
-                }
+                else
+                    icon_file = missing_icon_file;
                 preview = new Unity.MusicPreview (track.title, track.artist, icon_file);
                 var tm = new Unity.TrackMetadata();
                 tm.uri = track.uri;

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2012-09-13 14:56:05 +0000
+++ src/musicstore-scope.vala	2012-09-14 16:04:19 +0000
@@ -171,7 +171,8 @@
           }
         }
 
-        var download_action = new Unity.PreviewAction ("download_album", _("Download"), null);
+        GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
+        var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
         if (album.formatted_price != null)
             download_action.extra_text = album.formatted_price;
         download_action.activated.connect (download_album);

=== modified file 'src/rhythmbox-collection.vala'
--- src/rhythmbox-collection.vala	2012-08-17 09:11:28 +0000
+++ src/rhythmbox-collection.vala	2012-09-14 16:04:19 +0000
@@ -23,6 +23,9 @@
 
 namespace Unity.MusicLens
 {
+    const string UNITY_ICON_PATH = Config.PKGDATADIR + "/6";
+    const string ALBUM_MISSING_ICON_PATH = UNITY_ICON_PATH + "/album_missing.png";
+    const string ALBUM_MISSING_PREVIEW_ICON_PATH = UNITY_ICON_PATH + "/album_missing_preview.png";
 
     private enum Columns
     {
@@ -535,8 +538,6 @@
             string albumart = get_albumart (track);
             if (albumart != null)
               track.artwork_path = albumart;
-            else
-              track.artwork_path = "audio-x-generic";
 
             prepare_row_buffer (track);
             var iter = all_tracks.append_row (row_buffer);
@@ -605,21 +606,26 @@
               artist = model.get_string (iter, Columns.ARTIST);
 
             var album_art_string = check_album_art_tdb (artist, album);
-            if (album_art_string != null)
+            if (album_art_string != null && album_art_string != "")
             {
               string filename;
               filename = Path.build_filename (Environment.get_user_cache_dir (),
                                               "rhythmbox", "album-art",
                                               album_art_string);
               album_art_string = FileUtils.test (filename, FileTest.EXISTS) ?
-                filename : "audio-x-generic";
+                filename : ALBUM_MISSING_ICON_PATH;
+            }
+            else
+            {
+              album_art_string = ALBUM_MISSING_ICON_PATH;
+            }
 
-              if (album_art_string != model.get_string (iter, Columns.ARTWORK))
-              {
-                model.set_value (iter, Columns.ARTWORK,
-                                 cached_variant_for_string (album_art_string));
-              }
+            if (album_art_string != model.get_string (iter, Columns.ARTWORK))
+            {
+              model.set_value (iter, Columns.ARTWORK,
+                               cached_variant_for_string (album_art_string));
             }
+            
             album_art_tag[model, iter] = current_album_art_tag;
           }
 
@@ -646,8 +652,11 @@
             uri = "album://%s".printf (album_key);
           }
 
+          var artwork = model.get_string (iter, Columns.ARTWORK);
+          if (artwork == null || artwork == "")
+            artwork = ALBUM_MISSING_ICON_PATH;
           results_model.append (uri,
-                                model.get_string (iter, Columns.ARTWORK),
+                                artwork,
                                 category_id,
                                 model.get_string (iter, Columns.MIMETYPE),
                                 title,

=== modified file 'src/rhythmbox-scope.vala'
--- src/rhythmbox-scope.vala	2012-09-13 14:56:05 +0000
+++ src/rhythmbox-scope.vala	2012-09-14 16:04:19 +0000
@@ -76,7 +76,8 @@
     public Unity.Preview preview (string uri)
     {
       music_preview = null;
-      GLib.ThemedIcon? icon_file = null;
+      GLib.Icon? icon_file = null;
+      GLib.Icon? missing_icon_file = new GLib.FileIcon (File.new_for_path (ALBUM_MISSING_PREVIEW_ICON_PATH));
       
       if (Uri.parse_scheme (uri) == "album")
       {
@@ -86,10 +87,12 @@
         {
           if (music_preview == null)
           {
-            if (track.artwork_path != null)
-            {
-              icon_file = new GLib.ThemedIcon(track.artwork_path);
-            }
+            var artwork_path = track.artwork_path;
+            if (artwork_path == null || artwork_path == "")
+              icon_file = missing_icon_file;
+            else
+              icon_file = new GLib.FileIcon(File.new_for_path (artwork_path));
+           
             music_preview = new Unity.MusicPreview (track.album, track.album_artist, icon_file);
 
             var play_action = new Unity.PreviewAction ("play_album", _("Play"), null);
@@ -113,10 +116,11 @@
         Track? track = collection.get_album_track (uri);
         if (track != null)
         {
-          if (track.artwork_path != null)
-          {
-            icon_file = new GLib.ThemedIcon(track.artwork_path);
-          }
+          var artwork_path = track.artwork_path;
+          if (artwork_path == null || artwork_path == "")
+            icon_file = missing_icon_file;
+          else
+            icon_file = new GLib.FileIcon(File.new_for_path (artwork_path));
           music_preview = new Unity.MusicPreview (track.title, track.album_artist, icon_file);
 
           var play_action = new Unity.PreviewAction ("play_track", _("Play"), null);