Merge lp:~jamesh/unity-scope-mediascanner/fallback-art-fixes into lp:unity-scope-mediascanner

[James Henstridge]

Substitute in the fallback image file name for album category renderer templates in the My Music scope, and set the fallback image in previews.

Some of the category renderer definitions produced by the music scope do not correctly substitute in the fallback art file name. When we remove fallback image support within the thumbnailer, this causes display bugs for those result pages.

This seems to be a result of my fallback art changes not being completely in sync with Pawel's filters changes, so this branch fixes the last few cases.

In addition to this, I've also set the fallback image for the artwork shown in previews from the scope. There is no facility to specify a fallback for the video preview widget, so I haven't done anything there.

[lp:~jamesh/unity-scope-mediascanner/fallback-art-fixes]

281. By James Henstridge on 2016-01-13

Add fallback image attributes to the artwork in previews.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:280
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/unity-scope-mediascanner/fallback-art-fixes/+merge/282396/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/186/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:281
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/unity-scope-mediascanner/fallback-art-fixes/+merge/282396/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/187/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Looks good to me!

review: Approve

=== modified file 'src/mymusic/music-scope.cpp'
--- src/mymusic/music-scope.cpp	2015-11-03 10:26:42 +0000
+++ src/mymusic/music-scope.cpp	2016-01-13 04:27:43 +0000
@@ -62,7 +62,6 @@
     "art": {
         "field": "art",
         "conciergeMode": true,
-        "fallback": "@FALLBACK@"
     },
     "summary" : "summary"
   }
@@ -200,7 +199,10 @@
   },
   "components": {
     "title": "title",
-    "art":  "art",
+    "art":  {
+      "field": "art",
+      "fallback": "@FALLBACK@"
+    },
     "subtitle": "artist"
   }
 }
@@ -309,7 +311,7 @@
 
     if (!scope.store->hasMedia(AudioMedia))
     {
-        const CategoryRenderer renderer = make_renderer(GET_STARTED_CATEGORY_DEFINITION, MISSING_ALBUM_ART);
+        const CategoryRenderer renderer(GET_STARTED_CATEGORY_DEFINITION);
         auto cat = reply->register_category("mymusic-getstarted", "", "", renderer);
         CategorisedResult res(cat);
         res.set_uri(query().to_uri());
@@ -648,8 +650,8 @@
 
 void MusicQuery::query_albums_by_artist(unity::scopes::SearchReplyProxy const &reply, const std::string& artist) const
 {
-    CategoryRenderer bio_renderer(ARTIST_BIO_CATEGORY_DEFINITION);
-    CategoryRenderer renderer(ALBUMS_CATEGORY_DEFINITION);
+    CategoryRenderer bio_renderer = make_renderer(ARTIST_BIO_CATEGORY_DEFINITION, MISSING_ALBUM_ART);
+    CategoryRenderer renderer = make_renderer(ALBUMS_CATEGORY_DEFINITION, MISSING_ALBUM_ART);
 
     auto biocat = reply->register_category("bio", "", "", bio_renderer);
     auto albumcat = reply->register_category("albums", _("Albums"), SONGS_CATEGORY_ICON, renderer);
@@ -699,7 +701,7 @@
     auto cat = override_category;
     if (!cat)
     {
-        CategoryRenderer renderer(query().query_string() == "" ? ALBUMS_CATEGORY_DEFINITION : SEARCH_CATEGORY_DEFINITION);
+        CategoryRenderer renderer = make_renderer(query().query_string() == "" ? ALBUMS_CATEGORY_DEFINITION : SEARCH_CATEGORY_DEFINITION, MISSING_ALBUM_ART);
         cat = reply->register_category("albums", show_title ? _("Albums") : "", SONGS_CATEGORY_ICON, renderer);
     }
 
@@ -753,6 +755,8 @@
 
     PreviewWidget artwork("art", "image");
     artwork.add_attribute_mapping("source", "art");
+    artwork.add_attribute_value("fallback", Variant(
+            scope.scope_directory() + "/" + MISSING_ALBUM_ART));
 
     PreviewWidget tracks("tracks", "audio");
     {
@@ -798,6 +802,8 @@
 
     PreviewWidget artwork("art", "image");
     artwork.add_attribute_mapping("source", "art");
+    artwork.add_attribute_value("fallback", Variant(
+            scope.scope_directory() + "/" + MISSING_ALBUM_ART));
 
     PreviewWidget header("header", "header");
     header.add_attribute_mapping("title", "title");