Merge lp:~ahayzen/music-app/fix-potential-trackclicked-issues into lp:music-app/trusty

[Andrew Hayzen]

* Fix potential trackclicked issues

* Fix potential trackclicked issues

Resolves and tidies a few things within trackClicked. Mainly resolves errors such as below when using the album:// uri.

qml: URI=album:///Queen/A%20Kind%20of%20Magic
file:///opt/click.ubuntu.com/com.ubuntu.music/1.3.501/music-app.qml:450: TypeError: Cannot read property 'filename' of undefined

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

PASSED: Continuous integration, rev:501
http://91.189.93.70:8080/job/music-app-ci/887/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/598
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/598/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/111

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I can't reproduce the issue at hand, but this change doesn't introduce any regressions and the changes are straight forward

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2014-06-15 13:43:37 +0000
+++ music-app.qml	2014-06-21 23:28:24 +0000
@@ -218,7 +218,8 @@
 
             // Play album it tracks exist
             if (songsAlbumArtistModel.rowCount > 0) {
-                trackClicked(songsAlbumArtistModel, 0, true);
+                // trackClicked(model, index, play, clear=true) will clear the model
+                trackClicked(songsAlbumArtistModel, 0, true, true);
             }
             else {
                 console.debug("Unknown artist-album " + uri + ", skipping")
@@ -244,12 +245,17 @@
                 return;
             }
 
+            if (play) {
+                // clear play queue
+                trackQueue.model.clear()
+            }
+
             // enqueue
-            trackQueue.append(track);
+            trackQueue.append(makeDict(track));
 
             // play first URI
             if (play) {
-                trackQueueClick(0);
+                trackQueueClick(trackQueue.model.count - 1);
             }
         }
 
@@ -270,8 +276,6 @@
         }
 
         onOpened: {
-            // clear play queue
-            trackQueue.model.clear()
             for (var i=0; i < uris.length; i++) {
                 console.debug("URI=" + uris[i])
 
@@ -405,12 +409,7 @@
         }
 
         for (var i=0; i < model.rowCount; i++) {
-            var item = model.get(i, model.RoleModelData);
-            if (item.art !== undefined && (item.art === "" || item.art === null)) {
-                item.art = "image://albumart/artist=" + item.author + "&album=" + item.album
-            }
-
-            trackQueue.model.append(makeDict(item));
+            trackQueue.model.append(makeDict(model.get(i, model.RoleModelData)));
         }
     }
 
@@ -430,13 +429,14 @@
     function makeDict(model) {
         return {
             album: model.album,
+            art: "image://albumart/artist=" + model.author + "&album=" + model.album,
             author: model.author,
             filename: model.filename,
             title: model.title
         };
     }
 
-    function trackClicked(model, index, play) {
+    function trackClicked(model, index, play, clear) {
         // TODO: remove once playlists uses U1DB
         if (model.hasOwnProperty("linkLibraryListModel")) {
             model = model.linkLibraryListModel;
@@ -445,12 +445,16 @@
         var file = Qt.resolvedUrl(model.get(index, model.RoleModelData).filename);
 
         play = play === undefined ? true : play  // default play to true
+        clear = clear === undefined ? false : clear  // force clear and will ignore player.toggle()
 
-        // If same track and on now playing page then toggle
-        if (musicToolbar.currentPage === nowPlaying &&
-                Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
-            player.toggle()
-            return;
+        if (!clear) {
+            // If same track and on now playing page then toggle
+            if (musicToolbar.currentPage === nowPlaying &&
+                    trackQueue.model.get(player.currentIndex) !== undefined &&
+                    Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
+                player.toggle()
+                return;
+            }
         }
 
         trackQueue.model.clear();  // clear the old model