[grilo-plugins] local-metadata: Check cache and local thumbnails for thumbnails.



commit efaee76499cc1f4909122816938ba3b3d2dda94d
Author: Jeremy Whiting <jpwhiting kde org>
Date:   Wed Aug 13 14:17:49 2014 -0600

    local-metadata: Check cache and local thumbnails for thumbnails.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=734636

 src/local-metadata/grl-local-metadata.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c
index 9b9fae1..2e5905e 100644
--- a/src/local-metadata/grl-local-metadata.c
+++ b/src/local-metadata/grl-local-metadata.c
@@ -633,7 +633,8 @@ resolve_album_art (GrlSource *source,
                    resolution_flags_t flags)
 {
   const gchar *artist, *album;
-  char *thumbnail_uri;
+  char *cache_uri = NULL;
+  char *thumbnail_uri = NULL;
 
   artist = grl_media_audio_get_artist (GRL_MEDIA_AUDIO (rs->media));
   album = grl_media_audio_get_album (GRL_MEDIA_AUDIO (rs->media));
@@ -641,14 +642,20 @@ resolve_album_art (GrlSource *source,
   if (!artist || !album)
     return TRUE;
 
-  media_art_get_path (artist, album, "album", NULL, NULL, &thumbnail_uri);
+  media_art_get_path (artist, album, "album", NULL, &cache_uri, &thumbnail_uri);
 
-  if (thumbnail_uri) {
+  if (thumbnail_uri)
     grl_media_set_thumbnail (rs->media, thumbnail_uri);
-    g_free (thumbnail_uri);
-  }
+  else if (cache_uri)
+    grl_media_set_thumbnail (rs->media, cache_uri);
+  else
+    GRL_DEBUG ("Found no thumbnail for artist %s and album %s", artist, album);
+
   rs->callback (rs->source, rs->operation_id, rs->media, rs->user_data, NULL);
 
+  g_free (cache_uri);
+  g_free (thumbnail_uri);
+
   return FALSE;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]