Merge lp:~stolowski/unity-scope-mediascanner/fix-1340952 into lp:unity-scope-mediascanner

[Paweł Stołowski]

Use music:// for individual song files and video:// uris for video files in medisanner music/video scopes.

Use music:// for individual song files and video:// uris for video files in medisanner music/video scopes. This change also required minor adjustement to the image uri for these types for results.

NOTE: requires handler for video:// schema (a MP for this is coming soon).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/43

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'src/music-scope.cpp'
--- src/music-scope.cpp	2014-08-13 10:14:32 +0000
+++ src/music-scope.cpp	2014-08-25 13:55:45 +0000
@@ -363,10 +363,16 @@
 
 unity::scopes::CategorisedResult MusicQuery::create_song_result(unity::scopes::Category::SCPtr const& category, mediascanner::MediaFile const& media) const
 {
+    std::string uri = media.getUri();
+    if (uri.find("file://") == 0)
+    {
+        uri = "music://" + uri.substr(7); // replace file:// with music://
+    }
     CategorisedResult res(category);
-    res.set_uri(media.getUri());
-    res.set_dnd_uri(media.getUri());
+    res.set_uri(uri);
+    res.set_dnd_uri(uri);
     res.set_title(media.getTitle());
+    res.set_art(scope.make_album_art_uri(media.getAlbumArtist(), media.getAlbum()));
 
     res["duration"] = media.getDuration();
     res["album"] = media.getAlbum();

=== modified file 'src/video-scope.cpp'
--- src/video-scope.cpp	2014-08-01 14:46:26 +0000
+++ src/video-scope.cpp	2014-08-25 13:55:45 +0000
@@ -183,9 +183,17 @@
             break;
         }
 
+        std::string uri = media.getUri();
+        std::string imguri;
+        if (uri.find("file://") == 0) {
+            imguri = "image://thumbnailer/" + uri.substr(7);
+            uri = "video://" + uri.substr(7); // replace file:// with video://
+        }
+
         CategorisedResult res(cat);
-        res.set_uri(media.getUri());
-        res.set_dnd_uri(media.getUri());
+        res.set_uri(uri);
+        res.set_dnd_uri(uri);
+        res.set_art(imguri);
         res.set_title(media.getTitle());
 
         res["duration"] =media.getDuration();
@@ -225,12 +233,14 @@
 
     PreviewWidget video("video", "video");
     video.add_attribute_mapping("source", "uri");
+    video.add_attribute_mapping("screenshot", "art");
 
     PreviewWidget actions("actions", "actions");
     {
         VariantBuilder builder;
         builder.add_tuple({
                 {"id", Variant("play")},
+                {"uri", Variant(result().uri())}, // this is a video:// uri
                 {"label", Variant(_("Play"))}
             });
         actions.add_attribute_value("actions", builder.end());

=== modified file 'tests/test-music-scope.cpp'
--- tests/test-music-scope.cpp	2014-08-04 15:52:05 +0000
+++ tests/test-music-scope.cpp	2014-08-25 13:55:45 +0000
@@ -176,13 +176,13 @@
         .WillOnce(Return(albums_category));
 
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(AllOf(
-            ResultProp("uri", "scope://mediascanner%2Dmusic?q=The%20John%20Butler%20Trio&dep=albums%5Fof%5Fartist"),
+            ResultUriMatchesCannedQuery(CannedQuery("mediascanner-music", "The John Butler Trio", "albums_of_artist")),
             ResultProp("title", "The John Butler Trio")))))
         .WillOnce(Return(true));
 
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(AllOf(
-            ResultProp("uri", "file:///path/foo7.ogg"),
-            ResultProp("dnd_uri", "file:///path/foo7.ogg"),
+            ResultProp("uri", "music:///path/foo7.ogg"),
+            ResultProp("dnd_uri", "music:///path/foo7.ogg"),
             ResultProp("title", "One Way Road"),
             ResultProp("duration", 185),
             ResultProp("album", "April Uprising"),
@@ -337,7 +337,7 @@
 
 TEST_F(MusicScopeTest, PreviewSong) {
     unity::scopes::testing::Result result;
-    result.set_uri("file:///xyz");
+    result.set_uri("music:///xyz");
     result.set_title("Song title");
     result["artist"] = "Artist name";
     result["album"] = "Album name";

=== modified file 'tests/test-video-scope.cpp'
--- tests/test-video-scope.cpp	2014-07-31 06:26:08 +0000
+++ tests/test-video-scope.cpp	2014-08-25 13:55:45 +0000
@@ -117,8 +117,8 @@
     EXPECT_CALL(reply, register_category("local", _, _, _))
         .WillOnce(Return(category));
     EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(AllOf(
-            ResultProp("uri", "file:///path/bigbuckbunny.ogv"),
-            ResultProp("dnd_uri", "file:///path/bigbuckbunny.ogv"),
+            ResultProp("uri", "video:///path/bigbuckbunny.ogv"),
+            ResultProp("dnd_uri", "video:///path/bigbuckbunny.ogv"),
             ResultProp("title", "Big Buck Bunny"),
             ResultProp("duration", 596)))))
         .WillOnce(Return(true));
@@ -226,7 +226,7 @@
 
 TEST_F(VideoScopeTest, PreviewVideo) {
     unity::scopes::testing::Result result;
-    result.set_uri("file:///xyz");
+    result.set_uri("video:///xyz");
     result.set_title("Video title");
     result["duration"] = 42;