Merge lp:~michael-sheldon/content-hub/download-zip-integration into lp:content-hub

[Michael Sheldon]

Add support for receiving directories of unzipped files from download manager.

Add support for receiving directories of unzipped files from download manager.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/content-hub-ci/196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/196/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 The following MRs are useful for testing this functionality:

https://code.launchpad.net/~michael-sheldon/webbrowser-app/7digital-album-download/+merge/237763
https://code.launchpad.net/~michael-sheldon/ubuntu-download-manager/extract/+merge/237765
https://code.launchpad.net/~charlesk/indicator-transfer/lp-1378941-throttle-download-status-updates/+merge/237683

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * Yes

[Ken VanDine (ken-vandine)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
 * Yes, tested on krillin. There was an error message in music-app, but the import completed and worked fine. That's probably a bug in music-app we can investigate separately.

Did CI run pass? If not, please explain why.
 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
 * Yes

review: Approve

[lp:~michael-sheldon/content-hub/download-zip-integration]

144. By Michael Sheldon on 2014-10-09

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/content-hub-ci/198/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/55

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/198/rebuild

review: Approve (continuous-integration)

[lp:~michael-sheldon/content-hub/download-zip-integration]

145. By Michael Sheldon on 2014-10-14

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/content-hub-ci/201/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/58

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/201/rebuild

review: Approve (continuous-integration)

=== modified file 'src/com/ubuntu/content/detail/transfer.cpp'
--- src/com/ubuntu/content/detail/transfer.cpp	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/detail/transfer.cpp	2014-10-14 11:16:12 +0000
@@ -20,6 +20,7 @@
 #include "transfer.h"
 #include "utils.cpp"
 
+#include <QFileInfo>
 #include <com/ubuntu/content/hub.h>
 #include <com/ubuntu/content/store.h>
 #include <com/ubuntu/content/transfer.h>
@@ -214,11 +215,32 @@
     }
 }
 
+void cucd::Transfer::AddItemsFromDir(QDir dir) {
+    QFileInfoList files = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files);
+    foreach(const QFileInfo &fileInfo, files) {
+        QString path = fileInfo.absoluteFilePath();
+        if(fileInfo.isDir()) {
+            AddItemsFromDir(QDir(path));
+        } else {
+            cuc::Item item = cuc::Item{QUrl::fromLocalFile(path).toString()};
+            d->items.append(QVariant::fromValue(item));
+        }
+    }
+}
+
 void cucd::Transfer::DownloadComplete(QString destFilePath)
 {
     TRACE() << __PRETTY_FUNCTION__;
-    cuc::Item item = cuc::Item{QUrl::fromLocalFile(destFilePath).toString()};
-    d->items.append(QVariant::fromValue(item));
+    QFileInfo fileInfo(destFilePath);
+    if(fileInfo.isDir()) {
+        // When downloading and deflating zip files, download manager may
+        // send us the path of the directory that multiple files have been
+        // unpacked into.
+        AddItemsFromDir(QDir(destFilePath));
+    } else {
+        cuc::Item item = cuc::Item{QUrl::fromLocalFile(destFilePath).toString()};
+        d->items.append(QVariant::fromValue(item));
+    }
     d->state = cuc::Transfer::downloaded;
     Q_EMIT(StateChanged(d->state));
 }

=== modified file 'src/com/ubuntu/content/detail/transfer.h'
--- src/com/ubuntu/content/detail/transfer.h	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/detail/transfer.h	2014-10-14 11:16:12 +0000
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include <QStringList>
+#include <QDir>
 #include <ubuntu/download_manager/error.h>
 
 namespace com
@@ -84,6 +85,7 @@
     void Download();
     void DownloadError(Ubuntu::DownloadManager::Error* error);
     QString ContentType();
+    void AddItemsFromDir(QDir dir);
 
   private:
     struct Private;