Merge lp:~mandel/ubuntu-download-manager/handle-error-correctly into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that all downloads are canceled and that the files are correctly removed.

Ensure that all downloads are canceled and that the files are correctly removed.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:121
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/62

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/71/rebuild

review: Approve (continuous-integration)

[Barry Warsaw (barry)]

Tested with system-image development branch, and indeed it fixes the problem. Thanks!

review: Approve

=== modified file 'libubuntudownloadmanager/group_download.cpp'
--- libubuntudownloadmanager/group_download.cpp	2013-09-20 11:28:22 +0000
+++ libubuntudownloadmanager/group_download.cpp	2013-09-24 10:52:26 +0000
@@ -111,7 +111,7 @@
         }
     }
 
-    void cancelDownload() {
+    void cancelDownload(bool emitSignal = true) {
         qDebug() << __PRETTY_FUNCTION__;
         Q_Q(GroupDownload);
         foreach(SingleDownload* download, _downloads) {
@@ -131,7 +131,8 @@
             _fileManager->remove(path);
         }
 
-        emit q->canceled(true);
+        if (emitSignal)
+            emit q->canceled(true);
     }
 
     void pauseDownload() {
@@ -208,14 +209,12 @@
  private:
     // slots to keep track of the downloads
     void onError(const QString& error) {
+        qDebug() << __PRETTY_FUNCTION__;
         Q_Q(GroupDownload);
         SingleDownload* sender = qobject_cast<SingleDownload*>(q->sender());
-        qDebug() << __PRETTY_FUNCTION__;
-        // we got an error, we remove all the files that have already
-        // been downloaded and emit the error signal
-        foreach(const QString& file, _finishedDownloads) {
-            _fileManager->remove(file);
-        }
+        // we got an error, cancel all downloads and later remove all the
+        // files that we managed to download
+        cancelDownload(false);
         QString errorMsg = sender->url().toString() + ":" + error;
         q->emitError(errorMsg);
     }