Merge lp:~osomon/webbrowser-app/create-downloads-folder into lp:webbrowser-app

[Olivier Tilloy]

Create Downloads folder if it doesn’t exist.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1501
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/565/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/856/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/856
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/776
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/776
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/776
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/778/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/778/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/778
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/778/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/565/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good, tested and it works well :)

review: Approve

=== modified file 'src/app/webbrowser/downloads-model.cpp'
--- src/app/webbrowser/downloads-model.cpp	2016-01-12 15:01:59 +0000
+++ src/app/webbrowser/downloads-model.cpp	2016-07-06 09:41:35 +0000
@@ -288,14 +288,16 @@
         QString suffix = fi.completeSuffix();
         QString filename = fi.fileName();
         QString filenameWithoutSuffix = filename.left(filename.size() - suffix.size());
-        QString dir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
-        QString destination = dir + QDir::separator() + filenameWithoutSuffix + suffix;
+        QDir dir(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
+        if (!dir.exists()) {
+            QDir::root().mkpath(dir.absolutePath());
+        }
+        QString destination = dir.absoluteFilePath(filenameWithoutSuffix + suffix);
         // Avoid filename collision by automatically inserting an incremented
         // number into the filename if the original name already exists.
         int append = 1;
         while (QFile::exists(destination)) {
-            destination = QString("%1%2.%3").arg(dir + QDir::separator() + filenameWithoutSuffix, QString::number(append), suffix);
-            ++append;
+            destination = dir.absoluteFilePath(QString("%1%2.%3").arg(filenameWithoutSuffix, QString::number(append++), suffix));
         }
         if (file.rename(destination)) {
             setPath(downloadId, destination);