Merge lp:~mandel/ubuntu-download-manager/all-downloads-client into lp:ubuntu-download-manager

[Manuel de la Peña]

Provide the methods that allow to get all the downloads and all the downloads with a given metadata value.

Provide the methods that allow to get all the downloads and all the downloads with a given metadata value.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/249

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

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

looks good, tests pass. will start adding it to unity-scope-click and I'll file separate bugs if there are any problems.

review: Approve

[Alejandro J. Cura (alecu)]

puked a little bit in my mouth when I saw the size of this, but it looks good: +1

review: Approve

[dobey (dobey)]

Why are so many changes in this one branch? Particularly the huge change to cmake, addition of coverage reporting (the necessary cmake files of which have some small licensing issues), and several other small bug fixes? The branch is now beyond unreasonably huge, due to r242..246 which were all added after the branch had been approved. Not to mention the 19 other current MPs, some of which are also extremely large.

I find it very hard to believe that a branch of this size, with this many changes, is acceptable to land. Are those commits made *after* the approval really necessary to have here? If so, why?

review: Needs Fixing

[Manuel de la Peña (mandel)]

We are not just landing this fix for unity-click-scope. Reproposed with the correct pre-requisite branch. Please take a look as soon as possible or we cannot block code any longer.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/613/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/503/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/502

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:246
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mandel/ubuntu-download-manager/all-downloads-client/+merge/215880/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/614/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/503

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

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

=== added file 'src/downloads/client/ubuntu-download-manager-client.pro.THIS'

Looks like this is left around from a conflict somewhere? Can you remove this?

review: Needs Fixing

[lp:~mandel/ubuntu-download-manager/all-downloads-client]

247. By Manuel de la Peña on 2014-04-15

Remove useless files.

248. By Manuel de la Peña on 2014-04-15

Merged set-download-dir into all-downloads-client.

249. By Manuel de la Peña on 2014-04-15

Merged set-download-dir into all-downloads-client.

