Merge lp:~mandel/ubuntu-download-manager/fix-uploads-timeout into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that the timeout is stopped when uploads are added to the queue.

[Oliver Grawert (ogra)]

looks ok, does it build and run too ? :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/706/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/65/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/common/priv/ubuntu/transfers/base_daemon.cpp'
--- src/common/priv/ubuntu/transfers/base_daemon.cpp	2014-04-08 20:17:22 +0000
+++ src/common/priv/ubuntu/transfers/base_daemon.cpp	2014-07-21 09:04:50 +0000
@@ -156,7 +156,7 @@
 }
 
 void
-BaseDaemon::onDownloadManagerSizeChanged(int size) {
+BaseDaemon::onSizeChanged(int size) {
     TRACE << size;
     bool isActive = _shutDownTimer->isActive();
 
@@ -227,7 +227,7 @@
     // connect to the download manager changes
     CHECK(connect(_manager,
         &BaseManager::sizeChanged,
-        this, &BaseDaemon::onDownloadManagerSizeChanged))
+        this, &BaseDaemon::onSizeChanged))
                 << "Could not connect to signal";
 }
 

=== modified file 'src/common/priv/ubuntu/transfers/base_daemon.h'
--- src/common/priv/ubuntu/transfers/base_daemon.h	2014-03-07 12:47:42 +0000
+++ src/common/priv/ubuntu/transfers/base_daemon.h	2014-07-21 09:04:50 +0000
@@ -80,7 +80,7 @@
     void init();
     void parseCommandLine();
     void onTimeout();
-    void onDownloadManagerSizeChanged(int);
+    void onSizeChanged(int);
 
  private:
     QString _path = "";

=== modified file 'src/downloads/priv/ubuntu/downloads/manager.cpp'
--- src/downloads/priv/ubuntu/downloads/manager.cpp	2014-04-23 14:51:21 +0000
+++ src/downloads/priv/ubuntu/downloads/manager.cpp	2014-07-21 09:04:50 +0000
@@ -45,7 +45,7 @@
     RequestFactory::setStoppable(_stoppable);
     _downloadFactory = new Factory(this);
     _db = DownloadsDb::instance();
-    _downloadsQueue = new Queue(this);
+    _queue = new Queue(this);
     init();
 }
 
@@ -58,14 +58,14 @@
     : BaseManager(app, stoppable, parent),
       _throttle(0),
       _downloadFactory(downloadFactory),
