Merge lp:~vthompson/music-app/fix-1413451 into lp:music-app/remix

[Victor Thompson]

Stop queueLoaderWorker when a track is clicked.

Stop queueLoaderWorker when a track is clicked.

There may be other cases where the loading of the queue steps on a new queue entry. I wasn't able to reproduce this when the "Queue all" button was hit, or when a list item action to add to the queue was taken. Testing should be done to verify this.

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

PASSED: Continuous integration, rev:804
http://91.189.93.70:8080/job/music-app-ci/1257/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/798
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/798/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/109

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

I think there is also potential from the urlhandler could you add the same canLoad=false to process() [0] as that is hit by all urlhandler and argument calls. I'll continue looking for further potentials...

0 - http://bazaar.launchpad.net/~music-app-dev/music-app/remix/view/head:/music-app.qml#L226

review: Needs Fixing

[Victor Thompson (vthompson)]

The "album://" handler goes through trackClicked() already. I wasn't able to reproduce for the "file://" handler. I'll look into it more, but I believe we are already mitigating this somehow.

[Andrew Hayzen (ahayzen)]

Note that processFile() does not hit trackClicked() and this is used by cmdline arguments and urihandler, personally I think it would be preferred to put the canLoad=false in process just to enforce prevention of the queueWorkerLoader.

review: Needs Information

[lp:~vthompson/music-app/fix-1413451]

805. By Victor Thompson on 2015-01-23

* Add the fix to processFile() as well.

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

PASSED: Continuous integration, rev:805
http://91.189.93.70:8080/job/music-app-ci/1259/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/814
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/111

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, thanks for the extra canLoad=false :)

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2015-01-21 13:31:57 +0000
+++ music-app.qml	2015-01-23 13:22:44 +0000
@@ -199,6 +199,9 @@
         }
 
         function processFile(uri, play) {
+            // Stop queue loading in the background
+            queueLoaderWorker.canLoad = false
+
             uri = decodeURIComponent(uri);
 
             // Lookup track in songs model
@@ -653,6 +656,9 @@
     }
 
     function trackClicked(model, index, play, clear) {
+        // Stop queue loading in the background
+        queueLoaderWorker.canLoad = false
+
         // TODO: remove once playlists uses U1DB
         if (model.hasOwnProperty("linkLibraryListModel")) {
             model = model.linkLibraryListModel;