Merge lp:~mandel/click-update-manager/downloader-new-api into lp:~diegosarmentero/click-update-manager/trunk

[Manuel de la Peña]

Add support for the new download manager api.

Adds support for the download manager API that will be landed in the following branch: lp:~mandel/ubuntu-download-manager/change-api

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

Unmerged revisions

9. By Manuel de la Peña on 2013-09-03

Added support for the new download manager api.

=== modified file 'clickmanager_plugin/clickmanager.pro'
--- clickmanager_plugin/clickmanager.pro	2013-08-28 14:43:05 +0000
+++ clickmanager_plugin/clickmanager.pro	2013-09-03 11:06:52 +0000
@@ -15,7 +15,9 @@
     download/downloader.cpp \
     download/downloadmanager.cpp \
     download/downloadtrackeradaptor.cpp \
-    download_tracker.cpp
+    download_tracker.cpp \
+    download/download_struct.cpp \
+    download/group_download_struct.cpp
 
 HEADERS += \
     clickmanager_plugin.h \
@@ -26,7 +28,9 @@
     download/downloadmanager.h \
     download/metatypes.h \
     download/downloadtrackeradaptor.h \
-    download_tracker.h
+    download_tracker.h \
+    download/download_struct.h \
+    download/group_download_struct.h
 
 OTHER_FILES = qmldir
 
 
=== added file 'clickmanager_plugin/download/download_struct.cpp'
--- clickmanager_plugin/download/download_struct.cpp	1970-01-01 00:00:00 +0000
+++ clickmanager_plugin/download/download_struct.cpp	2013-09-03 11:06:52 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2013 2013 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_struct.h"
+
+DownloadStruct::DownloadStruct()
+    : _url(""),
+      _hash(""),
+      _algorithm(""),
+      _metadata(),
+      _headers() {
+}
+
+DownloadStruct::DownloadStruct(const QString& url,
+               const QVariantMap& metadata,
+               const QMap<QString, QString>& headers)
+    : _url(url),
+      _hash(""),
+      _algorithm(""),
+      _metadata(metadata),
+      _headers(headers) {
+}
+
+DownloadStruct::DownloadStruct(const QString& url,
+               const QString& hash,
+               const QString& algorithm,
+               const QVariantMap& metadata,
+               const QMap<QString, QString>& headers)
+    : _url(url),
+      _hash(hash),
+      _algorithm(algorithm),
+      _metadata(metadata),
+      _headers(headers) {
+}
+
+DownloadStruct::DownloadStruct(const DownloadStruct& other)
+    : _url(other._url),
+      _hash(other._hash),
+      _algorithm(other._algorithm),
+      _metadata(other._metadata),
+      _headers(other._headers) {
+}
+
+DownloadStruct& DownloadStruct::operator=(const DownloadStruct& other) {
+    _url = other._url;
+    _hash = other._hash;
+    _algorithm = other._algorithm;
+    _metadata = other._metadata;
+    _headers = other._headers;
+
+    return *this;
+}
+
+DownloadStruct::~DownloadStruct() {
+}
+
+QDBusArgument &operator<<(QDBusArgument &argument,
+                          const DownloadStruct& download) {
+    argument.beginStructure();
+    argument << download._url;
+    argument << download._hash;
+    argument << download._algorithm;
+    argument << download._metadata;
+    argument << download._headers;
+    argument.endStructure();
+
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument,
+                                DownloadStruct& download) {
+    argument.beginStructure();
+    argument >> download._url;
+    argument >> download._hash;
+    argument >> download._algorithm;
+    argument >> download._metadata;
+    argument >> download._headers;
+    argument.endStructure();
+
+    return argument;
+}
+
+QString
+DownloadStruct::getUrl() {
+    return _url;
+}
+
+QString
+DownloadStruct::getHash() {
+    return _hash;
+}
+
+QString
+DownloadStruct::getAlgorithm() {
+    return _algorithm;
+}
+
+QVariantMap
+DownloadStruct::getMetadata() {
+    return _metadata;
+}
+
+QMap<QString, QString>
+DownloadStruct::getHeaders() {
+    return _headers;
+}
 
