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

[Victor Thompson]

* Use queue's previous size to append a model to the queue

* Use queue's previous size to append a model to the queue

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

PASSED: Continuous integration, rev:740
http://91.189.93.70:8080/job/music-app-remix-ci/269/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/227
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/44

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:740
http://91.189.93.70:8080/job/music-app-ci/1151/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/228
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/3

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

1) Play All on the SongsPage
2) Queue all a different album
3) Check the queue is as expected
4) Restart the app
5) Notice that the album that was queue'd does not appear in the queue?

review: Needs Fixing

[lp:~vthompson/music-app/fix-1393065]

741. By Victor Thompson on 2014-11-15

Fix index into items

[Victor Thompson (vthompson)]

Ok, oddly enough the fix seemed to work on the desktop just fine. But, the fix had an error in the for loop. This has been fixed.

[Andrew Hayzen (ahayzen)]

Looks good now thanks for the fix, now I won't be confused in my morning walk :)

review: Approve

=== modified file 'meta-database.js'
--- meta-database.js	2014-11-14 09:18:24 +0000
+++ meta-database.js	2014-11-15 22:49:05 +0000
@@ -56,12 +56,12 @@
     );
 }
 
-function addQueueList(items) {
+function addQueueList(ind, items) {
     var db = getDatabase();
 
     db.transaction(function(tx) {
         for (var i = 0; i < items.length; i++) {
-            tx.executeSql('INSERT OR REPLACE INTO queue (ind, filename) VALUES (?,?);', [i, items[i].filename]);
+            tx.executeSql('INSERT OR REPLACE INTO queue (ind, filename) VALUES (?,?);', [i + ind, items[i].filename]);
         }
     }
     );

=== modified file 'music-app.qml'
--- music-app.qml	2014-11-15 21:56:15 +0000
+++ music-app.qml	2014-11-15 22:49:05 +0000
@@ -611,6 +611,7 @@
         }
 
         var items = []
+        var previousQueueSize = trackQueue.model.count
 
         for (var i=0; i < model.rowCount; i++) {
             items.push(model.get(i, model.RoleModelData))
@@ -619,7 +620,7 @@
         }
 
         // Add model to queue storage
-        Library.addQueueList(items);
+        Library.addQueueList(previousQueueSize, items);
     }
 
     // Converts an duration in ms to a formated string ("minutes:seconds")