Merge lp:~ahayzen/music-app/fix-1409186-queue-delete-refactor into lp:music-app/remix

[Andrew Hayzen]

* Refactor multiselect deleting from the Queue (by adding removeQueueList)

* Refactor multiselect deleting from the Queue (by adding removeQueueList)

This adds an optimised version of removeQueue to both MusicNowPlaying and meta-database called removeQueueList for removing multiple items at once.

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

PASSED: Continuous integration, rev:774
http://91.189.93.70:8080/job/music-app-ci/1197/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/622
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/49

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I only have 1 inline question. I think this looks and works very well though!

review: Needs Information

[Victor Thompson (vthompson)]

This looks good. There doesn't seem to be any speed benefits to using a different array copy method. LGTM!

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2015-01-08 00:47:52 +0000
+++ MusicNowPlaying.qml	2015-01-10 17:39:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <[e-mail]>
  *      Daniel Holm <[e-mail]>
  *      Victor Thompson <[e-mail]>
@@ -172,9 +172,10 @@
                     iconName: "delete"
                     text: i18n.tr("Delete")
                     onTriggered: {
-                        for (var i=0; i < queueListLoader.item.selectedItems.length; i++) {
-                            removeQueue(queueListLoader.item.selectedItems[i])
-                        }
+                        // Remove the tracks from the queue
+                        // Use slice() to copy the list
+                        // so that the indexes don't change as they are removed
+                        removeQueueList(queueListLoader.item.selectedItems.slice())
 
                         queueListLoader.item.closeSelection()
                     }
@@ -505,6 +506,60 @@
         }
     }
 
+    // Optimised removeQueue for removing multiple tracks from the queue
+    function removeQueueList(items)
+    {
+        var i;
+
+        // Remove from the saved queue database
+        Library.removeQueueList(items)
+
+
+        // Remove from the listmodel
+        for (i=0; i < items.length; i++) {
+            trackQueue.model.remove(items[i] - i);
+        }
+
+        // Update the currentIndex and playing status
+
+        if (trackQueue.model.count === 0) {
+            // Nothing in the queue so stop and pop the queue
+            player.stop()
+            musicToolbar.goBack()
+        } else if (items.indexOf(player.currentIndex) > -1) {
+            // Current track was removed
+
+            // Find the first index that still exists before the currentIndex
+            for (i=player.currentIndex - 1; i > -1; i--) {
+                if (items.indexOf(i) === -1) {
+                    break;
+                }
+            }
+
+            // Set this as the current track
+            player.currentIndex = i
+            queueIndex = i
+
+            // Play the next track
+            player.nextSong(player.isPlaying);
+        } else {
+            // Current track not in removed list
+            // Check if the index needs to be shuffled down due to removals
+
+            var before = 0
+
+            for (i in items) {
+                if (i < player.currentIndex) {
+                    before++;
+                }
+            }
+
+            // Update the index
+            player.currentIndex -= before;
+            queueIndex -= before;
+        }
+    }
+
     Loader {
         id: queueListLoader
         anchors {
 
=== modified file 'meta-database.js'
--- meta-database.js	2014-11-15 22:48:52 +0000
+++ meta-database.js	2015-01-10 17:39:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <[e-mail]>
  *      Daniel Holm <[e-mail]>
  *      Victor Thompson <[e-mail]>
@@ -121,6 +121,31 @@
 }
 
 
+// Optimised removeQueue for removing multiple tracks from the queue
+function removeQueueList(list)
+{
+    var db = getDatabase()
+    var res = false
+
+    db.transaction(function (tx) {
+        // Remove all the deleted indexes
+        for (var ind in list) {
+            tx.executeSql('DELETE FROM queue WHERE ind=?;', [ind])
+        }
+
+        // Rebuild queue in order
+        var rs = tx.executeSql('SELECT ind FROM queue')
+
+        for (var i=0; i < rs.rows.length; i++) {
+            tx.executeSql('UPDATE queue SET ind=? WHERE ind=?;',
+                          [i, rs.rows.item(i).ind])
+        }
+    })
+
+    return res
+}
+
+
 function getQueue() {
     var res = [];
     var db = getDatabase();