=== added file 'clickmanager_plugin/download/download_struct.h'
--- clickmanager_plugin/download/download_struct.h	1970-01-01 00:00:00 +0000
+++ clickmanager_plugin/download/download_struct.h	2013-09-03 11:06:52 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 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 DOWNLOAD_STRUCT_H
+#define DOWNLOAD_STRUCT_H
+
+#include <QDBusArgument>
+#include <QMap>
+#include <QString>
+#include <QVariantMap>
+
+typedef QMap<QString, QString> StringList;
+class DownloadStruct {
+    Q_PROPERTY(QString url READ getUrl)
+    Q_PROPERTY(QString hash READ getHash)
+    Q_PROPERTY(QString algorithm READ getAlgorithm)
+    Q_PROPERTY(QVariantMap metadata READ getMetadata)
+    Q_PROPERTY(StringList headers READ getHeaders)
+
+ public:
+    DownloadStruct();
+    DownloadStruct(const QString& url,
+                   const QVariantMap& metadata,
+                   const QMap<QString, QString>& headers);
+    DownloadStruct(const QString& url,
+                   const QString& hash,
+                   const QString& algorithm,
+                   const QVariantMap& metadata,
+                   const QMap<QString, QString>& headers);
+    DownloadStruct(const DownloadStruct& other);
+    DownloadStruct& operator=(const DownloadStruct& other);
+    ~DownloadStruct();
+
+    friend QDBusArgument &operator<<(QDBusArgument &argument,
+        const DownloadStruct& download);
+    friend const QDBusArgument &operator>>(const QDBusArgument &argument,
+        DownloadStruct& download);
+
+    // properties getters
+    QString getUrl();
+    QString getHash();
+    QString getAlgorithm();
+    QVariantMap getMetadata();
+    QMap<QString, QString> getHeaders();
+
+ private:
+    QString _url;
+    QString _hash;
+    QString _algorithm;
+    QVariantMap _metadata;
+    QMap<QString, QString> _headers;
+};
+
+Q_DECLARE_METATYPE(GroupDownloadStruct)
+
+#endif  // DOWNLOAD_STRUCT_H
 
=== modified file 'clickmanager_plugin/download/downloader.cpp'
--- clickmanager_plugin/download/downloader.cpp	2013-08-28 14:29:54 +0000
+++ clickmanager_plugin/download/downloader.cpp	2013-09-03 11:06:52 +0000
@@ -6,6 +6,9 @@
     QObject(parent)
 {
     qDBusRegisterMetaType<StringMap>();
+    qDBusRegisterMetaType<DownloadStruct>();
+    qDBusRegisterMetaType<GroupDownloadStruct>();
+    qDBusRegisterMetaType<StructList>();
     this->manager = new DownloadManager("com.canonical.applications.Downloader", "/", QDBusConnection::sessionBus(), 0);
 }
 
