Merge lp:~vthompson/music-app/remix-fix-1382170 into lp:music-app/remix

[Victor Thompson]

Fix playlist deletion and renaming in recent table

Fix playlist deletion and renaming in recent table. Adds some functions for modifying the recently played table. This is a fairly minimal fix, but it should encompass every playlist rename and deletion case with regard to the recent list/table.

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-16 23:36:00 +0000
+++ common/SongsPage.qml	2014-10-18 03:54:01 +0000
@@ -365,6 +365,11 @@
                         if (Playlists.renamePlaylist(playlistName.placeholderText, playlistName.text) === true) {
                             playlistModel.filterPlaylists()
 
+                            if (Library.recentContainsPlaylist(playlistName.placeholderText)) {
+                                Library.recentRenamePlaylist(playlistName.placeholderText, playlistName.text)
+                                recentModel.filterRecent()
+                            }
+
                             PopupUtils.close(dialogEditPlaylist)
 
                             line2 = playlistName.text
@@ -406,6 +411,12 @@
 
                     playlistModel.filterPlaylists();
 
+                    if (Library.recentContainsPlaylist(dialogRemovePlaylist.oldPlaylistName)) {
+                        Library.recentRemovePlaylist(dialogRemovePlaylist.oldPlaylistName)
+                        mainView.hasRecent = !Library.isRecentEmpty()
+                        recentModel.filterRecent()
+                    }
+
                     PopupUtils.close(dialogRemovePlaylist)
 
                     musicToolbar.goBack()

=== modified file 'meta-database.js'
--- meta-database.js	2014-09-12 02:57:30 +0000
+++ meta-database.js	2014-10-18 03:54:01 +0000
@@ -103,6 +103,37 @@
     return res;
 }
 
+function recentContainsPlaylist(key) {
+    var db = getDatabase();
+    var rs;
+    db.transaction( function(tx) {
+        rs = tx.executeSql("SELECT count(*) as value FROM recent WHERE type=? AND key=?",
+                               ["playlist", key]);
+    }
+    );
+    return rs.rows.item(0).value > 0;
+}
+
+function recentRemovePlaylist(key) {
+    var res = false
+    var db = getDatabase();
+    db.transaction( function(tx) {
+        res = tx.executeSql("DELETE FROM recent WHERE type=? AND key=?",
+                            ["playlist", key]).rowsAffected > 0;
+
+    })
+    return res
+}
+
+function recentRenamePlaylist(oldKey, newKey) {
+    var db = getDatabase();
+    db.transaction( function(tx) {
+        tx.executeSql("UPDATE recent SET title=?,key=? WHERE type=? AND key=?",
+                            [newKey, newKey, "playlist", oldKey]);
+
+    })
+}
+
 function isRecentEmpty() {
     var db = getDatabase();
     var res = 0;