Merge lp:~ahayzen/music-app/batch-add into lp:music-app/remix

[Andrew Hayzen]

* Batch add to playlists and queue to improve responsiveness of the app

* Batch add to playlists and queue to improve responsiveness of the app

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

PASSED: Continuous integration, rev:810
http://91.189.93.70:8080/job/music-app-ci/1262/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/827
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/114

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM! Lightning fast add to queue ftw!

review: Approve

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2015-01-11 17:04:55 +0000
+++ MusicTracks.qml	2015-01-25 16:46:40 +0000
@@ -96,10 +96,14 @@
                     iconName: "add"
                     text: i18n.tr("Add to queue")
                     onTriggered: {
+                        var items = []
+
                         for (var i=0; i < tracklist.selectedItems.length; i++) {
-                            trackQueue.append(makeDict(tracklist.model.get(tracklist.selectedItems[i], tracklist.model.RoleModelData)));
+                            items.push(tracklist.model.get(tracklist.selectedItems[i], tracklist.model.RoleModelData));
                         }
 
+                        trackQueue.appendList(items)
+
                         tracklist.closeSelection()
                     }
                 }

=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2015-01-21 00:10:33 +0000
+++ MusicaddtoPlaylist.qml	2015-01-25 16:46:40 +0000
@@ -105,11 +105,7 @@
             secondaryText: i18n.tr("%1 song", "%1 songs", playlist.count).arg(playlist.count)
 
             onClicked: {
-                for (var i=0; i < chosenElements.length; i++) {
-                    console.debug("Debug: "+chosenElements[i].filename+" added to "+name)
-
-                    Playlists.addToPlaylist(name, chosenElements[i])
-                }
+                Playlists.addToPlaylistList(name, chosenElements)
 
                 // Check that the parent parent page is not being refiltered
                 if (page !== undefined && page.page !== undefined && page.page.title === i18n.tr("Playlists")) {

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2015-01-18 16:46:48 +0000
+++ common/SongsPage.qml	2015-01-25 16:46:40 +0000
@@ -191,10 +191,14 @@
                     iconName: "add"
                     text: i18n.tr("Add to queue")
                     onTriggered: {
+                        var items = []
+
                         for (var i=0; i < albumtrackslist.selectedItems.length; i++) {
-                            trackQueue.append(makeDict(albumtrackslist.model.get(albumtrackslist.selectedItems[i], albumtrackslist.model.RoleModelData)));
+                            items.push(albumtrackslist.model.get(albumtrackslist.selectedItems[i], albumtrackslist.model.RoleModelData));
                         }
 
+                        trackQueue.appendList(items)
+
                         albumtrackslist.closeSelection()
                     }
                 },

=== modified file 'music-app.qml'
--- music-app.qml	2015-01-23 13:22:29 +0000
+++ music-app.qml	2015-01-25 16:46:40 +0000
@@ -624,12 +624,10 @@
 
         for (var i=0; i < model.rowCount; i++) {
             items.push(model.get(i, model.RoleModelData))
-
-            trackQueue.model.append(items[i]);
         }
 
         // Add model to queue storage
-        Library.addQueueList(items);
+        trackQueue.appendList(items)
     }
 
     // Converts an duration in ms to a formated string ("minutes:seconds")
@@ -889,6 +887,15 @@
             Library.addQueueItem(listElement.filename)
         }
 
+        function appendList(items)
+        {
+            for (var i=0; i < items.length; i++) {
+                model.append(makeDict(items[i]))
+            }
+
+            Library.addQueueList(items)
+        }
+
         function clear()
         {
             model.clear()

=== modified file 'playlists.js'
--- playlists.js	2015-01-18 16:46:48 +0000
+++ playlists.js	2015-01-25 16:46:40 +0000
@@ -173,6 +173,24 @@
     return rs
 }
 
+// Method to add multiple tracks to a playlist in 1 transaction
+function addToPlaylistList(playlist, items, tx)
+{
+    if (tx === undefined) {
+        var db = getPlaylistDatabase()
+
+        db.transaction(function (tx) {
+            addToPlaylistList(playlist, items, tx)
+        });
+    }
+    else {
+        for (var i=0; i < items.length; i++) {
+            addToPlaylist(playlist, items[i], tx)
+            console.debug("Debug: " + items[i].filename + " added to " + playlist)
+        }
+    }
+}
+
 function getPlaylists() {
     // returns playlists with count and 4 covers
     var db = getPlaylistDatabase()