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

[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:649
http://91.189.93.70:8080/job/music-app-ci/1148/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1040
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1040/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/372

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

=== modified file 'MusicPlaylists.qml'
--- MusicPlaylists.qml	2014-09-20 10:50:45 +0000
+++ MusicPlaylists.qml	2014-10-19 06:29:48 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Components.Popups 1.0
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
+import "meta-database.js" as Library
 import "settings.js" as Settings
 import "scrobble.js" as Scrobble
 import "playlists.js" as Playlists
@@ -86,6 +87,11 @@
                         if (Playlists.renamePlaylist(oldPlaylistName, playlistName.text) === true) {
                             playlistModel.filterPlaylists()
 
+                            if (Library.recentContainsPlaylist(oldPlaylistName)) {
+                                Library.recentRenamePlaylist(oldPlaylistName, playlistName.text)
+                                recentModel.filterRecent()
+                            }
+
                             PopupUtils.close(dialogEditPlaylist)
 
                             if (inPlaylist) {
@@ -144,6 +150,12 @@
                         Playlists.removePlaylist(model.name)
 
                         playlistModel.filterPlaylists();
+
+                        if (Library.recentContainsPlaylist(model.name)) {
+                            Library.recentRemovePlaylist(model.name)
+                            mainView.hasRecent = !Library.isRecentEmpty()
+                            recentModel.filterRecent()
+                        }
                     }
                 }
 

=== modified file 'meta-database.js'
--- meta-database.js	2014-09-12 02:57:30 +0000
+++ meta-database.js	2014-10-19 06:29:48 +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;