Merge lp:~vthompson/music-app/remove-single-item-performance into lp:music-app/remix

[Victor Thompson]

* Use removeQueueList() for single items for performance
* Remove removeQueue() and removeQueueItem()

* Use removeQueueList() for single items for performance
* Remove removeQueue() and removeQueueItem()

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

PASSED: Continuous integration, rev:811
http://91.189.93.70:8080/job/music-app-ci/1264/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/830
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/116

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, *massively* improves deletion on large queues :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2015-01-23 07:22:52 +0000
+++ MusicNowPlaying.qml	2015-01-25 20:07:19 +0000
@@ -491,7 +491,7 @@
                     state: ""
 
                     leftSideAction: Remove {
-                        onTriggered: trackQueue.removeQueue(index)
+                        onTriggered: trackQueue.removeQueueList([index])
                     }
                     multiselectable: true
                     reorderable: true
 
=== modified file 'meta-database.js'
--- meta-database.js	2015-01-20 23:58:27 +0000
+++ meta-database.js	2015-01-25 20:07:19 +0000
@@ -123,26 +123,6 @@
     })
 }
 
-function removeQueueItem(ind) {
-    var db = getDatabase()
-    var res = false
-
-    db.transaction(function (tx) {
-        tx.executeSql('DELETE FROM queue WHERE ind=?;', [ind])
-
-        var rs = tx.executeSql('SELECT MAX(ind) FROM queue')
-
-        var lastIndex = isQueueEmpty() ? 0 : rs.rows.item(0)["MAX(ind)"]
-
-        for(var i = ind+1; i <= lastIndex; i++) {
-            tx.executeSql('UPDATE queue SET ind=? WHERE ind=?;',
-                          [i-1, i])
-        }
-    })
-
-    return res
-}
-
 
 // Optimised removeQueue for removing multiple tracks from the queue
 function removeQueueList(list)
 
=== modified file 'music-app.qml'
--- music-app.qml	2015-01-25 16:44:49 +0000
+++ music-app.qml	2015-01-25 20:07:19 +0000
@@ -904,27 +904,6 @@
             queueIndex = 0  // reset otherwise when you append and play 1 track it doesn't update correctly
         }
 
-        function removeQueue(index)
-        {
-            var removedIndex = index
-
-            if (trackQueue.model.count === 1) {
-                player.stop()
-                musicToolbar.goBack()
-            } else if (index === player.currentIndex) {
-                player.nextSong(player.isPlaying);
-            }
-
-            trackQueue.model.remove(index);
-            Library.removeQueueItem(removedIndex);
-
-            if (removedIndex < player.currentIndex) {
-                // update index as the old has been removed
-                player.currentIndex -= 1;
-                queueIndex -= 1;
-            }
-        }
-
         // Optimised removeQueue for removing multiple tracks from the queue
         function removeQueueList(items)
         {