Merge lp:~ahayzen/music-app/content-hub-fix-1381522 into lp:music-app/trusty

[Andrew Hayzen]

* Allow for imports to start when already importing

* Allow for imports to start when already importing

Note this is the 'backport' for the remix [0] mp.

0 - https://code.launchpad.net/~andrew-hayzen/music-app/remix-content-hub-fix-1381522/+merge/238632

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

PASSED: Continuous integration, rev:646
http://91.189.93.70:8080/job/music-app-ci/1147/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1004
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1004/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/371

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2014-09-23 15:59:28 +0000
+++ music-app.qml	2014-10-16 22:27:29 +0000
@@ -275,6 +275,7 @@
     // Content hub support
     property list<ContentItem> importItems
     property var activeTransfer
+    property int importId: 0
 
     ContentTransferHint {
         anchors {
@@ -291,6 +292,10 @@
             if (activeTransfer.state === ContentTransfer.Charged) {
                 importItems = activeTransfer.items;
 
+                var processId = importId++;
+
+                console.debug("Triggering content-hub import ID", processId);
+
                 searchPaths = [];
 
                 var err = [];
@@ -315,9 +320,16 @@
 
 
                 if (success === true) {
-                    contentHubWaitForFile.dialog = PopupUtils.open(contentHubWait, mainView)
-                    contentHubWaitForFile.searchPaths = contentHub.searchPaths;
-                    contentHubWaitForFile.start();
+                    if (contentHubWaitForFile.processId === -1) {
+                        contentHubWaitForFile.dialog = PopupUtils.open(contentHubWait, mainView)
+                        contentHubWaitForFile.searchPaths = contentHub.searchPaths;
+                        contentHubWaitForFile.processId = processId;
+                        contentHubWaitForFile.start();
+                    } else {
+                        contentHubWaitForFile.searchPaths.push.apply(contentHubWaitForFile.searchPaths, contentHub.searchPaths);
+                        contentHubWaitForFile.count = 0;
+                        contentHubWaitForFile.restart();
+                    }
                 }
                 else {
                     var errordialog = PopupUtils.open(contentHubError, mainView)
@@ -386,8 +398,10 @@
         property var dialog: null
         property var searchPaths
         property int count: 0
+        property int processId: -1
 
         function stopTimer() {
+            processId = -1;
             count = 0;
             stop();