Merge lp:~ahayzen/music-app/remix-remember-queue-use-worker into lp:music-app/remix

[Andrew Hayzen]

* Create generic WorkerModelLoader.qml
* Load queue at startup via WorkerScript

* Create generic WorkerModelLoader.qml
* Load queue at startup via WorkerScript

[lp:~ahayzen/music-app/remix-remember-queue-use-worker]

693. By Andrew Hayzen on 2014-10-27

* Remove debugging lines

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

PASSED: Continuous integration, rev:693
http://91.189.93.70:8080/job/music-app-remix-ci/184/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1306
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/184

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-remember-queue-use-worker]

694. By Andrew Hayzen on 2014-10-27

* Fix for setting of readonly source
* Fix for setting complete before syncing
* Sync after first item to ensure no empty state

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

PASSED: Continuous integration, rev:694
http://91.189.93.70:8080/job/music-app-remix-ci/185/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1307
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1307/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/185

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-remember-queue-use-worker]

695. By Andrew Hayzen on 2014-10-27

* Pull of upstream

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

PASSED: Continuous integration, rev:695
http://91.189.93.70:8080/job/music-app-remix-ci/187/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1309
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1309/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/187

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-remember-queue-use-worker]

696. By Andrew Hayzen on 2014-10-27

* Only set to complete once sync is complete

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

PASSED: Continuous integration, rev:696
http://91.189.93.70:8080/job/music-app-remix-ci/190/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1312
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1312/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/190

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-remember-queue-use-worker]

697. By Andrew Hayzen on 2014-10-28

* Merge of upstream

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

PASSED: Continuous integration, rev:697
http://91.189.93.70:8080/job/music-app-remix-ci/193/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1315
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/193

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-remember-queue-use-worker]

698. By Andrew Hayzen on 2014-10-28

* Merge with upstream

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

PASSED: Continuous integration, rev:698
http://91.189.93.70:8080/job/music-app-remix-ci/194/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1316
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1316/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/194

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-remember-queue-use-worker]

699. By Andrew Hayzen on 2014-10-28

* Pull of upstream

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

PASSED: Continuous integration, rev:699
http://91.189.93.70:8080/job/music-app-remix-ci/196/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1318
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/196

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This LGTM and improves the performance of the persistent queue. Thanks! :)

review: Approve

=== modified file 'LibraryListModel.qml'
--- LibraryListModel.qml	2014-10-21 21:58:07 +0000
+++ LibraryListModel.qml	2014-10-28 00:58:01 +0000
@@ -24,79 +24,28 @@
 
 Item {
     id: libraryListModelItem
+    property alias count: libraryModel.count
     property ListModel model : ListModel {
         id: libraryModel
         property var linkLibraryListModel: libraryListModelItem
     }
-    property alias count: libraryModel.count
-    property alias workerComplete: worker.completed
+    property var param: null
     property var query: null
-    property var param: null
-    property bool canLoad: true
-    property bool preLoadComplete: false
-
-    onCanLoadChanged: {
-        /* If canLoad has been set back to true then check if there are any
-          remaining items to load in the model */
-        if (canLoad && worker.list !== null && !worker.completed)
-        {
-            worker.process();
-        }
-    }
-
     /* Pretent to be like a mediascanner2 listmodel */
     property alias rowCount: libraryModel.count
 
+    property alias canLoad: worker.canLoad
+    property alias preLoadComplete: worker.preLoadComplete
+    property alias syncFactor: worker.syncFactor
+    property alias workerComplete: worker.completed
+
     function get(index, role) {
         return model.get(index);
     }
 
-    WorkerScript {
-         id: worker
-         source: "worker-library-loader.js"
-
-         property bool completed: false
-         property int i: 0
-         property var list: null
-
-         onListChanged: {
-             reset();
-             clear();
-         }
-
-         onMessage: {
-             if (i === 0)
-             {
-                 preLoadComplete = true;
-             }
-
-             if (canLoad)  // pause if the model is not allowed to load
-             {
-                 process();
-             }
-         }
-
-         function reset()
-         {
-             i = 0;
-             completed = false;
-         }
-
-         // Add the next item in the list to the model otherwise set complete
-         function process()
-         {
-             if (worker.i < worker.list.length)
-             {
-                 console.log(JSON.stringify(worker.list[worker.i]));
-                 worker.sendMessage({'add': worker.list[worker.i],
-                                     'model': libraryModel});
-                 worker.i++;
-             }
-             else
-             {
-                 worker.completed = true;
-             }
-         }
+    WorkerModelLoader {
+        id: worker
+        model: libraryListModelItem.model
     }
 
     function indexOf(file)
@@ -148,11 +97,4 @@
 
         worker.list = Library.getRecent();
     }
-
-    function clear() {
-        if (worker.list !== null)
-        {
-            worker.sendMessage({'clear': true, 'model': libraryModel})
-        }
-    }
 }

=== modified file 'Player.qml'
--- Player.qml	2014-10-28 00:58:01 +0000
+++ Player.qml	2014-10-28 00:58:01 +0000
@@ -123,7 +123,7 @@
         }
         else {
             currentIndex = newIndex
-            source = Qt.resolvedUrl(trackQueue.model.get(newIndex).filename)
+            setSource(Qt.resolvedUrl(trackQueue.model.get(newIndex).filename))
         }
 
         // Set index into queue

