Merge lp:~ahayzen/music-app/remix-url-dispatcher-fix-001 into lp:music-app/remix

[Andrew Hayzen]

* Fix for db locking issue when using urlhandler

* Fix for db locking issue when using urlhandler

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

PASSED: Continuous integration, rev:734
http://91.189.93.70:8080/job/music-app-remix-ci/251/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/161
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/26

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This change doesn't seem to fix the issue of the db being locked. Furthermore, I now get the locked db error even if the app is already started:

file:///opt/click.ubuntu.com/com.ubuntu.music/2.0.734/meta-database.js:37: Error
: database table is locked Unable to fetch row

review: Needs Information

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

PASSED: Continuous integration, rev:735
http://91.189.93.70:8080/job/music-app-remix-ci/252/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/163
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/27

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

It's possible that when it doesn't work for me this is what's in the log:

file:///opt/click.ubuntu.com/com.ubuntu.music/2.0.735/music-app.qml:543: TypeError: Cannot read property 'filename' of undefined

[Victor Thompson (vthompson)]

The failures I've been seeing have only been on vivid. I can not get it to fail on the RTM devel-proposed branch. We'll need to be vigilant to see if we regress when the vivid changes possibly make it into RTM. I'm approving this since it fixes the issue on the target RTM release. Thanks!

review: Approve

[lp:~ahayzen/music-app/remix-url-dispatcher-fix-001]

736. By Andrew Hayzen on 2014-11-11

* Fix for url dispatcher attempt 2

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

PASSED: Continuous integration, rev:736
http://91.189.93.70:8080/job/music-app-remix-ci/253/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/166
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/28

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-url-dispatcher-fix-001]

737. By Andrew Hayzen on 2014-11-11

* Merge of trunk

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

PASSED: Continuous integration, rev:737
http://91.189.93.70:8080/job/music-app-remix-ci/254/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/168
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/29

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-url-dispatcher-fix-001]

738. By Andrew Hayzen on 2014-11-12

* Remove canLoad=false as this causes the worker to be run!

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

PASSED: Continuous integration, rev:738
http://91.189.93.70:8080/job/music-app-remix-ci/255/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/169
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/30

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This looks good now! Let's hope we can keep this functionality regression-free from here on out.

review: Approve

=== modified file 'meta-database.js'
--- meta-database.js	2014-11-01 19:17:36 +0000
+++ meta-database.js	2014-11-12 01:45:57 +0000
@@ -34,8 +34,7 @@
     var db = getDatabase();
     db.transaction(
         function(tx) {
-            tx.executeSql('DROP TABLE IF EXISTS queue');
-            tx.executeSql("CREATE TABLE IF NOT EXISTS queue(ind INTEGER NOT NULL, filename TEXT)");
+            tx.executeSql('DELETE FROM queue');
       });
 }
 

=== modified file 'music-app.qml'
--- music-app.qml	2014-11-08 21:03:27 +0000
+++ music-app.qml	2014-11-12 01:45:57 +0000
@@ -231,9 +231,6 @@
         }
 
         function process(uri, play) {
-            // stop loading the queue as we will load from uriHandler
-            queueLoaderWorker.canLoad = false
-
             if (uri.indexOf("album:///") === 0) {
                 uriHandler.processAlbum(uri.substring(9));
             }
@@ -555,9 +552,11 @@
         // initialize playlists
         Playlists.initializePlaylist()
 
-        // allow the queue loader to start
-        queueLoaderWorker.canLoad = !Library.isQueueEmpty()
-        queueLoaderWorker.list = Library.getQueue()
+        if (!args.values.url) {
+            // allow the queue loader to start
+            queueLoaderWorker.canLoad = !Library.isQueueEmpty()
+            queueLoaderWorker.list = Library.getQueue()
+        }
 
         // everything else
         loading.visible = true
@@ -738,7 +737,7 @@
                     trackClicked(songsAlbumArtistModel, 0, true, true);
 
                     // Add album to recent list
-                    Library.addRecent(songsAlbumArtistModel.model.get(0, model.RoleModelData).album, "album")
+                    Library.addRecent(songsAlbumArtistModel.get(0, SongsModel.RoleModelData).album, "album")
                     recentModel.filterRecent()
                 } else if (selectedAlbum) {
                     console.debug("Unknown artist-album " + artist + "/" + album + ", skipping")