Merge lp:~vthompson/music-app/correct-album-count into lp:music-app/trusty

[Victor Thompson]

* Fix album count on Artists tab.
* Show the default cover art in the other covers in the stack on the Artists tab

* Fix album count on Artists tab.
* Show the default cover art in the other covers in the stack on the Artists tab

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:263
http://91.189.93.70:8080/job/music-app-ci/339/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/316
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/339
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/341
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/60

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/339/rebuild

review: Approve (continuous-integration)

[Daniel Holm (danielholm)]

review: Approve

=== modified file 'MusicArtists.qml'
--- MusicArtists.qml	2013-11-14 23:15:53 +0000
+++ MusicArtists.qml	2013-11-28 04:51:06 +0000
@@ -73,7 +73,7 @@
                        width: styleMusic.common.albumSize
                        height: styleMusic.common.albumSize
                        image: Image {
-                           source: Library.getArtistCovers(artist).length > 3 ? Library.getArtistCovers(artist)[3] : "images/cover_default.png"
+                           source: Library.getArtistCovers(artist).length > 3 && Library.getArtistCovers(artist)[3] !== "" ? Library.getArtistCovers(artist)[3] : "images/cover_default.png"
                        }
                        visible: Library.getArtistCovers(artist).length > 3
                     }
@@ -86,7 +86,7 @@
                        width: styleMusic.common.albumSize
                        height: styleMusic.common.albumSize
                        image: Image {
-                           source: Library.getArtistCovers(artist).length > 2 ? Library.getArtistCovers(artist)[2] : "images/cover_default.png"
+                           source: Library.getArtistCovers(artist).length > 2 && Library.getArtistCovers(artist)[2] !== "" ? Library.getArtistCovers(artist)[2] : "images/cover_default.png"
                        }
                        visible: Library.getArtistCovers(artist).length > 2
                     }
@@ -99,7 +99,7 @@
                        width: styleMusic.common.albumSize
                        height: styleMusic.common.albumSize
                        image: Image {
-                           source: Library.getArtistCovers(artist).length > 1 ? Library.getArtistCovers(artist)[1] : "images/cover_default.png"
+                           source: Library.getArtistCovers(artist).length > 1 && Library.getArtistCovers(artist)[1] !== "" ? Library.getArtistCovers(artist)[1] : "images/cover_default.png"
                        }
                        visible: Library.getArtistCovers(artist).length > 1
                     }
@@ -145,7 +145,7 @@
                         anchors.rightMargin: units.gu(1.5)
                         elide: Text.ElideRight
                         // model for number of albums?
-                        text: i18n.tr("%1 album", "%1 albums", Library.getArtistCovers(artist).length).arg(Library.getArtistCovers(artist).length)
+                        text: i18n.tr("%1 album", "%1 albums", Library.getArtistAlbumCount(artist)).arg(Library.getArtistAlbumCount(artist))
                     }
 
                     Label {
 
=== modified file 'meta-database.js'
--- meta-database.js	2013-11-19 23:00:44 +0000
+++ meta-database.js	2013-11-28 04:51:06 +0000
@@ -221,6 +221,20 @@
     return res;
 }
 
+function getArtistAlbumCount(artist) {
+    var res = 0;
+    var db = getDatabase();
+    db.transaction( function(tx) {
+        var rs = tx.executeSql("SELECT count(DISTINCT album) AS value FROM metadata WHERE artist=?", [artist]);
+        if (rs.rows.item(0).value > 0) {
+            res = rs.rows.item(0).value;
+        } else {
+            res = 0;
+        }
+    });
+    return res;
+}
+
 function getAlbums() {
     var res = [];
     var db = getDatabase();