Merge lp:~mandel/ubuntu-download-manager/fix-1250181 into lp:ubuntu-download-manager/saucy

[Manuel de la Peña]

Ensure that a local file is only present once in a group download.

Ensure that a local file is only present once in a group download.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'libubuntudownloadmanager/group_download.cpp'
--- libubuntudownloadmanager/group_download.cpp	2013-09-30 11:07:20 +0000
+++ libubuntudownloadmanager/group_download.cpp	2013-11-12 18:38:27 +0000
@@ -70,6 +70,7 @@
         Q_Q(GroupDownload);
         QVariantMap metadata = q->metadata();
         QMap<QString, QString> headers = q->headers();
+        QStringList localPaths;
 
         // build downloads and add them to the q, it will take care of
         // starting them etc..
@@ -103,6 +104,17 @@
                         headers));
             }
 
+            // ensure that the local path is not used by any other download.
+            QString localFilePath = singleDownload->filePath();
+            qDebug() << localFilePath;
+            if (localPaths.contains(localFilePath)) {
+                q->setIsValid(false);
+                q->setLastError("Duplicated local path passed: " + localFilePath);
+                break;
+            } else {
+                localPaths.append(localFilePath);
+            }
+
             // check that the download is valid, if it is not set to invalid
             // and use the last error from the download
             if (!singleDownload->isValid()) {

=== modified file 'ubuntu-download-manager-tests/test_group_download.cpp'
--- ubuntu-download-manager-tests/test_group_download.cpp	2013-09-30 11:07:20 +0000
+++ ubuntu-download-manager-tests/test_group_download.cpp	2013-11-12 18:38:27 +0000
@@ -30,7 +30,7 @@
     BaseTestCase::init();
     _id = QUuid::createUuid();
     _path = "/group/dbus/path";
-    _isConfined = true;
+    _isConfined = false;
     _rootPath = "/random/dbus/path";
     _algo = "Md5";
     _isGSMDownloadAllowed = true;
@@ -902,3 +902,24 @@
 
     QVERIFY(group->isValid());
 }
+
+void
+TestGroupDownload::testDuplicatedLocalPath() {
+    QString filePath = testDirectory() + QDir::separator() + "test_file.jpg";
+
+    QList<GroupDownloadStruct> downloadsStruct;
+    downloadsStruct.append(GroupDownloadStruct("http://one.ubuntu.com",
+        filePath, ""));
+    downloadsStruct.append(GroupDownloadStruct("http://ubuntu.com",
+        filePath, ""));
+    downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
+        "other_reddit_local_file", ""));
+
+    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+        downloadsStruct, "md5", _isGSMDownloadAllowed, _metadata, _headers,
+        QSharedPointer<SystemNetworkInfo>(_networkInfo),
+        QSharedPointer<DownloadFactory>(_downloadFactory),
+        QSharedPointer<FileManager>(_fileManager));
+
+    QVERIFY(!group->isValid());
+}

=== modified file 'ubuntu-download-manager-tests/test_group_download.h'
--- ubuntu-download-manager-tests/test_group_download.h	2013-09-25 12:17:16 +0000
+++ ubuntu-download-manager-tests/test_group_download.h	2013-11-12 18:38:27 +0000
@@ -78,6 +78,9 @@
     void testInvalidFilePresent();
     void testValidFileNotPresent();
 
+    // ensure that local paths are just used one
+    void testDuplicatedLocalPath();
+
  private:
     QUuid _id;
     QString _path;