Merge lp:~ahayzen/music-app/remix-recent-playlists-freeze into lp:music-app/remix

[Andrew Hayzen]

* Fix for editing/deleting a playlist from Recent causing freeze
* Fix for rename in Recent attempting to add

* Fix for editing/deleting a playlist from Recent causing freeze
* Fix for rename in Recent attempting to add

[Victor Thompson (vthompson)]

LGTM! The cases that previously froze the app and/or left the playlists on the recent tab when there was no playlist with that name has been fixed.

Again, we should look at removing the need for the playlist deadlock timer.

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'MusicStart.qml'
--- MusicStart.qml	2014-10-28 03:49:01 +0000
+++ MusicStart.qml	2014-10-29 00:59:25 +0000
@@ -33,6 +33,21 @@
     id: mainpage
     title: i18n.tr("Recent")
 
+    property bool changed: false
+
+    onVisibleChanged: {
+        if (changed) {
+            changed = false
+            refreshWaitTimer.start()
+        }
+    }
+
+    Timer {  // FIXME: workaround for when the playlist is deleted and the delegate being deleting causes freezing
+        id: refreshWaitTimer
+        interval: 250
+        onTriggered: recentModel.filterRecent()
+    }
+
     head {
         actions: [
             Action {
@@ -75,6 +90,7 @@
                                                       "covers": coverSources,
                                                       "isAlbum": (model.type === "album"),
                                                       "genre": undefined,
+                                                      "page": mainpage,
                                                       "title": (model.type === "album") ? i18n.tr("Album") : i18n.tr("Playlist"),
                                                       "line1": secondaryText,
                                                       "line2": primaryText,
 
=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-28 17:49:48 +0000
+++ common/SongsPage.qml	2014-10-29 00:59:25 +0000
@@ -470,13 +470,26 @@
                         console.debug("Debug: User changed name from "+playlistName.placeholderText+" to "+playlistName.text)
 
                         if (Playlists.renamePlaylist(playlistName.placeholderText, playlistName.text) === true) {
-                            if (songStackPage.page !== undefined) {
-                                songStackPage.page.changed = true
+                            // if parent Playlists then set changed otherwise refilter
+                            if (songStackPage.page.title === i18n.tr("Playlists")) {
+                                if (songStackPage.page !== undefined) {
+                                    songStackPage.page.changed = true
+                                }
+                            } else {
+                                playlistModel.filterPlaylists()
                             }
 
                             if (Library.recentContainsPlaylist(playlistName.placeholderText)) {
                                 Library.recentRenamePlaylist(playlistName.placeholderText, playlistName.text)
-                                recentModel.filterRecent()
+
+                                // if parent Recent then set changed otherwise refilter
+                                if (songStackPage.page.title === i18n.tr("Recent")) {
+                                    if (songStackPage.page !== undefined) {
+                                        songStackPage.page.changed = true
+                                    }
+                                } else {
+                                    recentModel.filterRecent()
+                                }
                             }
 
                             PopupUtils.close(dialogEditPlaylist)
@@ -520,14 +533,27 @@
 
                     if (Library.recentContainsPlaylist(dialogRemovePlaylist.oldPlaylistName)) {
                         Library.recentRemovePlaylist(dialogRemovePlaylist.oldPlaylistName)
-                        recentModel.filterRecent()
-                    }
-
-                    if (songStackPage.page !== undefined) {
-                        songStackPage.page.changed = true
-                        songStackPage.page = undefined
-                    }
-
+
+                        // if parent Recent then set changed otherwise refilter
+                        if (songStackPage.page.title === i18n.tr("Recent")) {
+                            if (songStackPage.page !== undefined) {
+                                songStackPage.page.changed = true
+                            }
+                        } else {
+                            recentModel.filterRecent()
+                        }
+                    }
+
+                    // if parent Playlists then set changed otherwise refilter
+                    if (songStackPage.page.title === i18n.tr("Playlists")) {
+                        if (songStackPage.page !== undefined) {
+                            songStackPage.page.changed = true
+                        }
+                    } else {
+                        playlistModel.filterPlaylists()
+                    }
+
+                    songStackPage.page = undefined
                     PopupUtils.close(dialogRemovePlaylist)
 
                     musicToolbar.goBack()
 
=== modified file 'meta-database.js'
--- meta-database.js	2014-10-28 03:32:01 +0000
+++ meta-database.js	2014-10-29 00:59:25 +0000
@@ -247,7 +247,7 @@
     var db = getDatabase();
 
     db.transaction( function(tx) {
-        tx.executeSql("UPDATE recent SET data=?, WHERE type=? AND data=?",
+        tx.executeSql("UPDATE recent SET data=? WHERE type=? AND data=?",
                       [newKey, "playlist", oldKey]);
 
     });