Merge lp:~jamesh/unity-scope-mediascanner/disable-artist-bio into lp:unity-scope-mediascanner

[James Henstridge]

Disable artist biography download, since the online service always returns an empty biography.

Disable artist biography download, since the online service always returns an empty biography.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/203/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-armhf-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-i386-ci/30

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

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Yes please!

review: Approve

=== modified file 'src/mymusic/music-scope.cpp'
--- src/mymusic/music-scope.cpp	2016-02-16 10:04:27 +0000
+++ src/mymusic/music-scope.cpp	2016-02-25 05:39:21 +0000
@@ -602,6 +602,13 @@
 std::string MusicQuery::fetch_biography_sync(const std::string& artist, const std::string &album) const
 {
     std::string bio_text;
+    /* Biography download is currently disabled because the
+     * dash.ubuntu.com API always returns an empty string (in turn
+     * because 7digital doesn't return any data).
+     *
+     * https://bugs.launchpad.net/bugs/1549616
+     */
+#ifdef ENABLE_ARTIST_BIO
     http::Request::Configuration config;
     auto uri = core::net::make_uri(
             "https://dash.ubuntu.com",
@@ -641,7 +648,7 @@
     {
         std::cerr << "Failed to get artist info: " << e.what() << std::endl;
     }
-
+#endif
     return bio_text;
 }