[dobey (dobey)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/615/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/504

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

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

review: Abstain

[lp:~mandel/ubuntu-download-manager/all-downloads-client]

250. By Manuel de la Peña on 2014-04-21

Remove the .THIS file.

251. By Manuel de la Peña on 2014-04-21

Fix the system dbus activation file location.

252. By Manuel de la Peña on 2014-04-29

Update the name of the package to match the names of the .so

253. By Manuel de la Peña on 2014-04-29

Move the location of the pkconfig files.

254. By Manuel de la Peña on 2014-04-29

Add pkgconfig to the .pc paths.

255. By Manuel de la Peña on 2014-04-29

Do not configure in the wrong dir and jsut move to libexdir on install time.

256. By Manuel de la Peña on 2014-04-29

Fix broken install path.

Unmerged revisions

=== modified file 'docs/com.canonical.applications.download.xml'
--- docs/com.canonical.applications.download.xml	2014-02-11 15:35:52 +0000
+++ docs/com.canonical.applications.download.xml	2014-04-15 13:56:56 +0000
@@ -22,6 +22,10 @@
         <arg name="speed" type="t" direction="out"/>
     </method>
 
+    <method name="setDestinationDir">
+        <arg name="path" type="s" direction="in"/>
+    </method>
+
     <method name="allowGSMDownload">
         <arg name="allowed" type="b" direction="in"/>
     </method>

=== modified file 'src/downloads/client/CMakeLists.txt'
--- src/downloads/client/CMakeLists.txt	2014-04-15 13:56:55 +0000
+++ src/downloads/client/CMakeLists.txt	2014-04-15 13:56:56 +0000
@@ -3,6 +3,7 @@
 set(SOURCES
         ubuntu/download_manager/download_impl.cpp
         ubuntu/download_manager/download_interface.cpp
+	ubuntu/download_manager/downloads_list_impl.cpp
         ubuntu/download_manager/download_pendingcall_watcher.cpp
         ubuntu/download_manager/error.cpp
         ubuntu/download_manager/group_download.cpp
@@ -15,6 +16,7 @@
 
 set(PUBLIC_HEADERS
         ubuntu/download_manager/download.h
+	ubuntu/download_manager/downloads_list.h
         ubuntu/download_manager/error.h
         ubuntu/download_manager/group_download.h
         ubuntu/download_manager/manager.h
@@ -23,6 +25,7 @@
 set(PRIVATE_HEADERS
         ubuntu/download_manager/download_impl.h
         ubuntu/download_manager/download_interface.h
+	ubuntu/download_manager/downloads_list_impl.h
         ubuntu/download_manager/download_pendingcall_watcher.h
         ubuntu/download_manager/manager_impl.h
         ubuntu/download_manager/manager_interface.h

=== added file 'src/downloads/client/ubuntu-download-manager-client.pro.THIS'
--- src/downloads/client/ubuntu-download-manager-client.pro.THIS	1970-01-01 00:00:00 +0000
+++ src/downloads/client/ubuntu-download-manager-client.pro.THIS	2014-04-15 13:56:56 +0000
@@ -0,0 +1,59 @@
+include(../common-project-config.pri)
+include(../common-vars.pri)
+
+QT       += dbus
+QT       -= gui
+
+TARGET = ubuntu-download-manager-client
+TEMPLATE = lib
+
+DEFINES += UBUNTUDOWNLOADMANAGERCLIENT_LIBRARY
+
+SOURCES += ubuntu/download_manager/manager.cpp \
+           ubuntu/download_manager/manager_impl.cpp \
+           ubuntu/download_manager/download_interface.cpp \
+           ubuntu/download_manager/manager_interface.cpp \
+           ubuntu/download_manager/download_impl.cpp \
+           ubuntu/download_manager/downloads_list_impl.cpp \
+           ubuntu/download_manager/group_download.cpp \
+           ubuntu/download_manager/manager_pendingcall_watcher.cpp \
+           ubuntu/download_manager/error.cpp \
+           ubuntu/download_manager/pending_call_watcher.cpp \
+           ubuntu/download_manager/download_pendingcall_watcher.cpp
+
+public_headers = \
+    ubuntu/download_manager/manager.h \
+    ubuntu/download_manager/download.h \
+    ubuntu/download_manager/downloads_list.h \
+    ubuntu/download_manager/group_download.h \
+    ubuntu/download_manager/error.h
+
+private_headers = \
+    ubuntu/download_manager/manager_impl.h \
+    ubuntu/download_manager/download_impl.h \
+    ubuntu/download_manager/downloads_list_impl.h \
+    ubuntu/download_manager/download_interface.h \
+    ubuntu/download_manager/manager_interface.h \
+    ubuntu/download_manager/manager_pendingcall_watcher.h \
+    ubuntu/download_manager/pending_call_watcher.h \
+    ubuntu/download_manager/download_pendingcall_watcher.h
+
+HEADERS +=\
+    $$public_headers \
+    $$private_headers
+
+OTHER_FILES += \
+    ubuntu-download-manager-client.pc.in
+
+headers.files = $$public_headers
+
+include(../common-installs-config.pri)
+
+pkgconfig.files = ubuntu-download-manager-client.pc
+include(../common-pkgconfig.pri)
+INSTALLS += pkgconfig
+
+LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
+
+INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
+DEPENDPATH += $$PWD/../ubuntu-download-manager-common

=== modified file 'src/downloads/client/ubuntu/download_manager/download.h'
--- src/downloads/client/ubuntu/download_manager/download.h	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/download.h	2014-04-15 13:56:56 +0000
@@ -114,6 +114,15 @@
     virtual bool isMobileDownloadAllowed() = 0;
 
     /*!
+        \fn void setDestinationDir(const QString& path);
+
+        Notifies the download manager that the local path of the download
+        must be a different one. This call can only be performed if the
+        download was not started else it will result in an error.
+    */
+    virtual void setDestinationDir(const QString& path) = 0;
+
+    /*!
         \fn void setThrottle(qulonglong speed)
 
         Notifies the download manager that the download represented by this

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/download_impl.cpp	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.cpp	2014-04-15 13:56:56 +0000
@@ -96,7 +96,7 @@
 DownloadImpl::start() {
     QDBusPendingCall call =
         _dbusInterface->start();
-    auto watcher = new DownloadPendingCallWatcher(_conn, _servicePath,
+    auto watcher = new DownloadPCW(_conn, _servicePath,
         call, this);
     Q_UNUSED(watcher);
 }
@@ -105,7 +105,7 @@
 DownloadImpl::pause() {
     QDBusPendingCall call =
         _dbusInterface->pause();
-    auto watcher = new DownloadPendingCallWatcher(_conn, _servicePath,
+    auto watcher = new DownloadPCW(_conn, _servicePath,
         call, this);
     Q_UNUSED(watcher);
 }
@@ -114,7 +114,7 @@
 DownloadImpl::resume() {
     QDBusPendingCall call =
         _dbusInterface->resume();
-    auto watcher = new DownloadPendingCallWatcher(_conn, _servicePath,
+    auto watcher = new DownloadPCW(_conn, _servicePath,
         call, this);
     Q_UNUSED(watcher);
 }
@@ -123,7 +123,7 @@
 DownloadImpl::cancel() {
     QDBusPendingCall call =
         _dbusInterface->cancel();
-    auto watcher = new DownloadPendingCallWatcher(_conn, _servicePath,
+    auto watcher = new DownloadPCW(_conn, _servicePath,
         call, this);
     Q_UNUSED(watcher);
 }
@@ -155,6 +155,17 @@
 }
 
 void
+DownloadImpl::setDestinationDir(const QString& path) {
+    QDBusPendingReply<> reply =
+        _dbusInterface->setDestinationDir(path);
+    // block, the call should be fast enough
+    reply.waitForFinished();
+    if (reply.isError()) {
+        setLastError(reply.error());
+    }
+}
+
+void
 DownloadImpl::setThrottle(qulonglong speed) {
     QDBusPendingReply<> reply =
         _dbusInterface->setThrottle(speed);

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.h'
--- src/downloads/client/ubuntu/download_manager/download_impl.h	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.h	2014-04-15 13:56:56 +0000
@@ -43,8 +43,11 @@
     Q_OBJECT
 
     // allow the manager to create downloads
-    friend class DownloadPendingCallWatcher;
-    friend class DownloadManagerPendingCallWatcher;
+    friend class ManagerImpl;
+    friend class DownloadPCW;
+    friend class MetadataDownloadsListManagerPCW;
+    friend class DownloadsListManagerPCW;
+    friend class DownloadManagerPCW;
 
  public:
     virtual ~DownloadImpl();
@@ -57,6 +60,7 @@
     void allowMobileDownload(bool allowed);
     bool isMobileDownloadAllowed();
 
+    void setDestinationDir(const QString& path);
     void setThrottle(qulonglong speed);
     qulonglong throttle();
 

=== modified file 'src/downloads/client/ubuntu/download_manager/download_interface.h'
--- src/downloads/client/ubuntu/download_manager/download_interface.h	2014-02-11 19:57:39 +0000
+++ src/downloads/client/ubuntu/download_manager/download_interface.h	2014-04-15 13:56:56 +0000
@@ -80,6 +80,13 @@
         return asyncCallWithArgumentList(QLatin1String("resume"), argumentList);
     }
 
+    inline QDBusPendingReply<> setDestinationDir(const QString &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QLatin1String("setDestinationDir"), argumentList);
+    }
+
     inline QDBusPendingReply<> setThrottle(qulonglong speed)
     {
         QList<QVariant> argumentList;

=== modified file 'src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.cpp'
--- src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.cpp	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.cpp	2014-04-15 13:56:56 +0000
@@ -26,19 +26,19 @@
 
 namespace DownloadManager {
 
-DownloadPendingCallWatcher::DownloadPendingCallWatcher(
+DownloadPCW::DownloadPCW(
                                                const QDBusConnection& conn,
                                                const QString& servicePath,
                                                const QDBusPendingCall& call,
                                                Download* parent)
     : PendingCallWatcher(conn, servicePath, call, parent) {
-    CHECK(connect(this, &DownloadPendingCallWatcher::finished,
-        this, &DownloadPendingCallWatcher::onFinished))
+    CHECK(connect(this, &DownloadPCW::finished,
+        this, &DownloadPCW::onFinished))
             << "Could not connect to signal";
 }
 
 void
-DownloadPendingCallWatcher::onFinished(QDBusPendingCallWatcher* watcher) {
+DownloadPCW::onFinished(QDBusPendingCallWatcher* watcher) {
     auto down = qobject_cast<Download*>(parent());
     QDBusPendingReply<> reply = *watcher;
     if (reply.isError()) {

=== modified file 'src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.h'
--- src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.h	2014-01-22 16:26:29 +0000
+++ src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.h	2014-04-15 13:56:56 +0000
@@ -27,11 +27,11 @@
 
 namespace DownloadManager {
 
-class DownloadPendingCallWatcher : public PendingCallWatcher {
+class DownloadPCW : public PendingCallWatcher {
     Q_OBJECT
 
  public:
-    DownloadPendingCallWatcher(const QDBusConnection& conn,
+    DownloadPCW(const QDBusConnection& conn,
                                const QString& servicePath,
                                const QDBusPendingCall& call,
                                Download* parent = 0);

=== added file 'src/downloads/client/ubuntu/download_manager/downloads_list.h'
--- src/downloads/client/ubuntu/download_manager/downloads_list.h	1970-01-01 00:00:00 +0000
+++ src/downloads/client/ubuntu/download_manager/downloads_list.h	2014-04-15 13:56:56 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_LIST_H
+#define UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_LIST_H
+
+#include <QList>
+#include <QObject>
+#include <QSharedPointer>
+#include <ubuntu/download_manager/common.h>
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class Error;
+class Download;
+
+class DOWNLOAD_MANAGER_EXPORT DownloadsList : public QObject {
+    Q_OBJECT
+
+ public:
+    explicit DownloadsList(QObject* parent = 0)
+        : QObject(parent) {}
+
+    virtual QList<QSharedPointer<Download> > downloads() const = 0;
+    virtual bool isError() const = 0;
+    virtual Error* error() const = 0;
+};
+
+}  // Ubuntu
+
+}  // DownloadManager
+
+#endif  // UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_LIST_H

=== added file 'src/downloads/client/ubuntu/download_manager/downloads_list_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/downloads_list_impl.cpp	1970-01-01 00:00:00 +0000
+++ src/downloads/client/ubuntu/download_manager/downloads_list_impl.cpp	2014-04-15 13:56:56 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "download.h"
+#include "error.h"
+#include "downloads_list_impl.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+DownloadsListImpl::DownloadsListImpl(QObject* parent)
+    : DownloadsList(parent) {
+}
+
+DownloadsListImpl::DownloadsListImpl(
+                                const QList<QSharedPointer<Download> > downs,
+                                QObject* parent)
+    : DownloadsList(parent),
+      _downs(downs){
+}
+
+DownloadsListImpl::DownloadsListImpl(Error* err, QObject* parent)
+    : DownloadsList(parent),
+      _lastError(err) {
+}
+
+DownloadsListImpl::~DownloadsListImpl() {
+    delete _lastError;
+}
+
+QList<QSharedPointer<Download> >
+DownloadsListImpl::downloads() const {
+    return _downs;
+}
+
+bool
+DownloadsListImpl::isError() const {
+    return _lastError != nullptr;
+}
+
+Error*
+DownloadsListImpl::error() const {
+    return _lastError;
+}
+
+}  // Ubuntu
+
+}  // DownloadManager

=== added file 'src/downloads/client/ubuntu/download_manager/downloads_list_impl.h'
--- src/downloads/client/ubuntu/download_manager/downloads_list_impl.h	1970-01-01 00:00:00 +0000
+++ src/downloads/client/ubuntu/download_manager/downloads_list_impl.h	2014-04-15 13:56:56 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_LIST_IMPL_H
+#define UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_LIST_IMPL_H
+
+#include "downloads_list.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class Error;
+class Download;
+
+class DOWNLOAD_MANAGER_EXPORT DownloadsListImpl : public DownloadsList {
+    Q_OBJECT
+
+ public:
+    DownloadsListImpl(QObject* parent = 0);
+    DownloadsListImpl(const QList<QSharedPointer<Download >> downs, QObject* parent = 0);
+    DownloadsListImpl(Error* err, QObject* parent = 0);
+    virtual ~DownloadsListImpl();
+
+    virtual QList<QSharedPointer<Download> > downloads() const;
+    virtual bool isError() const;
+    virtual Error* error() const;
+
+ private:
+    QList<QSharedPointer<Download> > _downs;
+    Error* _lastError = nullptr;
+};
+
+}  // Ubuntu
+
+}  // DownloadManager
+
+#endif  // UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_LIST_IMPL_H

=== modified file 'src/downloads/client/ubuntu/download_manager/error.h'
--- src/downloads/client/ubuntu/download_manager/error.h	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/error.h	2014-04-15 13:56:56 +0000
@@ -120,9 +120,11 @@
 
     friend class ManagerImpl;
     friend class DownloadImpl;
-    friend class DownloadManagerPendingCallWatcher;
-    friend class DownloadPendingCallWatcher;
-    friend class GroupManagerPendingCallWatcher;
+    friend class DownloadManagerPCW;
+    friend class DownloadsListManagerPCW;
+    friend class MetadataDownloadsListManagerPCW;
+    friend class DownloadPCW;
+    friend class GroupManagerPCW;
 
     /*!
         Disposes of this error and frees any resources associated with it.

=== modified file 'src/downloads/client/ubuntu/download_manager/group_download.h'
--- src/downloads/client/ubuntu/download_manager/group_download.h	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/group_download.h	2014-04-15 13:56:56 +0000
@@ -36,7 +36,7 @@
 
     // allow the manager to create downloads
     friend class ManagerPrivate;
-    friend class GroupManagerPendingCallWatcher;
+    friend class GroupManagerPCW;
 
  public:
 

=== modified file 'src/downloads/client/ubuntu/download_manager/manager.h'
--- src/downloads/client/ubuntu/download_manager/manager.h	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/manager.h	2014-04-15 13:56:56 +0000
@@ -20,7 +20,6 @@
 #define UBUNTU_DOWNLOADMANAGER_CLIENT_MANAGER_H
 
 #include <functional>
-#include <QList>
 #include <QObject>
 #include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/download_manager/common.h>
@@ -33,6 +32,7 @@
 namespace DownloadManager {
 
 class Download;
+class DownloadsList;
 class Error;
 class GroupDownload;
 
@@ -43,6 +43,18 @@
 typedef std::function<void(Download*)> DownloadCb;
 
 /*!
+    Callback to be executed that takes a download list object created by
+    the manager.
+*/
+typedef std::function<void(DownloadsList*)> DownloadsListCb;
+
+/*!
+    Callback to be executed that takes a download list object created by
+    the manager for a given metadata value.
+*/
+typedef std::function<void(const QString&, const QString&, DownloadsList*)> MetadataDownloadsListCb;
+
+/*!
     Callback to be executed that takes a group download object created by
     the manager.
 */
@@ -74,6 +86,15 @@
         : QObject(parent) {}
 
     /*!
+        \fn void getDownloadForId(const QString& id);
+
+        Returns a download object for the download with the given id. The
+        id most be valid else the returned download will be in an unknown
+        state meaning that most of the download operations will fail.
+    */
+    virtual Download* getDownloadForId(const QString& id) = 0;
+
+    /*!
         \fn void createDownload(DownloadStruct downStruct)
 
         Creates a new download using the data found in the structure.
@@ -144,10 +165,59 @@
                                 StringMap headers,
                                 GroupCb cb,
                                 GroupCb errCb) = 0;
+    /*!
+        \fn void getAllDownloads()
+
+        Returns all the downloads in the download manager that can be accessed
+        by the calling client. If the client is not confined all downloads are
+        returned, on the other hand if the client is confined the result will 
+        be only those downloads created by the client. The result of the method
+        is returned via the downloadsFound signal.
+    */
+    virtual void getAllDownloads() = 0;
+
+    /*!
+        \fn void getAllDownloads(DownloadsListCb cb, DownloadsListCb errCb)
+
+        Returns all the downloads in the download manager that can be accessed
+        by the calling client. If the client is not confined all downloads are
+        returned, on the other hand if the client is confined the result will 
+        be only those downloads created by the client. If the method is a
+        success the \a cb is executed else \a errCb is executed.
+    */
+    virtual void getAllDownloads(DownloadsListCb cb,
+                                 DownloadsListCb errCb) = 0;
+    /*!
+        \fn void getAllDownloadsWithMetadata(const QString &name, const QString &value)
+
+        Returns all the downloads in the download manager that can be accessed
+        by the calling client. If the client is not confined all downloads are
+        returned, on the other hand if the client is confined the result will 
+        be only those downloads created by the client. The result of the method
+        is returned via the downloadsWithMetadataFound signal.
+
+    */
+    virtual void getAllDownloadsWithMetadata(const QString &name,
+                                             const QString &value) = 0;
+    /*!
+        \fn void getAllDownloadsWithMetadata(const QString &name,
+                                             const QString &value,
+                                             MetadataDownloadsListCb cb,
+                                             MetadataDownloadsListCb errCb)
+
+        Returns all the downloads in the download manager that can be accessed
+        by the calling client. If the client is not confined all downloads are
+        returned, on the other hand if the client is confined the result will 
+        be only those downloads created by the client. If the method is a
+        success the \a cb is executed else \a errCb is executed.
+    */
+    virtual void getAllDownloadsWithMetadata(const QString &name,
+                                             const QString &value,
+                                             MetadataDownloadsListCb cb,
+                                             MetadataDownloadsListCb errCb) = 0;
 
     /*!
         \fn bool isError() const
-
         Returns if the manager received an error during the execution
         of a command.
     */
@@ -249,6 +319,10 @@
         download manager.
     */
     void downloadCreated(Download* down);
+    void downloadsFound(DownloadsList* downloads);
+    void downloadsWithMetadataFound(const QString& name,
+                                    const QString& value,
+                                    DownloadsList* downloads);
 
     /*!
         \fn void groupCreated(GroupDownload* down)

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2014-04-15 13:56:56 +0000
@@ -18,6 +18,8 @@
 
 #include <QDebug>
 #include <glog/logging.h>
+#include "download_impl.h"
+#include "downloads_list.h"
 #include "manager_impl.h"
 
 namespace {
@@ -65,6 +67,7 @@
     qRegisterMetaType<NetworkError*>("NetworkError*");
     qRegisterMetaType<AuthError*>("AuthError*");
     qRegisterMetaType<ProcessError*>("ProcessError*");
+    qRegisterMetaType<DownloadsList*>("DownloadsList*");
     qDBusRegisterMetaType<StringMap>();
     qDBusRegisterMetaType<DownloadStruct>();
     qDBusRegisterMetaType<GroupDownloadStruct>();
@@ -75,17 +78,16 @@
     qDBusRegisterMetaType<ProcessErrorStruct>();
 }
 
+Download*
+ManagerImpl::getDownloadForId(const QString& id) {
+    auto down = new DownloadImpl(_conn, _servicePath, QDBusObjectPath(id));
+    return down;
+}
+
 void
 ManagerImpl::createDownload(DownloadStruct downStruct) {
-    QDBusPendingCall call =
-        _dbusInterface->createDownload(downStruct);
     DownloadCb cb = [](Download*) {};
-
-    auto watcher = new DownloadManagerPendingCallWatcher(_conn,
-            _servicePath, call, cb, cb, this);
-    CHECK(connect(watcher,
-        &DownloadManagerPendingCallWatcher::callbackExecuted,
-        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+    createDownload(downStruct, cb, cb);
 }
 
 void
@@ -94,10 +96,9 @@
                     DownloadCb errCb) {
     QDBusPendingCall call =
         _dbusInterface->createDownload(downStruct);
-    auto watcher = new DownloadManagerPendingCallWatcher(_conn,
+    auto watcher = new DownloadManagerPCW(_conn,
             _servicePath, call, cb, errCb, this);
-    CHECK(connect(watcher,
-        &DownloadManagerPendingCallWatcher::callbackExecuted,
+    CHECK(connect(watcher, &DownloadManagerPCW::callbackExecuted,
         this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
 }
 
@@ -107,16 +108,8 @@
                     bool allowed3G,
                     const QVariantMap& metadata,
                     StringMap headers) {
-    QDBusPendingCall call =
-        _dbusInterface->createDownloadGroup(downs,
-            algorithm, allowed3G, metadata, headers);
-
     GroupCb cb = [](GroupDownload*) {};
-
-    auto watcher = new GroupManagerPendingCallWatcher(_conn, _servicePath,
-            call, cb, cb, this);
-    CHECK(connect(watcher, &GroupManagerPendingCallWatcher::callbackExecuted,
-        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+    createDownload(downs, algorithm, allowed3G, metadata, headers, cb, cb);
 }
 
 void
@@ -130,9 +123,45 @@
     QDBusPendingCall call =
         _dbusInterface->createDownloadGroup(downs,
             algorithm, allowed3G, metadata, headers);
-    auto watcher = new GroupManagerPendingCallWatcher(_conn, _servicePath,
+    auto watcher = new GroupManagerPCW(_conn, _servicePath,
             call, cb, errCb, this);
-    CHECK(connect(watcher, &GroupManagerPendingCallWatcher::callbackExecuted,
+    CHECK(connect(watcher, &GroupManagerPCW::callbackExecuted,
+        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+}
+
+void
+ManagerImpl::getAllDownloads() {
+    DownloadsListCb cb = [](DownloadsList*){};
+    getAllDownloads(cb, cb);
+}
+
+void
+ManagerImpl::getAllDownloads(DownloadsListCb cb, DownloadsListCb errCb) {
+    QDBusPendingCall call = _dbusInterface->getAllDownloads();
+    auto watcher = new DownloadsListManagerPCW(
+        _conn, _servicePath, call, cb, errCb, this);
+    CHECK(connect(watcher, &GroupManagerPCW::callbackExecuted,
+        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+}
+
+void
+ManagerImpl::getAllDownloadsWithMetadata(const QString &name,
+                                         const QString &value) {
+    MetadataDownloadsListCb cb =
+        [](const QString&, const QString&, DownloadsList*){};
+    getAllDownloadsWithMetadata(name, value, cb, cb);
+}
+
+void
+ManagerImpl::getAllDownloadsWithMetadata(const QString &name,
+                                         const QString &value,
+                                         MetadataDownloadsListCb cb,
+                                         MetadataDownloadsListCb errCb) {
+    QDBusPendingCall call = _dbusInterface->getAllDownloadsWithMetadata(
+    name, value);
+    auto watcher = new MetadataDownloadsListManagerPCW(
+        _conn, _servicePath, call, name, value, cb, errCb, this);
+    CHECK(connect(watcher, &GroupManagerPCW::callbackExecuted,
         this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
 }
 

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.h'
--- src/downloads/client/ubuntu/download_manager/manager_impl.h	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.h	2014-04-15 13:56:56 +0000
@@ -46,11 +46,12 @@
 
     // allow watchers to emit the signals
     friend class Manager;
-    friend class DownloadManagerPendingCallWatcher;
-    friend class GroupManagerPendingCallWatcher;
+    friend class DownloadManagerPCW;
+    friend class GroupManagerPCW;
 
  public:
     virtual ~ManagerImpl();
+    virtual Download* getDownloadForId(const QString& id);
     virtual void createDownload(DownloadStruct downStruct);
     virtual void createDownload(DownloadStruct downStruct,
                                 DownloadCb cb,
@@ -67,6 +68,15 @@
                                 StringMap headers,
                                 GroupCb cb,
                                 GroupCb errCb);
+    virtual void getAllDownloads();
+    virtual void getAllDownloads(DownloadsListCb cb,
+                                 DownloadsListCb errCb);
+    virtual void getAllDownloadsWithMetadata(const QString &name,
+                                             const QString &value);
+    virtual void getAllDownloadsWithMetadata(const QString &name,
+                                             const QString &value,
+                                             MetadataDownloadsListCb cb,
+                                             MetadataDownloadsListCb errCb);
 
     bool isError() const;
     Error* lastError() const;

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.cpp'
--- src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.cpp	2014-04-15 13:56:55 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.cpp	2014-04-15 13:56:56 +0000
@@ -21,6 +21,7 @@
 #include <QDBusObjectPath>
 #include <glog/logging.h>
 #include "download_impl.h"
+#include "downloads_list_impl.h"
 #include "error.h"
 #include "group_download.h"
 #include "manager.h"
@@ -30,28 +31,27 @@
 
 namespace DownloadManager {
 
-DownloadManagerPendingCallWatcher::DownloadManagerPendingCallWatcher(
-                                                  const QDBusConnection& conn,
-                                                  const QString& servicePath,
-                                                  const QDBusPendingCall& call,
-                                                  DownloadCb cb,
-                                                  DownloadCb errCb,
-                                                  QObject* parent)
+DownloadManagerPCW::DownloadManagerPCW(const QDBusConnection& conn,
+                                       const QString& servicePath,
+                                       const QDBusPendingCall& call,
+                                       DownloadCb cb,
+                                       DownloadCb errCb,
+                                       QObject* parent)
     : PendingCallWatcher(conn, servicePath, call, parent),
       _cb(cb),
       _errCb(errCb) {
     CHECK(connect(this, &QDBusPendingCallWatcher::finished,
-        this, &DownloadManagerPendingCallWatcher::onFinished))
+        this, &DownloadManagerPCW::onFinished))
             << "Could not connect to signal";
 }
 
 void
-DownloadManagerPendingCallWatcher::onFinished(QDBusPendingCallWatcher* watcher) {
+DownloadManagerPCW::onFinished(QDBusPendingCallWatcher* watcher) {
     QDBusPendingReply<QDBusObjectPath> reply = *watcher;
     auto man = static_cast<Manager*>(parent());
     if (reply.isError()) {
         qDebug() << "ERROR" << reply.error() << reply.error().type();
-        // creater error and deal with it
+        // create error and deal with it
         auto err = new DBusError(reply.error());
         auto down = new DownloadImpl(_conn, err);
         _errCb(down);
@@ -67,24 +67,115 @@
     watcher->deleteLater();
 }
 
-
-GroupManagerPendingCallWatcher::GroupManagerPendingCallWatcher(
-                                            const QDBusConnection& conn,
-                                            const QString& servicePath,
-                                            const QDBusPendingCall& call,
-                                            GroupCb cb,
-                                            GroupCb errCb,
-                                            QObject* parent)
+DownloadsListManagerPCW::DownloadsListManagerPCW(const QDBusConnection& conn,
+                                                 const QString& servicePath,
+                                                 const QDBusPendingCall& call,
+                                                 DownloadsListCb cb,
+                                                 DownloadsListCb errCb,
+                                                 QObject* parent)
+    : PendingCallWatcher(conn, servicePath, call, parent),
+      _cb(cb),
+      _errCb(errCb) {
+    connect(this, &QDBusPendingCallWatcher::finished,
+        this, &DownloadsListManagerPCW::onFinished);
+}
+
+void
+DownloadsListManagerPCW::onFinished(QDBusPendingCallWatcher* watcher) {
+    QDBusPendingReply<QList<QDBusObjectPath> > reply = *watcher;
+    DownloadsListImpl* list;
+    auto man = static_cast<Manager*>(parent());
+    if (reply.isError()) {
+        qDebug() << "ERROR" << reply.error() << reply.error().type();
+        // create error and deal with it
+        auto err = new DBusError(reply.error());
+        list = new DownloadsListImpl(err);
+        _errCb(list);
+        emit man->downloadsFound(list);
+    } else {
+        qDebug() << "Success!";
+        auto paths = reply.value();
+        QList<QSharedPointer<Download> > downloads;
+        list = new DownloadsListImpl();
+        foreach(const QDBusObjectPath& path, paths) {
+            QSharedPointer<Download> down =
+                QSharedPointer<Download>(new DownloadImpl(_conn,
+                            _servicePath, path));
+            downloads.append(down);
+        }
+        list = new DownloadsListImpl(downloads);
+        emit man->downloadsFound(list);
+        _cb(list);
+    }
+    emit callbackExecuted();
+    watcher->deleteLater();
+}
+
+MetadataDownloadsListManagerPCW::MetadataDownloadsListManagerPCW(
+                                    const QDBusConnection& conn,
+                                    const QString& servicePath,
+                                    const QDBusPendingCall& call,
+                                    const QString& key,
+                                    const QString& value,
+                                    MetadataDownloadsListCb cb,
+                                    MetadataDownloadsListCb errCb,
+                                    QObject* parent)
+    : PendingCallWatcher(conn, servicePath, call, parent),
+      _key(key),
+      _value(value),
+      _cb(cb),
+      _errCb(errCb) {
+    connect(this, &QDBusPendingCallWatcher::finished,
+        this, &MetadataDownloadsListManagerPCW::onFinished);
+}
+
+void
+MetadataDownloadsListManagerPCW::onFinished(QDBusPendingCallWatcher* watcher) {
+    QDBusPendingReply<QList<QDBusObjectPath> > reply = *watcher;
+    DownloadsListImpl* list;
+    auto man = static_cast<Manager*>(parent());
+    if (reply.isError()) {
+        qDebug() << "ERROR" << reply.error() << reply.error().type();
+        // create error and deal with it
+        auto err = new DBusError(reply.error());
+        list = new DownloadsListImpl(err);
+        _errCb(_key, _value, list);
+        emit man->downloadsWithMetadataFound(_key, _value, list);
+    } else {
+        qDebug() << "Success!";
+        auto paths = reply.value();
+        QList<QSharedPointer<Download> > downloads;
+        list = new DownloadsListImpl();
+        foreach(const QDBusObjectPath& path, paths) {
+            QSharedPointer<Download> down =
+                QSharedPointer<Download>(new DownloadImpl(
+                            _conn, _servicePath, path));
+            downloads.append(down);
+        }
+        list = new DownloadsListImpl(downloads);
+        emit man->downloadsWithMetadataFound(_key, _value, list);
+        _cb(_key, _value, list);
+    }
+    emit callbackExecuted();
+    watcher->deleteLater();
+}
+
+GroupManagerPCW::GroupManagerPCW(const QDBusConnection& conn,
+                                 const QString& servicePath,
+                                 const QDBusPendingCall& call,
+                                 GroupCb cb,
+                                 GroupCb errCb,
+                                 QObject* parent)
     : PendingCallWatcher(conn, servicePath, call, parent),
       _cb(cb),
       _errCb(errCb) {
     CHECK(connect(this, &QDBusPendingCallWatcher::finished,
-        this, &GroupManagerPendingCallWatcher::onFinished))
+        this, &GroupManagerPCW::onFinished))
             << "Could not connect to signal";
 }
 
 void
-GroupManagerPendingCallWatcher::onFinished(QDBusPendingCallWatcher* watcher) {
+GroupManagerPCW::onFinished(QDBusPendingCallWatcher* watcher) {
     QDBusPendingReply<QDBusObjectPath> reply = *watcher;
     auto man = static_cast<Manager*>(parent());
     if (reply.isError()) {

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.h'
--- src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.h	2014-01-13 17:26:28 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.h	2014-04-15 13:56:56 +0000
@@ -27,23 +27,26 @@
 namespace DownloadManager {
 
 class Download;
+class DownloadsList;
 class Error;
 class GroupDownload;
 
 typedef std::function<void(Download*)> DownloadCb;
+typedef std::function<void(DownloadsList*)> DownloadsListCb;
+typedef std::function<void(const QString&, const QString&, DownloadsList*)> MetadataDownloadsListCb;
 typedef std::function<void(GroupDownload*)> GroupCb;
 
 
-class DownloadManagerPendingCallWatcher : public PendingCallWatcher {
+class DownloadManagerPCW : public PendingCallWatcher {
     Q_OBJECT
 
  public:
-    DownloadManagerPendingCallWatcher(const QDBusConnection& conn,
-                                      const QString& servicePath,
-                                      const QDBusPendingCall& call,
-                                      DownloadCb cb,
-                                      DownloadCb errCb,
-                                      QObject* parent = 0);
+    DownloadManagerPCW(const QDBusConnection& conn,
+                       const QString& servicePath,
+                       const QDBusPendingCall& call,
+                       DownloadCb cb,
+                       DownloadCb errCb,
+                       QObject* parent = 0);
 
  private slots:
     void onFinished(QDBusPendingCallWatcher* watcher);
@@ -54,16 +57,56 @@
 };
 
 
-class GroupManagerPendingCallWatcher : public PendingCallWatcher {
-    Q_OBJECT
-
- public:
-    GroupManagerPendingCallWatcher(const QDBusConnection& conn,
-                                   const QString& servicePath,
-                                   const QDBusPendingCall& call,
-                                   GroupCb cb,
-                                   GroupCb errCb,
-                                   QObject* parent = 0);
+class DownloadsListManagerPCW : public PendingCallWatcher {
+    Q_OBJECT
+
+ public:
+    DownloadsListManagerPCW(const QDBusConnection& conn,
+                            const QString& servicePath,
+                            const QDBusPendingCall& call,
+                            DownloadsListCb cb,
+                            DownloadsListCb errCb,
+                            QObject* parent = 0);
+ private slots:
+    void onFinished(QDBusPendingCallWatcher* watcher);
+
+ private:
+    DownloadsListCb _cb;
+    DownloadsListCb _errCb;
+};
+
+class MetadataDownloadsListManagerPCW : public PendingCallWatcher {
+    Q_OBJECT
+
+ public:
+    MetadataDownloadsListManagerPCW(const QDBusConnection& conn,
+                                    const QString& servicePath,
+                                    const QDBusPendingCall& call,
+                                    const QString& key,
+                                    const QString& value,
+                                    MetadataDownloadsListCb cb,
+                                    MetadataDownloadsListCb errCb,
+                                    QObject* parent = 0);
+ private slots:
+    void onFinished(QDBusPendingCallWatcher* watcher);
+
+ private:
+    const QString& _key;
+    const QString& _value;
+    MetadataDownloadsListCb _cb;
+    MetadataDownloadsListCb _errCb;
+};
+
+class GroupManagerPCW : public PendingCallWatcher {
+    Q_OBJECT
+
+ public:
+    GroupManagerPCW(const QDBusConnection& conn,
+                    const QString& servicePath,
+                    const QDBusPendingCall& call,
+                    GroupCb cb,
+                    GroupCb errCb,
+                    QObject* parent = 0);
 
  private slots:
     void onFinished(QDBusPendingCallWatcher* watcher);

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.cpp'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2014-04-15 13:56:55 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2014-04-15 13:56:56 +0000
@@ -81,6 +81,12 @@
     QMetaObject::invokeMethod(parent(), "resume");
 }
 
+void DownloadAdaptor::setDestinationDir(const QString &path)
+{
+    // handle method call com.canonical.applications.Download.setDestinationDir
+    QMetaObject::invokeMethod(parent(), "setDestinationDir", Q_ARG(QString, path));
+}
+
 void DownloadAdaptor::setThrottle(qulonglong speed)
 {
     // handle method call com.canonical.applications.Download.setThrottle

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.h'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.h	2014-02-11 15:35:52 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.h	2014-04-15 13:56:56 +0000
@@ -50,6 +50,9 @@
 "    <method name=\"throttle\">\n"
 "      <arg direction=\"out\" type=\"t\" name=\"speed\"/>\n"
 "    </method>\n"
+"    <method name=\"setDestinationDir\">\n"
+"      <arg direction=\"in\" type=\"s\" name=\"path\"/>\n"
+"    </method>\n"
 "    <method name=\"allowGSMDownload\">\n"
 "      <arg direction=\"in\" type=\"b\" name=\"allowed\"/>\n"
 "    </method>\n"
@@ -116,6 +119,7 @@
     void pause();
     qulonglong progress();
     void resume();
+    void setDestinationDir(const QString &path);
     void setThrottle(qulonglong speed);
     void start();
     qulonglong throttle();

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.cpp'
--- src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-04-15 13:56:55 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-04-15 13:56:56 +0000
@@ -29,6 +29,8 @@
 #include <ubuntu/transfers/system/logger.h>
 #include <ubuntu/transfers/system/network_reply.h>
 #include <ubuntu/transfers/system/filename_mutex.h>
+#include <ubuntu/transfers/system/uuid_factory.h>
+#include <ubuntu/transfers/system/uuid_utils.h>
 #include "file_download.h"
 
 #define DOWN_LOG(LEVEL) LOG(LEVEL) << ((parent() != nullptr)?"GroupDownload {" + parent()->objectName() + " } ":"") << "Download ID{" << objectName() << " } "
@@ -63,6 +65,7 @@
                    const QMap<QString, QString>& headers,
                    QObject* parent)
     : Download(id, path, isConfined, rootPath, metadata, headers, parent),
+      QDBusContext(),
       _totalSize(0),
       _url(url),
       _hash(""),
@@ -81,6 +84,7 @@
                    const QMap<QString, QString> &headers,
                    QObject* parent)
     : Download(id, path, isConfined, rootPath, metadata, headers, parent),
+      QDBusContext(),
       _totalSize(0),
       _url(url),
       _hash(hash) {
@@ -237,6 +241,66 @@
 }
 
 void
+FileDownload::setDestinationDir(const QString& path) {
+    // we have to perform several checks to ensure the integrity
+    // of the download
+    // 1. Trust apparmor that it will bock the call of this method
+    //    from not confined apps
+    // 2. Ensure that the path is an absolute path.
+    // 3. Ensure that the path does exist.
+    // 4. Ensure that the path is a dir.
+    // 5. Ensure that the download was not started
+    QFileInfo info(path);
+    if (!info.isAbsolute()) {
+        DOWN_LOG(WARNING) << "Trying to set destination dir to '"
+            << path << "' when the path is not absolute.";
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::InvalidArgs,
+                "The destination dir must be an absolute path.");
+        }
+        return;
+    }
+
+    if (!info.exists()) {
+        DOWN_LOG(WARNING) << "Trying to set destination dir to '"
+            << path << "' when the path does not exists.";
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::InvalidArgs,
+                "The destination dir must be already present in the system.");
+        }
+        return;
+    }
+
+    if (!info.isDir()) {
+        DOWN_LOG(WARNING) << "Trying to set destination dir to '"
+            << path << "' when the path is not a dir.";
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::InvalidArgs,
+                "The destination dir must be a dir and a file was found.");
+        }
+        return;
+    }
+
+    if (state() == Download::IDLE) {
+        // calculate the new path before we unlock the old one
+        auto desiredPath = path;
+        if (!desiredPath.endsWith(QDir::separator())) {
+            desiredPath += QDir::separator();
+        }
+        desiredPath += _basename;
+        desiredPath = _fileNameMutex->lockFileName(desiredPath);
+        _tempFilePath = desiredPath + TEMP_EXTENSION;
+        _fileNameMutex->unlockFileName(_filePath);
+        _filePath = desiredPath;
+    } else {
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::NotSupported,
+                "The path cannot be changed in a started download.");
+        }
+    }
+}
+
+void
 FileDownload::onDownloadProgress(qint64 currentProgress, qint64 bytesTotal) {
     TRACE << _url << currentProgress << bytesTotal;
 
@@ -603,10 +667,12 @@
     // the mutex will ensure that we do not have race conditions about
     // the file names in the download manager
     QString path = _url.path();
-    QString basename = QFileInfo(path).fileName();
+    _basename = QFileInfo(path).fileName();
 
-    if (basename.isEmpty())
-        basename = DATA_FILE_NAME;
+    if (_basename.isEmpty()) {
+        QScopedPointer<UuidFactory> uuidFactory(new UuidFactory());
+        _basename = UuidUtils::getDBusString(uuidFactory->createUuid());
+    }
 
     auto metadataMap = metadata();
 
@@ -624,7 +690,7 @@
                 _filePath));
         }
     } else {
-        auto desiredPath = rootPath() + QDir::separator() + basename;
+        auto desiredPath = rootPath() + QDir::separator() + _basename;
         _filePath = _fileNameMutex->lockFileName(desiredPath);
         _tempFilePath = _filePath + TEMP_EXTENSION;
     }

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.h'
--- src/downloads/priv/ubuntu/downloads/file_download.h	2014-04-15 13:56:55 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.h	2014-04-15 13:56:56 +0000
@@ -19,6 +19,7 @@
 #ifndef DOWNLOADER_LIB_SINGLE_DOWNLOAD_H
 #define DOWNLOADER_LIB_SINGLE_DOWNLOAD_H
 
+#include <QtDBus/QDBusContext>
 #include <QFile>
 #include <QNetworkReply>
 #include <QProcess>
@@ -41,7 +42,7 @@
 
 namespace Daemon {
 
-class FileDownload : public Download {
+class FileDownload : public Download, public QDBusContext {
     Q_OBJECT
 
  public:
@@ -92,6 +93,7 @@
     qulonglong progress() override;
     qulonglong totalSize() override;
     virtual void setThrottle(qulonglong speed) override;
+    virtual void setDestinationDir(const QString& path);
 
  signals:
     void finished(const QString& path);
@@ -132,6 +134,7 @@
     bool _connected = false;
     qulonglong _totalSize = 0;
     QUrl _url;
+    QString _basename;
     QString _filePath;
     QString _tempFilePath;
     QString _hash;

=== modified file 'src/downloads/test-daemon/testing_file_download.h'
--- src/downloads/test-daemon/testing_file_download.h	2014-04-15 13:56:55 +0000
+++ src/downloads/test-daemon/testing_file_download.h	2014-04-15 13:56:56 +0000
@@ -26,7 +26,7 @@
 
 using namespace Ubuntu::DownloadManager::Daemon;
 
-class TestingFileDownload : public FileDownload, public QDBusContext {
+class TestingFileDownload : public FileDownload {
     Q_OBJECT
 
  public:

=== modified file 'tests/test_client_download.cpp'
--- tests/test_client_download.cpp	2014-04-15 13:56:55 +0000
+++ tests/test_client_download.cpp	2014-04-15 13:56:56 +0000
@@ -16,6 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDir>
 #include <QNetworkReply>
 #include <ubuntu/download_manager/error.h>
 #include "test_client_download.h"
@@ -252,11 +253,11 @@
     QTest::addColumn<QString>("standardError");
 
     QTest::newRow("Failed To Start") << 0 << "Failed To Start"
-        << -1 << "" << ""; 
+        << -1 << "" << "";
     QTest::newRow("Crashed") << 1 << "Crashed" << -1 << "Calculating.."
-        << "NULL pointer"; 
+        << "NULL pointer";
     QTest::newRow("Timedout") << 2 << "Timedout" << -1 << "stdout"
-        << ""; 
+        << "";
 }
 
 void
@@ -289,4 +290,51 @@
     QCOMPARE(standardError, processError->standardError());
 }
 
+void
+TestDownload::testSetLocalDirectory() {
+    auto path = testDirectory();
+    _down->setDestinationDir(path);
+    QVERIFY(!_down->isError());
+    QVERIFY(_down->error() == nullptr);
+}
+
+void
+TestDownload::testSetLocalDirectoryNotAbsolute() {
+    _down->setDestinationDir("./test");
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
+void
+TestDownload::testSetLocalDirectoryNotPresent() {
+    _down->setDestinationDir("/etc/test");
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
+void
+TestDownload::testSetLocalDirectoryNotDir() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QFile file(path);
+    file.open(QIODevice::ReadWrite | QFile::Append);
+    file.write(QByteArray(100, 'w'));
+    file.close();
+    _down->setDestinationDir(path);
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
+void
+TestDownload::testSetLocalDirectoryStarted() {
+    auto path = testDirectory();
+    _down->start();
+    _down->setDestinationDir(path);
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::DBus, _down->error()->type());
+}
+
 QTEST_MAIN(TestDownload)

=== modified file 'tests/test_client_download.h'
--- tests/test_client_download.h	2014-04-15 13:56:55 +0000
+++ tests/test_client_download.h	2014-04-15 13:56:56 +0000
@@ -55,6 +55,13 @@
     void testProcessErrorRaised_data();
     void testProcessErrorRaised();
 
+    // set local dir tests
+    void testSetLocalDirectory();
+    void testSetLocalDirectoryNotAbsolute();
+    void testSetLocalDirectoryNotPresent();
+    void testSetLocalDirectoryNotDir();
+    void testSetLocalDirectoryStarted();
+
  private:
     QString _url;
     QVariantMap _metadata;

=== modified file 'tests/test_client_manager.cpp'
--- tests/test_client_manager.cpp	2014-04-15 13:56:55 +0000
+++ tests/test_client_manager.cpp	2014-04-15 13:56:56 +0000
@@ -18,6 +18,7 @@
 
 #include <QDebug>
 #include <ubuntu/download_manager/download.h>
+#include <ubuntu/download_manager/downloads_list.h>
 #include "test_client_manager.h"
 
 TestManager::TestManager(QObject *parent)
@@ -136,4 +137,205 @@
     delete down;
 }
 
+void
+TestManager::testGetAllDownloadsSignalsEmitted_data() {
+    QTest::addColumn<int>("count");
+
+    QTest::newRow("5 downloads") << 5;
+    QTest::newRow("10 downloads") << 10;
+    QTest::newRow("15 downloads") << 15;
+}
+
+void
+TestManager::testGetAllDownloadsSignalsEmitted() {
+    QFETCH(int, count);
+
+    QString url = "http://example.com/";
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+
+    SignalBarrier managerSpy(_man, SIGNAL(downloadCreated(Download*)));
+    SignalBarrier listSpy(_man, SIGNAL(downloadsFound(DownloadsList*)));
+
+    for (int index = 0; index < count; index++) {
+        url += index;
+        DownloadStruct downStruct(url, metadata, headers);
+        _man->createDownload(downStruct);
+    }
+
+    // ensure that all of the are created
+    QVERIFY(managerSpy.ensureSignalEmitted());
+    QTRY_COMPARE(count, managerSpy.count());
+    _man->getAllDownloads();
+
+    QVERIFY(listSpy.ensureSignalEmitted());
+    QTRY_COMPARE(1, listSpy.count());
+    auto downs = listSpy.takeFirst().at(0).value<DownloadsList*>();
+    QCOMPARE(count, downs->downloads().count());
+
+    delete downs;
+}
+
+void
+TestManager::testGetAllDownloadsSignalsEmittedCallbacks_data() {
+    QTest::addColumn<int>("count");
+
+    QTest::newRow("5 downloads") << 5;
+    QTest::newRow("10 downloads") << 10;
+    QTest::newRow("15 downloads") << 15;
+}
+
+void
+TestManager::testGetAllDownloadsSignalsEmittedCallbacks() {
+    QFETCH(int, count);
+
+    QString url = "http://example.com/";
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+    DownloadsListCb cb = [](DownloadsList*){};
+
+    SignalBarrier managerSpy(_man, SIGNAL(downloadCreated(Download*)));
+    SignalBarrier listSpy(_man, SIGNAL(downloadsFound(DownloadsList*)));
+
+    for (int index = 0; index < count; index++) {
+        url += index;
+        DownloadStruct downStruct(url, metadata, headers);
+        _man->createDownload(downStruct);
+    }
+
+    // ensure that all of the are created
+    QVERIFY(managerSpy.ensureSignalEmitted());
+    QTRY_COMPARE(count, managerSpy.count());
+    _man->getAllDownloads(cb, cb);
+
+    QVERIFY(listSpy.ensureSignalEmitted());
+    QTRY_COMPARE(1, listSpy.count());
+    auto downs = listSpy.takeFirst().at(0).value<DownloadsList*>();
+    QCOMPARE(count, downs->downloads().count());
+
+    delete downs;
+}
+
+void
+TestManager::testGetAllDownloadsMetadataSignalsEmitted_data() {
+    QTest::addColumn<int>("count");
+
+    QTest::newRow("5 downloads") << 5;
+    QTest::newRow("10 downloads") << 10;
+    QTest::newRow("15 downloads") << 15;
+}
+
+void
+TestManager::testGetAllDownloadsMetadataSignalsEmitted() {
+    QFETCH(int, count);
+    int metadataCount = 5;
+    QString key = "test";
+    QString value = "metadata";
+
+    QString url = "http://example.com/";
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+
+    SignalBarrier managerSpy(_man, SIGNAL(downloadCreated(Download*)));
+    SignalBarrier listSpy(_man, SIGNAL(
+        downloadsWithMetadataFound(const QString&, const QString&,
+            DownloadsList*)));
+
+    for (int index = 0; index < count; index++) {
+        url += index;
+        DownloadStruct downStruct(url, metadata, headers);
+        _man->createDownload(downStruct);
+    }
+
+    // add downloads with metadata
+    metadata[key] = value;
+    for (int index = count; index < metadataCount + count; index++) {
+        url += index;
+        DownloadStruct downStruct(url, metadata, headers);
+        _man->createDownload(downStruct);
+    }
+    // ensure that all of the are created
+    QVERIFY(managerSpy.ensureSignalEmitted());
+    QTRY_COMPARE(count + metadataCount, managerSpy.count());
+    _man->getAllDownloadsWithMetadata(key, value);
+
+    QVERIFY(listSpy.ensureSignalEmitted());
+    QTRY_COMPARE(1, listSpy.count());
+
+    auto signalInfo = listSpy.takeFirst();
+    auto signalKey = signalInfo.at(0).toString();
+    QCOMPARE(key, signalKey);
+
+    auto signalValue = signalInfo.at(1).toString();
+    QCOMPARE(value, signalValue);
+
+    auto downs = signalInfo.at(2).value<DownloadsList*>();
+
+    QCOMPARE(metadataCount, downs->downloads().count());
+
+    delete downs;
+}
+
+void
+TestManager::testGetAllDownloadsMetadataSignalsEmittedCallbacks_data() {
+    QTest::addColumn<int>("count");
+
+    QTest::newRow("5 downloads") << 5;
+    QTest::newRow("10 downloads") << 10;
+    QTest::newRow("15 downloads") << 15;
+}
+
+void
+TestManager::testGetAllDownloadsMetadataSignalsEmittedCallbacks() {
+    QFETCH(int, count);
+    int metadataCount = 5;
+    QString key = "test";
+    QString value = "metadata";
+
+    QString url = "http://example.com/";
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+    MetadataDownloadsListCb cb =
+        [](const QString&, const QString&, DownloadsList*){};
+
+    SignalBarrier managerSpy(_man, SIGNAL(downloadCreated(Download*)));
+    SignalBarrier listSpy(_man, SIGNAL(
+        downloadsWithMetadataFound(const QString&, const QString&,
+            DownloadsList*)));
+
+    for (int index = 0; index < count; index++) {
+        url += index;
+        DownloadStruct downStruct(url, metadata, headers);
+        _man->createDownload(downStruct);
+    }
+
+    // add downloads with metadata
+    metadata[key] = value;
+    for (int index = count; index < metadataCount + count; index++) {
+        url += index;
+        DownloadStruct downStruct(url, metadata, headers);
+        _man->createDownload(downStruct);
+    }
+    // ensure that all of the are created
+    QVERIFY(managerSpy.ensureSignalEmitted());
+    QTRY_COMPARE(count + metadataCount, managerSpy.count());
+    _man->getAllDownloadsWithMetadata(key, value, cb, cb);
+
+    QVERIFY(listSpy.ensureSignalEmitted());
+    QTRY_COMPARE(1, listSpy.count());
+
+    auto signalInfo = listSpy.takeFirst();
+    auto signalKey = signalInfo.at(0).toString();
+    QCOMPARE(key, signalKey);
+
+    auto signalValue = signalInfo.at(1).toString();
+    QCOMPARE(value, signalValue);
+
+    auto downs = signalInfo.at(2).value<DownloadsList*>();
+
+    QCOMPARE(metadataCount, downs->downloads().count());
+
+    delete downs;
+}
+
 QTEST_MAIN(TestManager)

=== modified file 'tests/test_client_manager.h'
--- tests/test_client_manager.h	2014-04-15 13:56:55 +0000
+++ tests/test_client_manager.h	2014-04-15 13:56:56 +0000
@@ -46,6 +46,14 @@
     void testExitError();
     void testCreateDownloadSignalsEmitted();
     void testCreateDownloadSignalsEmittedCallbacks();
+    void testGetAllDownloadsSignalsEmitted_data();
+    void testGetAllDownloadsSignalsEmitted();
+    void testGetAllDownloadsSignalsEmittedCallbacks_data();
+    void testGetAllDownloadsSignalsEmittedCallbacks();
+    void testGetAllDownloadsMetadataSignalsEmitted_data();
+    void testGetAllDownloadsMetadataSignalsEmitted();
+    void testGetAllDownloadsMetadataSignalsEmittedCallbacks_data();
+    void testGetAllDownloadsMetadataSignalsEmittedCallbacks();
 
  private:
     Manager* _man;

=== modified file 'tests/test_download.cpp'
--- tests/test_download.cpp	2014-04-15 13:56:55 +0000
+++ tests/test_download.cpp	2014-04-15 13:56:56 +0000
@@ -16,6 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDir>
 #include <QNetworkRequest>
 #include <QSslError>
 #include <ubuntu/download_manager/metatypes.h>
@@ -46,7 +47,7 @@
     _isConfined = false;
     _rootPath = testDirectory();
     _path = "random path to dbus";
-    _url = QUrl("http://ubuntu.com");
+    _url = QUrl("http://ubuntu.com/data.txt");
     _algo = "Sha256";
     _networkInfo = new MockSystemNetworkInfo();
     SystemNetworkInfo::setInstance(_networkInfo);
@@ -3691,4 +3692,89 @@
     FileNameMutex::deleteInstance();
 }
 
+void
+TestDownload::testSetLocalDirectory() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QDir().mkpath(path);
+
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QVERIFY(original != download->filePath());
+    QVERIFY(download->filePath().startsWith(path));
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryNotAbsolute() {
+    auto path = QString("./path");
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryNotPresent() {
+    auto path = QString("/not/present/path");
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryNotDir() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QFile file(path);
+    file.open(QIODevice::ReadWrite | QFile::Append);
+    file.write(QByteArray(100, 'w'));
+    file.close();
+
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
+void
+TestDownload::testSetLocalDirectoryStarted() {
+    auto path = testDirectory() + QDir::separator() + "test";
+    QDir().mkpath(path);
+
+    EXPECT_CALL(*_networkInfo, isOnline())
+        .WillRepeatedly(Return(true));
+
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path,
+        _isConfined, _rootPath, _url, _metadata, _headers));
+    
+    auto original = download->filePath();
+    download->start();  // change state
+    download->setDestinationDir(path);
+    QCOMPARE(original, download->filePath());
+    verifyMocks();
+}
+
 QTEST_MAIN(TestDownload)

=== modified file 'tests/test_download.h'
--- tests/test_download.h	2014-04-15 13:56:55 +0000
+++ tests/test_download.h	2014-04-15 13:56:56 +0000
@@ -171,6 +171,13 @@
     void testErrorUnlocksPath();
     void testLockCustomLocalPath();
 
+    // tests related to setting the dir
+    void testSetLocalDirectory();
+    void testSetLocalDirectoryNotAbsolute();
+    void testSetLocalDirectoryNotPresent();
+    void testSetLocalDirectoryNotDir();
+    void testSetLocalDirectoryStarted();
+
  private:
     QString _id;
     bool _isConfined;