Ubuntu Music App

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

  1. remix-url-dispatcher-fix-001
  2. Merge into remix
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 738
Merged at revision: 736
Proposed branch: lp:~ahayzen/music-app/remix-url-dispatcher-fix-001
Merge into: lp:music-app/remix
Diff against target: 51 lines (+7/-9)
2 files modified
meta-database.js (+1/-2)
music-app.qml (+6/-7)
To merge this branch: bzr merge lp:~ahayzen/music-app/remix-url-dispatcher-fix-001
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+241458@code.launchpad.net

Commit message

* Fix for db locking issue when using urlhandler

Description of the change

* Fix for db locking issue when using urlhandler

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Victor Thompson (vthompson) wrote :

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
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Victor Thompson (vthompson) wrote :

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

Revision history for this message
Victor Thompson (vthompson) wrote :

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 updated
736. By Andrew Hayzen

* Fix for url dispatcher attempt 2

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
737. By Andrew Hayzen

* Merge of trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
738. By Andrew Hayzen

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

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Victor Thompson (vthompson) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
34 var db = getDatabase();34 var db = getDatabase();
35 db.transaction(35 db.transaction(
36 function(tx) {36 function(tx) {
37 tx.executeSql('DROP TABLE IF EXISTS queue');37 tx.executeSql('DELETE FROM queue');
38 tx.executeSql("CREATE TABLE IF NOT EXISTS queue(ind INTEGER NOT NULL, filename TEXT)");
39 });38 });
40}39}
4140
4241
=== 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 @@
231 }231 }
232232
233 function process(uri, play) {233 function process(uri, play) {
234 // stop loading the queue as we will load from uriHandler
235 queueLoaderWorker.canLoad = false
236
237 if (uri.indexOf("album:///") === 0) {234 if (uri.indexOf("album:///") === 0) {
238 uriHandler.processAlbum(uri.substring(9));235 uriHandler.processAlbum(uri.substring(9));
239 }236 }
@@ -555,9 +552,11 @@
555 // initialize playlists552 // initialize playlists
556 Playlists.initializePlaylist()553 Playlists.initializePlaylist()
557554
558 // allow the queue loader to start555 if (!args.values.url) {
559 queueLoaderWorker.canLoad = !Library.isQueueEmpty()556 // allow the queue loader to start
560 queueLoaderWorker.list = Library.getQueue()557 queueLoaderWorker.canLoad = !Library.isQueueEmpty()
558 queueLoaderWorker.list = Library.getQueue()
559 }
561560
562 // everything else561 // everything else
563 loading.visible = true562 loading.visible = true
@@ -738,7 +737,7 @@
738 trackClicked(songsAlbumArtistModel, 0, true, true);737 trackClicked(songsAlbumArtistModel, 0, true, true);
739738
740 // Add album to recent list739 // Add album to recent list
741 Library.addRecent(songsAlbumArtistModel.model.get(0, model.RoleModelData).album, "album")740 Library.addRecent(songsAlbumArtistModel.get(0, SongsModel.RoleModelData).album, "album")
742 recentModel.filterRecent()741 recentModel.filterRecent()
743 } else if (selectedAlbum) {742 } else if (selectedAlbum) {
744 console.debug("Unknown artist-album " + artist + "/" + album + ", skipping")743 console.debug("Unknown artist-album " + artist + "/" + album + ", skipping")

Subscribers

People subscribed via source and target branches