Merge lp:~stolowski/unity-scope-mediascanner/fix-albums-of-artist-vivid into lp:unity-scope-mediascanner

[Paweł Stołowski]

When searching albums of an artist via canned queries, pass artist name via a fake department id rather than search string to workaround shell plugin behavior that resets department under certain conditions if search string is not empty.

When searching albums of an artist via canned queries, pass artist name via a fake department id rather than search string to workaround shell plugin behavior that resets department under certain conditions if search string is not empty.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/158/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/1

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Looks fine

review: Approve

=== modified file 'src/mymusic/music-scope.cpp'
--- src/mymusic/music-scope.cpp	2014-10-09 07:09:33 +0000
+++ src/mymusic/music-scope.cpp	2014-11-10 11:47:19 +0000
@@ -226,9 +226,10 @@
         auto const genre = current_department.substr(index + 1);
         query_albums_by_genre(reply, genre);
     }
-    else if (current_department == "albums_of_artist") // fake department that's not really displayed
+    else if (current_department.find("albums_of_artist:") == 0) // fake department that's not really displayed
     {
-        const std::string artist = query().query_string();
+        const int index = current_department.find(":");
+        const std::string artist = current_department.substr(index + 1);
         query_albums_by_artist(reply, artist);
         query_songs_by_artist(reply, artist);
     }
@@ -313,13 +314,13 @@
     auto cat = reply->register_category("artists", show_title ? _("Artists") : "", SONGS_CATEGORY_ICON, renderer); //FIXME: icon
 
     CannedQuery artist_search(query());
-    artist_search.set_department_id("albums_of_artist"); // virtual department
+    artist_search.set_query_string("");
 
     mediascanner::Filter filter;
     filter.setLimit(MAX_RESULTS);
     for (const auto &artist: scope.store->queryArtists(query().query_string(), filter))
     {
-        artist_search.set_query_string(artist);
+        artist_search.set_department_id("albums_of_artist:" + artist); // virtual department
 
         CategorisedResult res(cat);
         res.set_uri(artist_search.to_uri());
@@ -501,7 +502,8 @@
             }
 
             CannedQuery artist_search(query());
-            artist_search.set_department_id("albums_of_artist"); // virtual department
+            artist_search.set_query_string("");
+            artist_search.set_department_id("albums_of_artist:" + artist); // virtual department
 
             CategorisedResult artist_info(biocat);
             artist_info.set_uri(artist_search.to_uri());

=== modified file 'tests/test-music-scope.cpp'
--- tests/test-music-scope.cpp	2014-10-07 01:40:40 +0000
+++ tests/test-music-scope.cpp	2014-11-10 11:47:19 +0000
@@ -181,7 +181,7 @@
         .WillOnce(Return(albums_category));
 
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(AllOf(
-            ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "The John Butler Trio", "albums_of_artist")),
+            ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "", "albums_of_artist:The John Butler Trio")),
             ResultProp("title", "The John Butler Trio")))))
         .WillOnce(Return(true));
 
@@ -229,7 +229,7 @@
     EXPECT_CALL(reply, register_category("albums", _, _, _))
         .WillOnce(Return(albums_category));
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(AllOf(
-            ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "The John Butler Trio", "albums_of_artist")),
+            ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "", "albums_of_artist:The John Butler Trio")),
             ResultProp("title", "The John Butler Trio")))))
         .WillOnce(Return(true));
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(ResultProp("title", "One Way Road"))))
@@ -264,13 +264,13 @@
         .WillOnce(Return(albums_category));
 
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(AllOf(
-                        ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "Spiderbait", "albums_of_artist")),
+                        ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "", "albums_of_artist:Spiderbait")),
                         ResultProp("title", "Spiderbait")
                         ))))
         .WillOnce(Return(true));
 
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(AllOf(
-                        ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "The John Butler Trio", "albums_of_artist")),
+                        ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "", "albums_of_artist:The John Butler Trio")),
                         ResultProp("title", "The John Butler Trio"))
             )))
         .WillOnce(Return(true));