Merge lp:~ahayzen/music-app/autopilot-fixes-001 into lp:music-app/trusty

[Andrew Hayzen]

- Fixes for autopilot

This fixes the autopilot issues.

In our initialize code, if there was no database, it would run 'Playlists.addPlaylist("Testing")'. However this was run before initializing the Playlists databases so it wouldn't work.

For now I have commented the line out as I thought the playlists are now working and you can create your own ones, but if it is required I can move it below the initialization phase.

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

PASSED: Continuous integration, rev:80
http://91.189.93.70:8080/job/music-app-ci/69/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/63
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/69
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/69
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/63

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Check with Daniel as that line is part of the added playlist capability--but I assume we can just remove it rather than commenting it out or moving it elsewhere. I'll test this when I get home. Good work!

[lp:~ahayzen/music-app/autopilot-fixes-001]

81. By Andrew Hayzen on 2013-08-01

- Code cleanup

[Andrew Hayzen (ahayzen)]

Spoke with Daniel, he said it is not required anymore, so I have removed the code.

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

PASSED: Continuous integration, rev:81
http://91.189.93.70:8080/job/music-app-ci/70/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/64
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/64

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

review: Approve (continuous-integration)

[Daniel Holm (danielholm)]

Good work!

review: Approve

[Victor Thompson (vthompson)]

Tests pass. Great fix!

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2013-07-29 19:23:50 +0000
+++ music-app.qml	2013-08-01 19:25:34 +0000
@@ -54,7 +54,6 @@
             //Settings.setSetting("scrobble", "0") // default state of shuffle
             //Settings.setSetting("scrobble", "0") // default state of scrobble
             Settings.setSetting("currentfolder", folderModel.homePath() + "/Music")
-            Playlists.addPlaylist("Testing") // for now, but remove when toolbar works again.
         }
         Library.reset()
         Library.initialize()

=== modified file 'playlists.js'
--- playlists.js	2013-07-26 22:19:02 +0000
+++ playlists.js	2013-08-01 19:25:34 +0000
@@ -35,7 +35,7 @@
 }
 // same thing for individal playlists
 function initializePlaylist() {
-    var db = LocalStorage.openDatabaseSync("music-app-playlist", "", "StorageDatabase", 1000000);
+    var db = getPlaylistDatabase();
 
     // does the user have the latest db scheme?
     if (db.version === "1.0") {
@@ -131,7 +131,7 @@
            }
       })
    } catch(e) {
-       return "";
+       return [];
    }
   return res
 }