@@ -13,7 +16,8 @@
 {
     QVariantMap vmap;
     StringMap map;
-    QDBusPendingReply<QDBusObjectPath> reply = this->manager->createDownload(url, vmap, map);
+    DownloadStruct down = DownloadStruct(url, vmap, map);
+    QDBusPendingReply<QDBusObjectPath> reply = this->manager->createDownload(down);
     reply.waitForFinished();
     if (reply.isError()) {
         emit this->downloadNotCreated(packagename);
 
=== modified file 'clickmanager_plugin/download/downloadmanager.cpp'
--- clickmanager_plugin/download/downloadmanager.cpp	2013-08-28 14:29:54 +0000
+++ clickmanager_plugin/download/downloadmanager.cpp	2013-09-03 11:06:52 +0000
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v -c DownloadManager -p downloadmanager.h:downloadmanager.cpp -i metatypes.h com.canonical.applications.download_manager.xml
+ * Command line was: qdbusxml2cpp -c DownloadManager -p downloadmanager.h:downloadmanager.cpp -i download_struct.h -i group_download_struct.h com.canonical.applications.download_manager.xml
  *
  * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
 
=== modified file 'clickmanager_plugin/download/downloadmanager.h'
--- clickmanager_plugin/download/downloadmanager.h	2013-08-28 14:29:54 +0000
+++ clickmanager_plugin/download/downloadmanager.h	2013-09-03 11:06:52 +0000
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v -c DownloadManager -p downloadmanager.h:downloadmanager.cpp -i metatypes.h com.canonical.applications.download_manager.xml
+ * Command line was: qdbusxml2cpp -c DownloadManager -p downloadmanager.h:downloadmanager.cpp -i download_struct.h -i group_download_struct.h com.canonical.applications.download_manager.xml
  *
  * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef DOWNLOADMANAGER_H_1377691895
-#define DOWNLOADMANAGER_H_1377691895
+#ifndef DOWNLOADMANAGER_H_1378205505
+#define DOWNLOADMANAGER_H_1378205505
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -19,7 +19,8 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include "metatypes.h"
+#include "download_struct.h"
+#include "group_download_struct.h"
 
 /*
  * Proxy class for interface com.canonical.applications.DownloaderManager
@@ -44,18 +45,18 @@
         return asyncCallWithArgumentList(QLatin1String("allowGSMDownload"), argumentList);
     }
 
-    inline QDBusPendingReply<QDBusObjectPath> createDownload(const QString &url, const QVariantMap &metadata, StringMap headers)
+    inline QDBusPendingReply<QDBusObjectPath> createDownload(DownloadStruct download)
     {
         QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(url) << QVariant::fromValue(metadata) << QVariant::fromValue(headers);
+        argumentList << QVariant::fromValue(download);
         return asyncCallWithArgumentList(QLatin1String("createDownload"), argumentList);
     }
 
-    inline QDBusPendingReply<QDBusObjectPath> createDownloadWithHash(const QString &url, const QString &algorithm, const QString &hash, const QVariantMap &metadata, StringMap headers)
+    inline QDBusPendingReply<QDBusObjectPath> createDownloadGroup(StructList downloads, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers)
     {
         QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(url) << QVariant::fromValue(algorithm) << QVariant::fromValue(hash) << QVariant::fromValue(metadata) << QVariant::fromValue(headers);
-        return asyncCallWithArgumentList(QLatin1String("createDownloadWithHash"), argumentList);
+        argumentList << QVariant::fromValue(downloads) << QVariant::fromValue(algorithm) << QVariant::fromValue(allowed3G) << QVariant::fromValue(metadata) << QVariant::fromValue(headers);
+        return asyncCallWithArgumentList(QLatin1String("createDownloadGroup"), argumentList);
     }
 
     inline QDBusPendingReply<qulonglong> defaultThrottle()
 
=== added file 'clickmanager_plugin/download/group_download_struct.cpp'
--- clickmanager_plugin/download/group_download_struct.cpp	1970-01-01 00:00:00 +0000
+++ clickmanager_plugin/download/group_download_struct.cpp	2013-09-03 11:06:52 +0000
@@ -0,0 +1,95 @@
+/*
+ * copyright 2013 2013 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 <QDBusMetaType>
+#include "./hash_algorithm.h"
+#include "./group_download_struct.h"
+
+GroupDownloadStruct::GroupDownloadStruct()
+    : _url(""),
+      _hash("") {
+}
+
+GroupDownloadStruct::GroupDownloadStruct(const QString& url,
+                                         const QString& localFile,
+                                         const QString& hash)
+    : _url(url),
+      _localFile(localFile),
+      _hash(hash) {
+}
+
+GroupDownloadStruct::GroupDownloadStruct(const GroupDownloadStruct& other)
+    : _url(other._url),
+      _localFile(other._localFile),
+      _hash(other._hash) {
+}
+
+GroupDownloadStruct& GroupDownloadStruct::operator=(
+                                  const GroupDownloadStruct& other) {
+    _url = other._url;
+    _localFile = other._localFile;
+    _hash = other._hash;
+
+    return *this;
+}
+
+GroupDownloadStruct::~GroupDownloadStruct() {
+}
+
+
+QDBusArgument &operator<<(QDBusArgument& argument,
+                          const GroupDownloadStruct& group) {
+    argument.beginStructure();
+    argument << group._url;
+    argument << group._localFile;
+    argument << group._hash;
+    argument.endStructure();
+
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument& argument,
+                                GroupDownloadStruct& group) {
+    argument.beginStructure();
+    argument >> group._url;
+    argument >> group._localFile;
+    argument >> group._hash;
+    argument.endStructure();
+
+    return argument;
+}
+
+void GroupDownloadStruct::registerMetaType() {
+    qRegisterMetaType<GroupDownloadStruct>("GroupDownloadStruct");
+    qDBusRegisterMetaType<GroupDownloadStruct>();
+}
+
+QString
+GroupDownloadStruct::getUrl() {
+    return _url;
+}
+
+QString
+GroupDownloadStruct::getHash() {
+    return _hash;
+}
+
+QString
+GroupDownloadStruct::getLocalFile() {
+    return _localFile;
+}
 
=== added file 'clickmanager_plugin/download/group_download_struct.h'
--- clickmanager_plugin/download/group_download_struct.h	1970-01-01 00:00:00 +0000
+++ clickmanager_plugin/download/group_download_struct.h	2013-09-03 11:06:52 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013 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 GROUP_DOWNLOAD_STRUCT_H
+#define GROUP_DOWNLOAD_STRUCT_H
+
+#include <QDBusArgument>
+
+typedef QList<GroupDownloadStruct> StructList;
+class GroupDownloadStruct {
+    Q_PROPERTY(QString url READ getUrl)
+    Q_PROPERTY(QString hash READ getHash)
+    Q_PROPERTY(QString localFile READ getLocalFile)
+
+ public:
+    GroupDownloadStruct();
+    GroupDownloadStruct(const QString& url, const QString& localFile,
+        const QString& hash);
+    GroupDownloadStruct(const GroupDownloadStruct& other);
+    GroupDownloadStruct& operator=(const GroupDownloadStruct& other);
+    ~GroupDownloadStruct();
+
+    friend QDBusArgument &operator<<(QDBusArgument &argument,
+        const GroupDownloadStruct& group);
+    friend const QDBusArgument &operator>>(const QDBusArgument &argument,
+        GroupDownloadStruct& group);
+
+    // register Secret with the Qt type system
+    static void registerMetaType();
+
+    // property getters
+    QString getUrl();
+    QString getHash();
+    QString getLocalFile();
+
+ private:
+    QString _url;
+    QString _localFile;
+    QString _hash;
+};
+
+Q_DECLARE_METATYPE(GroupDownloadStruct)
+
+#endif  //GROUP_DOWNLOAD_STRUCT_H