-      _downloadsQueue(queue) {
+      _queue(queue) {
     _db = DownloadsDb::instance();
     _conn = connection;
     init();
 }
 
 DownloadManager::~DownloadManager() {
-    delete _downloadsQueue;
+    delete _queue;
     delete _downloadFactory;
 }
 
@@ -81,10 +81,10 @@
     qDBusRegisterMetaType<NetworkErrorStruct>();
     qDBusRegisterMetaType<ProcessErrorStruct>();
 
-    CHECK(connect(_downloadsQueue, &Queue::transferRemoved,
+    CHECK(connect(_queue, &Queue::transferRemoved,
         this, &DownloadManager::onDownloadsChanged))
             << "Could not connect to signal";
-    CHECK(connect(_downloadsQueue, &Queue::transferAdded,
+    CHECK(connect(_queue, &Queue::transferAdded,
         this, &DownloadManager::onDownloadsChanged))
             << "Could not connect to signal";
 }
@@ -116,7 +116,7 @@
 void
 DownloadManager::onDownloadsChanged(QString path) {
     LOG(INFO) << __PRETTY_FUNCTION__ << path;
-    emit sizeChanged(_downloadsQueue->size());
+    emit sizeChanged(_queue->size());
 }
 
 QString
@@ -141,7 +141,7 @@
             << "could not be stored in the db";
     }
     _db->connectToDownload(download);
-    _downloadsQueue->add(download);
+    _queue->add(download);
     auto path = download->path();
     qDebug() << "ADDED TO Q";
     _conn->registerObject(path, download);
@@ -240,7 +240,7 @@
 void
 DownloadManager::setDefaultThrottle(qulonglong speed) {
     _throttle = speed;
-    QHash<QString, Transfer*> downloads = _downloadsQueue->transfers();
+    QHash<QString, Transfer*> downloads = _queue->transfers();
     foreach(const QString& path, downloads.keys()) {
         downloads[path]->setThrottle(speed);
     }
@@ -249,7 +249,7 @@
 void
 DownloadManager::allowGSMDownload(bool allowed) {
     _allowMobileData = allowed;
-    QHash<QString, Transfer*> downloads = _downloadsQueue->transfers();
+    QHash<QString, Transfer*> downloads = _queue->transfers();
     foreach(const QString& path, downloads.keys()) {
         downloads[path]->allowGSMData(allowed);
     }
@@ -270,7 +270,7 @@
     QList<QDBusObjectPath> paths;
     if (appArmor->isConfined(appId)) {
         LOG(INFO) << "Returning downloads for api with id" << appId;
-        auto transfers = _downloadsQueue->transfers();
+        auto transfers = _queue->transfers();
         foreach(const QString& path, transfers.keys()) {
             auto t = transfers[path];
             if (t->transferAppId() == appId)
@@ -278,7 +278,7 @@
         }
     } else {
         LOG(INFO) << "Returning all downloads for unconfined app";
-        foreach(const QString& path, _downloadsQueue->paths())
+        foreach(const QString& path, _queue->paths())
             paths << QDBusObjectPath(path);
     }
     return paths;
@@ -295,7 +295,7 @@
     auto isConfined = appArmor->isConfined(appId);
 
     QList<QDBusObjectPath> paths;
-    QHash<QString, Transfer*> downloads = _downloadsQueue->transfers();
+    QHash<QString, Transfer*> downloads = _queue->transfers();
     foreach(const QString& path, downloads.keys()) {
         auto down = qobject_cast<Download*>(downloads[path]);
         if (down != nullptr) {

=== modified file 'src/downloads/priv/ubuntu/downloads/manager.h'
--- src/downloads/priv/ubuntu/downloads/manager.h	2014-04-23 14:51:21 +0000
+++ src/downloads/priv/ubuntu/downloads/manager.h	2014-07-21 09:04:50 +0000
@@ -88,7 +88,7 @@
 
  protected:
     Queue* queue() {
-        return _downloadsQueue;
+        return _queue;
     }
 
     virtual QDBusObjectPath registerDownload(Download* download);
@@ -113,7 +113,7 @@
     Application* _app = nullptr;
     qulonglong _throttle;
     Factory* _downloadFactory = nullptr;
-    Queue* _downloadsQueue = nullptr;
+    Queue* _queue = nullptr;
     DownloadsDb* _db = nullptr;
     DBusConnection* _conn = nullptr;
     bool _stoppable = false;

=== modified file 'src/uploads/priv/ubuntu/uploads/manager.cpp'
--- src/uploads/priv/ubuntu/uploads/manager.cpp	2014-04-24 18:37:28 +0000
+++ src/uploads/priv/ubuntu/uploads/manager.cpp	2014-07-21 09:04:50 +0000
@@ -72,10 +72,12 @@
     qDBusRegisterMetaType<NetworkErrorStruct>();
     qDBusRegisterMetaType<ProcessErrorStruct>();
 
-    connect(_queue, &Queue::transferRemoved,
-        this, &UploadManager::onUploadsChanged);
-    connect(_queue, &Queue::transferAdded,
-        this, &UploadManager::onUploadsChanged);
+    CHECK(connect(_queue, &Queue::transferRemoved,
+        this, &UploadManager::onUploadsChanged))
+            << "Could not connect to signal";
+    CHECK(connect(_queue, &Queue::transferAdded,
+        this, &UploadManager::onUploadsChanged))
+            << "Could not connect to signal";
 }
 
 UploadManager::~UploadManager() {

=== modified file 'src/uploads/priv/ubuntu/uploads/manager.h'
--- src/uploads/priv/ubuntu/uploads/manager.h	2014-04-24 18:37:28 +0000
+++ src/uploads/priv/ubuntu/uploads/manager.h	2014-07-21 09:04:50 +0000
@@ -80,7 +80,6 @@
 
  signals:
     void uploadCreated(const QDBusObjectPath& path);
-    void sizeChanged(int size);
 
  private:
     typedef std::function<FileUpload*(QString)> UploadCreationFunc;