Merge lp:~vthompson/music-app/improve-playlist-delete into lp:music-app/remix

[Victor Thompson]

Improve multiselect delete for playlist items

Improve multiselect delete for playlist items

[lp:~vthompson/music-app/improve-playlist-delete]

858. By Victor Thompson on 2015-04-05

Remove returns

859. By Victor Thompson on 2015-04-05

Remove returns

860. By Victor Thompson on 2015-04-05

Remove returns

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

PASSED: Continuous integration, rev:857
http://91.189.93.70:8080/job/music-app-ci/1291/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2505
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2505/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/385
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/143

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:860
http://91.189.93.70:8080/job/music-app-ci/1292/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2506
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/386
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/144

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/improve-playlist-delete]

861. By Victor Thompson on 2015-04-05

reuse removeFromPlaylist()

862. By Victor Thompson on 2015-04-05

Execute within a single transaction.

[Andrew Hayzen (ahayzen)]

This is now super quick :)

review: Approve

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

PASSED: Continuous integration, rev:862
http://91.189.93.70:8080/job/music-app-ci/1293/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2510
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/387
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/145

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

review: Approve (continuous-integration)

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2015-03-29 22:11:54 +0000
+++ common/SongsPage.qml	2015-04-05 16:00:16 +0000
@@ -208,16 +208,7 @@
                     text: i18n.tr("Delete")
                     visible: songStackPage.line1 === i18n.tr("Playlist")
                     onTriggered: {
-                        for (var i=0; i < albumtrackslist.selectedItems.length; i++) {
-                            Playlists.removeFromPlaylist(songStackPage.line2, albumtrackslist.selectedItems[i])
-
-                            // Update indexes as an index has been removed
-                            for (var j=i + 1; j < albumtrackslist.selectedItems.length; j++) {
-                                if (albumtrackslist.selectedItems[j] > albumtrackslist.selectedItems[i]) {
-                                    albumtrackslist.selectedItems[j]--;
-                                }
-                            }
-                        }
+                        Playlists.removeFromPlaylist(songStackPage.line2, albumtrackslist.selectedItems)
 
                         albumtrackslist.closeSelection()
 
@@ -486,7 +477,7 @@
                     id: playlistRemoveAction
                     sourceComponent: Remove {
                         onTriggered: {
-                            Playlists.removeFromPlaylist(songStackPage.line2, model.i)
+                            Playlists.removeFromPlaylist(songStackPage.line2, [model.i])
 
                             playlistChangedHelper()  // update recent/playlist models
 

=== modified file 'playlists.js'
--- playlists.js	2015-01-25 16:44:49 +0000
+++ playlists.js	2015-04-05 16:00:16 +0000
@@ -367,18 +367,17 @@
     return res
 }
 
-function removeFromPlaylist(playlist, index) {
+function removeFromPlaylist(playlist, indexes) {
     var db = getPlaylistDatabase()
-    var res = false
 
     db.transaction(function (tx) {
-        res = tx.executeSql('DELETE FROM track WHERE playlist=? AND i=?;',
-                            [playlist, index]).rowsAffected > 0
+        for (var i = 0; i < indexes.length; i++) {
+            tx.executeSql('DELETE FROM track WHERE playlist=? AND i=?;',
+                          [playlist, indexes[i]]).rowsAffected > 0
+        }
 
         reorder(playlist, "remove", tx)
     })
-
-    return res
 }
 
 function reorder(playlist, type, tx) {