=== added file 'WorkerModelLoader.qml'
--- WorkerModelLoader.qml	1970-01-01 00:00:00 +0000
+++ WorkerModelLoader.qml	2014-10-28 00:58:01 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2014
+ *      Andrew Hayzen <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+
+
+WorkerScript {
+     id: worker
+     source: "worker-library-loader.js"
+
+     property bool canLoad: true
+     property bool completed: false
+     property int i: 0
+     property var list: null
+     property var model
+     property bool preLoadComplete: false
+     property int syncFactor: 5
+
+     onCanLoadChanged: {
+         /* If canLoad has been set back to true then check if there are any
+           remaining items to load in the model */
+         if (canLoad && list !== null && !completed) {
+             process();
+         }
+
+         if (!canLoad) {  // sync any pending changes when canLoad changes
+             sync()
+         }
+     }
+
+     onListChanged: {
+         reset();
+         clear();
+     }
+
+     onMessage: {
+         if (messageObject.sync === true) {
+             if (i >= list.length) {  // if synced check if list now complete
+                 completed = true
+             } else {
+                 return;  // do not continue from a sync 'pong' only from a process/clear
+             }
+         }
+
+         if (i === 0) {
+             preLoadComplete = true;
+         }
+
+         if (canLoad && i % syncFactor === 0 && i !== 0) {
+             sync();
+         }
+
+         if (canLoad) {  // pause if the model is not allowed to load
+             process();
+         }
+
+         if (i === 1) {  // sync after the first item to prevent empty states
+             sync()
+         }
+     }
+
+     function clear() {
+         if (canLoad && list !== null) {
+             sendMessage({'clear': true, 'model': model})
+         }
+     }
+
+     // Add the next item in the list to the model otherwise set complete
+     function process()
+     {
+         if (i < list.length) {
+             console.log(JSON.stringify(list[i]));
+             sendMessage({'add': list[i], 'model': model});
+             i++;
+         } else {
+             sync()
+         }
+     }
+
+     function reset()
+     {
+         i = 0;
+         completed = false;
+     }
+
+     function sync()
+     {
+         sendMessage({'sync': true, 'model': model});
+     }
+}

=== modified file 'meta-database.js'
--- meta-database.js	2014-10-28 00:58:01 +0000
+++ meta-database.js	2014-10-28 00:58:01 +0000
@@ -148,8 +148,7 @@
     db.transaction( function(tx) {
         var rs = tx.executeSql("SELECT * FROM queue ORDER BY ind ASC");
         for(var i = 0; i < rs.rows.length; i++) {
-            var dbItem = rs.rows.item(i);
-            res.push({filename:dbItem.filename});
+            res.push(makeDict(musicStore.lookup(rs.rows.item(i).filename)));
         }
     });
     return res;

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-28 00:58:01 +0000
+++ music-app.qml	2014-10-28 00:58:01 +0000
@@ -235,6 +235,9 @@
         }
 
         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));
             }
@@ -244,7 +247,6 @@
             else if (uri.indexOf("music://") === 0) {
                 uriHandler.processFile(uri.substring(8), play);
             }
-
             else {
                 console.debug("Unsupported URI " + uri + ", skipping")
             }
@@ -533,6 +535,21 @@
     width: units.gu(100)
     height: units.gu(80)
 
+    WorkerModelLoader {
+        id: queueLoaderWorker
+        canLoad: false
+        list: Library.getQueue()
+        model: trackQueue.model
+        syncFactor: 10
+
+        onCompletedChanged: {
+            if (completed) {
+                player.currentIndex = queueIndex
+                player.setSource(list[queueIndex].filename)
+            }
+        }
+    }
+
     // Run on startup
     Component.onCompleted: {
         customdebug("Version "+appVersion) // print the curren version
@@ -542,28 +559,12 @@
 
         Library.initialize();
 
-        // Load previous queue
-        if (!Library.isQueueEmpty()) {
-            var queue = Library.getQueue()
-            for (var i = 0; i < queue.length; i++) {
-                trackQueue.model.append({
-                                            album:musicStore.lookup(queue[i].filename).album,
-                                            art:musicStore.lookup(queue[i].filename).art,
-                                            author:musicStore.lookup(queue[i].filename).author,
-                                            filename:queue[i].filename,
-                                            title:musicStore.lookup(queue[i].filename).title
-                                        })
-            }
-
-            if (queue.length > queueIndex) {
-                player.currentIndex = queueIndex
-                player.setSource(queue[queueIndex].filename)
-            }
-        }
-
         // initialize playlists
         Playlists.initializePlaylist()
 
+        // allow the queue loader to start
+        queueLoaderWorker.canLoad = !Library.isQueueEmpty()
+
         // everything else
         loading.visible = true
 

=== modified file 'worker-library-loader.js'
--- worker-library-loader.js	2014-05-23 15:00:21 +0000
+++ worker-library-loader.js	2014-10-28 00:58:01 +0000
@@ -19,15 +19,14 @@
 
 
 WorkerScript.onMessage = function(msg) {
-    if (msg.clear === true)
-    {
+    if (msg.clear === true) {
         msg.model.clear();
-    }
-    else
-    {
+        WorkerScript.sendMessage({});
+    } else if (msg.sync === true) {
+        msg.model.sync();   // updates the changes to the list
+        WorkerScript.sendMessage({"sync": true});
+    } else {
         msg.model.append(msg.add);
+        WorkerScript.sendMessage({});
     }
-    msg.model.sync();   // updates the changes to the list
-
-    WorkerScript.sendMessage({});
 }