Merge lp:~ahayzen/music-app/remix-fix-playlists-1392022 into lp:music-app/remix

[Andrew Hayzen]

* Remove erroneous tracks from the playlist

* Remove erroneous tracks from the playlist

This removes any tracks that are no longer in the playlist.

TESTING:
1) Make a playlist with multiple tracks eg 1, 2, 3, 2, 3
2) Optionally close the app
3) Delete track 2 from the device
4) Start the app if you closed it
5) Open the playlist and only tracks 1, 3, 3 should be shown.
Note the covers should be correct on the playlists tab but the count will be incorrect until a restart.

[Victor Thompson (vthompson)]

LGTM! Good work with the quick turnaround!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'playlists.js'
--- playlists.js	2014-11-10 02:55:32 +0000
+++ playlists.js	2014-11-12 21:21:22 +0000
@@ -202,6 +202,8 @@
     var db = getPlaylistDatabase()
     var res = []
 
+    var erroneousTracks = [];
+
     try {
         db.transaction(function (tx) {
             var rs = tx.executeSql('SELECT * FROM track WHERE playlist=?;',
@@ -209,20 +211,37 @@
             for (var j = 0; j < rs.rows.length; j++) {
                 var dbItem = rs.rows.item(j)
 
-                res.push({
-                             i: dbItem.i,
-                             filename: dbItem.filename,
-                             title: dbItem.title,
-                             author: dbItem.author,
-                             album: dbItem.album,
-                             art: musicStore.lookup(dbItem.filename).art
-                         })
-            }
+                if (musicStore.lookup(dbItem.filename) === null) {
+                    erroneousTracks.push(dbItem.i);
+                } else {
+                    res.push({
+                                 i: dbItem.i,
+                                 filename: dbItem.filename,
+                                 title: dbItem.title,
+                                 author: dbItem.author,
+                                 album: dbItem.album,
+                                 art: musicStore.lookup(dbItem.filename).art
+                             })
+                }
+            }
+
+            // remove bad tracks
+            for (var j=0; j < erroneousTracks.length; j++) {
+                console.debug("Remove", erroneousTracks[j], "from playlist", playlist);
+                res = tx.executeSql('DELETE FROM track WHERE playlist=? AND i=?;',
+                                    [playlist, erroneousTracks[j]]).rowsAffected > 0
+            }
+
+            reorder(playlist, "remove", tx)
         })
     } catch (e) {
         return []
     }
 
+    if (erroneousTracks.length > 0) {  // reget data as indexes are out of sync
+        res = getPlaylistTracks(playlist)
+    }
+
     return res
 }
 
@@ -260,14 +279,16 @@
 
             for (var i = 0; i < rs.rows.length
                  && i < (max || rs.rows.length); i++) {
-                var row = {
-                    author: rs.rows.item(i).author,
-                    album: rs.rows.item(i).album,
-                    art: musicStore.lookup(rs.rows.item(i).filename).art
-                }
+                if (musicStore.lookup(rs.rows.item(i).filename) !== null) {
+                    var row = {
+                        author: rs.rows.item(i).author,
+                        album: rs.rows.item(i).album,
+                        art: musicStore.lookup(rs.rows.item(i).filename).art
+                    }
 
-                if (find(res, row) === null) {
-                    res.push(row)
+                    if (find(res, row) === null) {
+                        res.push(row)
+                    }
                 }
             }
         })