Merge lp:~mandel/ubuntu-download-manager/stop-when-empty into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensures that the daemon is stopped when there is nothing to download.

Ensures that the daemon is stopped when there is nothing to download. To make thing simpler to test irl I have added a python script in the tests directory that uses the downloader to get an image. That way you can test that the downloader works and once the download is done the daemon is closed.

[lp:~mandel/ubuntu-download-manager/stop-when-empty]

98. By Manuel de la Peña on 2013-08-22

Merged with trunk and resolved errors.

99. By Manuel de la Peña on 2013-08-22

Link bug.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'libubuntudownloadmanager/download.cpp'
--- libubuntudownloadmanager/download.cpp	2013-08-21 14:10:28 +0000
+++ libubuntudownloadmanager/download.cpp	2013-08-22 21:00:52 +0000
@@ -352,7 +352,7 @@
 
 QNetworkRequest
 DownloadPrivate::buildRequest() {
-    qDebug() << "Building request for " << _url;
+    qDebug() << __FUNCTION__ << _url;
     QNetworkRequest request = QNetworkRequest(_url);
     foreach(const QString& header, _headers.keys()) {
         QString data = _headers[header];
@@ -366,7 +366,7 @@
 
 void
 DownloadPrivate::emitError(const QString& error) {
-    qDebug() << "EMIT ERROR:" << error;
+    qDebug() << __FUNCTION__ << error;
     Q_Q(Download);
     disconnectFromReplySignals();
     _reply->deleteLater();
@@ -428,6 +428,7 @@
 
 bool
 DownloadPrivate::canDownload() {
+    qDebug() << __FUNCTION__;
     QNetworkInfo::NetworkMode mode = _networkInfo->currentNetworkMode();
     switch (mode) {
         case QNetworkInfo::UnknownMode:

=== modified file 'libubuntudownloadmanager/download_daemon.cpp'
--- libubuntudownloadmanager/download_daemon.cpp	2013-08-21 12:21:49 +0000
+++ libubuntudownloadmanager/download_daemon.cpp	2013-08-22 21:00:52 +0000
@@ -36,16 +36,23 @@
     explicit DownloadDaemonPrivate(DownloadDaemon* parent);
     explicit DownloadDaemonPrivate(Application* app,
                                    DBusConnection* conn,
+                                   Timer* timer,
+                                   DownloadManager* man,
                                    DownloadDaemon* parent);
     ~DownloadDaemonPrivate();
 
     void start();
+    void onTimeout();
+    void onDownloadManagerSizeChanged(int size);
+
+    static const int timeout = 30000;
 
  private:
     void init();
 
  private:
     Application* _app;
+    Timer* _shutDownTimer;
     QSharedPointer<DBusConnection> _conn;
     DownloadManager* _downInterface;
     DownloadManagerAdaptor* _downAdaptor;
@@ -56,21 +63,36 @@
     : q_ptr(parent) {
     _app = new Application();
     _conn = QSharedPointer<DBusConnection>(new DBusConnection());
+    _shutDownTimer = new Timer();
     _downInterface = new DownloadManager(_conn, q_ptr);
     init();
 }
 
 DownloadDaemonPrivate::DownloadDaemonPrivate(Application* app,
                                              DBusConnection* conn,
+                                             Timer* timer,
+                                             DownloadManager* man,
                                              DownloadDaemon* parent)
     : _app(app),
+      _shutDownTimer(timer),
       _conn(conn),
+      _downInterface(man),
       q_ptr(parent) {
-      _downInterface = new DownloadManager(_conn);
     init();
 }
 
 void DownloadDaemonPrivate::init() {
+    Q_Q(DownloadDaemon);
+
+    q->connect(_shutDownTimer, SIGNAL(timeout()),
+        q, SLOT(onTimeout()));
+    _shutDownTimer->start(timeout);
+
+    // connect to the download manager changes
+    q->connect(_downInterface,
+        SIGNAL(sizeChanged(int)),  // NOLINT (readability/function)
+        q, SLOT(onDownloadManagerSizeChanged(int))); // NOLINT (readability/function)
+
     // set logging
     Logger::setupLogging();
 #ifdef DEBUG
@@ -87,6 +109,8 @@
         delete _downInterface;
     if (_app)
         delete _app;
+    if (_shutDownTimer)
+        delete _shutDownTimer;
 
     // stop logging
     Logger::setupLogging();
@@ -112,6 +136,28 @@
     _app->exit(-1);
 }
 
+void
+DownloadDaemonPrivate::onTimeout() {
+    qDebug() << "Timeout reached, shutdown service.";
+    _app->exit(0);
+}
+
+void
+DownloadDaemonPrivate::onDownloadManagerSizeChanged(int size) {
+    bool isActive = _shutDownTimer->isActive();
+    qDebug() << "Timer is active:" << isActive << "size is:" << size;
+
+    if (isActive && size > 0) {
+        qDebug() << "Timer must be stopped because we have" << size
+            << "downloads.";
+        _shutDownTimer->stop();
+    }
+    if (!isActive && size == 0) {
+        qDebug() << "Timer must be started because we have 0 downloads.";
+        _shutDownTimer->start(timeout);
+    }
+}
+
 /**
  * PUBLIC IMPLEMENTATION
  */
@@ -123,9 +169,11 @@
 
 DownloadDaemon::DownloadDaemon(Application* app,
                                DBusConnection* conn,
+                               Timer* timer,
+                               DownloadManager* man,
                                QObject *parent)
     : QObject(parent),
-      d_ptr(new DownloadDaemonPrivate(app, conn, this)) {
+      d_ptr(new DownloadDaemonPrivate(app, conn, timer, man, this)) {
 }
 
 void
@@ -133,3 +181,5 @@
     Q_D(DownloadDaemon);
     d->start();
 }
+
+#include "moc_download_daemon.cpp"

=== modified file 'libubuntudownloadmanager/download_daemon.h'
--- libubuntudownloadmanager/download_daemon.h	2013-08-21 12:08:43 +0000
+++ libubuntudownloadmanager/download_daemon.h	2013-08-22 21:00:52 +0000
@@ -23,6 +23,8 @@
 #include "./app-downloader-lib_global.h"
 #include "./application.h"
 #include "./dbus_connection.h"
+#include "./download_manager.h"
+#include "./timer.h"
 
 class DownloadDaemonPrivate;
 class APPDOWNLOADERLIBSHARED_EXPORT DownloadDaemon : public QObject {
@@ -33,12 +35,18 @@
     explicit DownloadDaemon(QObject *parent = 0);
     explicit DownloadDaemon(Application* app,
                             DBusConnection* conn,
+                            Timer* timer,
+                            DownloadManager* man,
                             QObject *parent = 0);
 
- public slots:
+ public slots:  // NOLINT (whitespace/indent)
     void start();
 
  private:
+    Q_PRIVATE_SLOT(d_func(), void onTimeout())
+    Q_PRIVATE_SLOT(d_func(), void onDownloadManagerSizeChanged(int))  // NOLINT (readability/function)
+
+ private:
     // use pimpl so that we can mantains ABI compatibility
     DownloadDaemonPrivate* d_ptr;
 };

=== modified file 'libubuntudownloadmanager/download_manager.cpp'
--- libubuntudownloadmanager/download_manager.cpp	2013-07-26 14:05:22 +0000
+++ libubuntudownloadmanager/download_manager.cpp	2013-08-22 21:00:52 +0000
@@ -44,7 +44,7 @@
     void init();
     void addDownload(Download* download);
     void loadPreviewsDownloads(QString path);
-    void onDownloadRemoved(QString path);
+    void onDownloadsChanged(QString path);
 
     QDBusObjectPath createDownload(const QString& url,
                                    const QVariantMap& metadata,
@@ -111,7 +111,9 @@
     qDBusRegisterMetaType<StringMap>();
 
     q->connect(_downloadsQueue, SIGNAL(downloadRemoved(QString)),
-        q, SLOT(onDownloadRemoved(QString)));
+        q, SLOT(onDownloadsChanged(QString)));
+    q->connect(_downloadsQueue, SIGNAL(downloadAdded(QString)),
+        q, SLOT(onDownloadsChanged(QString)));
 
     _reqFactory = new RequestFactory();
     _processFactory = new ProcessFactory();
@@ -131,14 +133,17 @@
 }
 
 void
-DownloadManagerPrivate::onDownloadRemoved(QString path) {
-    _conn->unregisterObject(path);
+DownloadManagerPrivate::onDownloadsChanged(QString path) {
+    qDebug() << __FUNCTION__ << path;
+    Q_Q(DownloadManager);
+    emit q->sizeChanged(_downloadsQueue->size());
 }
 
 QDBusObjectPath
 DownloadManagerPrivate::createDownload(const QString& url,
                                        const QVariantMap& metadata,
                                        StringMap headers) {
+    qDebug() << __FUNCTION__ << url << metadata << headers;
     return createDownloadWithHash(url, "", QCryptographicHash::Md5,
         metadata, headers);
 }

=== modified file 'libubuntudownloadmanager/download_manager.h'
--- libubuntudownloadmanager/download_manager.h	2013-07-26 14:05:22 +0000
+++ libubuntudownloadmanager/download_manager.h	2013-08-22 21:00:52 +0000
@@ -62,9 +62,10 @@
 
  signals:
     void downloadCreated(const QDBusObjectPath& path);
+    void sizeChanged(int count);
 
  private:
-    Q_PRIVATE_SLOT(d_func(), void onDownloadRemoved(QString))
+    Q_PRIVATE_SLOT(d_func(), void onDownloadsChanged(QString))
 
  private:
     // use pimpl so that we can mantains ABI compatibility

=== modified file 'libubuntudownloadmanager/download_queue.cpp'
--- libubuntudownloadmanager/download_queue.cpp	2013-08-21 14:10:28 +0000
+++ libubuntudownloadmanager/download_queue.cpp	2013-08-22 21:00:52 +0000
@@ -40,16 +40,15 @@
     QString currentDownload();
     QStringList paths();
     QHash<QString, Download*> downloads();
+    int size();
 
     void onDownloadStateChanged();
-    void onDestroyed(const QString& path);
     void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
 
  private:
     void updateCurrentDownload();
 
  private:
-    QSignalMapper* _mapper;
     QString _current;
     DownloadList _downloads;   // quick for access
     QStringList _sortedPaths;  // keep the order
@@ -63,19 +62,13 @@
       _networkInfo(networkInfo),
       q_ptr(parent) {
     Q_Q(DownloadQueue);
-    _mapper = new QSignalMapper();
 
     q->connect(_networkInfo,
             SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), q,
             SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)));
-
-    q->connect(_mapper, SIGNAL(mapped(const QString&)),
-        q, SLOT(onDestroyed(const QString&)));
 }
 
 DownloadQueuePrivate::~DownloadQueuePrivate() {
-    if (_mapper != NULL)
-        delete _mapper;
 }
 
 void
@@ -89,6 +82,8 @@
     Q_Q(DownloadQueue);
     // connect to the signals and append to the list
     QString path = value.first->path();
+    qDebug() << __FUNCTION__ << path;
+
     _sortedPaths.append(path);
     _downloads[path] = value;
 
@@ -107,15 +102,10 @@
     _sortedPaths.removeOne(path);
     _downloads.remove(path);
 
-    // connect to the adaptor destroyed event to ensure that we have
-    // emitted all signals, else we might have a race condition where
-    // the object path is removed from dbus to early
-    q->connect(pair.second, SIGNAL(destroyed(QObject* obj)),
-        _mapper, SLOT(map(QObject* obj)));
-    _mapper->setMapping(pair.first, path);
-
     pair.second->deleteLater();
     pair.first->deleteLater();
+
+    emit q->downloadRemoved(path);
 }
 
 QString
@@ -137,8 +127,14 @@
     return downloads;
 }
 
+int
+DownloadQueuePrivate::size() {
+    return _downloads.size();
+}
+
 void
 DownloadQueuePrivate::onDownloadStateChanged() {
+    qDebug() << __FUNCTION__;
     Q_Q(DownloadQueue);
     // get the appdownload that emited the signal and decide what to do with it
     Download* sender = qobject_cast<Download*>(q->sender());
@@ -180,13 +176,6 @@
 }
 
 void
-DownloadQueuePrivate::onDestroyed(const QString &path) {
-    qDebug() << __FUNCTION__;
-    Q_Q(DownloadQueue);
-    emit q->downloadRemoved(path);
-}
-
-void
 DownloadQueuePrivate::onCurrentNetworkModeChanged(
         QNetworkInfo::NetworkMode mode) {
     Q_UNUSED(mode);
@@ -195,6 +184,7 @@
 
 void
 DownloadQueuePrivate::updateCurrentDownload() {
+    qDebug() << __FUNCTION__;
     Q_Q(DownloadQueue);
 
     if (!_current.isEmpty()) {
@@ -203,10 +193,12 @@
         Download::State state = currentDownload->state();
         if (state == Download::CANCEL || state == Download::FINISH
             || state == Download::ERROR) {
+            qDebug() << "States is CANCEL || FINISH";
             remove(_current);
             _current = "";
         } else if (!currentDownload->canDownload()
                 || state == Download::PAUSE) {
+            qDebug() << "States is Cannot Download || PAUSE";
             _current = "";
         } else {
             return;
@@ -272,4 +264,10 @@
     return d->downloads();
 }
 
+int
+DownloadQueue::size() {
+    Q_D(DownloadQueue);
+    return d->size();
+}
+
 #include "moc_download_queue.cpp"

=== modified file 'libubuntudownloadmanager/download_queue.h'
--- libubuntudownloadmanager/download_queue.h	2013-07-23 15:51:01 +0000
+++ libubuntudownloadmanager/download_queue.h	2013-08-22 21:00:52 +0000
@@ -40,6 +40,7 @@
     QString currentDownload();
     QStringList paths();
     QHash<QString, Download*> downloads();
+    virtual int size();
 
  signals:
     // signals raised when things happens within the q
@@ -49,7 +50,6 @@
 
  private:
     Q_PRIVATE_SLOT(d_func(), void onDownloadStateChanged())
-    Q_PRIVATE_SLOT(d_func(), void onDestroyed(const QString& path))
     Q_PRIVATE_SLOT(d_func(),
             void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode))
 

=== modified file 'libubuntudownloadmanager/libubuntudownloadmanager.pro'
--- libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-08-21 11:08:29 +0000
+++ libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-08-22 21:00:52 +0000
@@ -24,7 +24,8 @@
     process.cpp \
     process_factory.cpp \
     logger.cpp \
-    application.cpp
+    application.cpp \
+    timer.cpp
 
 HEADERS +=\
     app-downloader-lib_global.h \
@@ -44,7 +45,8 @@
     process_factory.h \
     metatypes.h \
     logger.h \
-    application.h
+    application.h \
+    timer.h
 
 OTHER_FILES += \
     generate_adaptors.sh \

=== added file 'libubuntudownloadmanager/timer.cpp'
--- libubuntudownloadmanager/timer.cpp	1970-01-01 00:00:00 +0000
+++ libubuntudownloadmanager/timer.cpp	2013-08-22 21:00:52 +0000
@@ -0,0 +1,99 @@
+/*
+ * 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 <QTimer>
+#include "./timer.h"
+
+/*
+ * PRIVATE IMPLEMENTATION
+ */
+
+class TimerPrivate {
+    Q_DECLARE_PUBLIC(Timer)
+
+ public:
+    explicit TimerPrivate(Timer* parent);
+    ~TimerPrivate();
+
+    bool isActive();
+    void start(int msec);
+    void stop();
+
+ private:
+    QTimer* _timer;
+    Timer* q_ptr;
+};
+
+TimerPrivate::TimerPrivate(Timer* parent)
+    : q_ptr(parent) {
+    Q_Q(Timer);
+    _timer = new QTimer();
+    _timer->setSingleShot(true);
+
+    q->connect(_timer, SIGNAL(timeout()),
+        q, SIGNAL(timeout()));
+}
+
+TimerPrivate::~TimerPrivate() {
+    if (_timer)
+        delete _timer;
+}
+
+
+bool
+TimerPrivate::isActive() {
+    return _timer->isActive();
+}
+
+void
+TimerPrivate::start(int msec) {
+    _timer->start(msec);
+}
+
+void
+TimerPrivate::stop() {
+    _timer->stop();
+}
+
+
+/*
+ * PUBLIC IMPLEMENTATION
+ */
+
+Timer::Timer(QObject *parent)
+    : QObject(parent),
+      d_ptr(new TimerPrivate(this)) {
+}
+
+bool
+Timer::isActive() {
+    Q_D(Timer);
+    return d->isActive();
+}
+
+void
+Timer::start(int msec) {
+    Q_D(Timer);
+    d->start(msec);
+}
+
+void
+Timer::stop() {
+    Q_D(Timer);
+    d->stop();
+}

=== added file 'libubuntudownloadmanager/timer.h'
--- libubuntudownloadmanager/timer.h	1970-01-01 00:00:00 +0000
+++ libubuntudownloadmanager/timer.h	2013-08-22 21:00:52 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+#ifndef DOWNLOADER_LIB_TIMER_H
+#define DOWNLOADER_LIB_TIMER_H
+
+#include <QObject>
+
+
+class TimerPrivate;
+class Timer : public QObject {
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(Timer)
+
+ public:
+    explicit Timer(QObject *parent = 0);
+
+    virtual bool isActive();
+    virtual void start(int msec);
+    virtual void stop();
+
+ signals:
+    void timeout();
+
+ private:
+    // use pimpl so that we can mantains ABI compatibility
+    TimerPrivate* d_ptr;
+};
+
+#endif  // DOWNLOADER_LIB_TIMER_H

=== added file 'ubuntu-download-manager-tests/fake_download_manager.cpp'
--- ubuntu-download-manager-tests/fake_download_manager.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/fake_download_manager.cpp	2013-08-22 21:00:52 +0000
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+#include "./fake_download_manager.h"
+
+FakeDownloadManager::FakeDownloadManager(
+                                    QSharedPointer<DBusConnection> connection,
+                                    QObject *parent)
+    : DownloadManager(connection, parent),
+      Fake() {
+}
+
+void
+FakeDownloadManager::emitSizeChaged(int size) {
+    emit sizeChanged(size);
+}
+

=== added file 'ubuntu-download-manager-tests/fake_download_manager.h'
--- ubuntu-download-manager-tests/fake_download_manager.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/fake_download_manager.h	2013-08-22 21:00:52 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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 FAKE_DOWNLOAD_MANAGER_H
+#define FAKE_DOWNLOAD_MANAGER_H
+
+#include <QObject>
+#include <download_manager.h>
+#include "./fake.h"
+
+
+class FakeDownloadManager : public DownloadManager, public Fake {
+    Q_OBJECT
+
+ public:
+    explicit FakeDownloadManager(QSharedPointer<DBusConnection> connection,
+                                 QObject *parent = 0);
+
+    void emitSizeChaged(int size);
+};
+
+#endif  // FAKE_DOWNLOAD_MANAGER_H

=== modified file 'ubuntu-download-manager-tests/fake_download_queue.cpp'
--- ubuntu-download-manager-tests/fake_download_queue.cpp	2013-07-23 17:42:03 +0000
+++ ubuntu-download-manager-tests/fake_download_queue.cpp	2013-08-22 21:00:52 +0000
@@ -57,3 +57,23 @@
     }
     DownloadQueue::add(value);
 }
+
+int
+FakeDownloadQueue::size() {
+    return _size;
+}
+
+void
+FakeDownloadQueue::setSize(int size) {
+    _size = size;
+}
+
+void
+FakeDownloadQueue::emitDownloadAdded(const QString& path) {
+    emit downloadAdded(path);
+}
+
+void
+FakeDownloadQueue::emitDownloadRemoved(const QString& path) {
+    emit downloadRemoved(path);
+}

=== modified file 'ubuntu-download-manager-tests/fake_download_queue.h'
--- ubuntu-download-manager-tests/fake_download_queue.h	2013-07-23 17:42:56 +0000
+++ ubuntu-download-manager-tests/fake_download_queue.h	2013-08-22 21:00:52 +0000
@@ -31,6 +31,14 @@
 
     void add(Download* download, DownloadAdaptor* adaptor) override;
     void add(const QPair<Download*, DownloadAdaptor*>& value) override;
+    int size() override;
+    void setSize(int size);
+
+    void emitDownloadAdded(const QString& path);
+    void emitDownloadRemoved(const QString& path);
+
+ private:
+    int _size;
 };
 
 #endif  // FAKE_DOWNLOAD_QUEUE_H

=== added file 'ubuntu-download-manager-tests/fake_timer.cpp'
--- ubuntu-download-manager-tests/fake_timer.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/fake_timer.cpp	2013-08-22 21:00:52 +0000
@@ -0,0 +1,75 @@
+/*
+ * 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 "./fake_timer.h"
+
+FakeTimer::FakeTimer(QObject *parent)
+    : Timer(parent),
+    Fake() {
+}
+
+bool
+FakeTimer::isActive() {
+    if (_recording) {
+        QList<QObject*> inParams;
+
+        QList<QObject*> outParams;
+        outParams.append(new BoolWrapper(_isActive));
+
+        MethodParams params(inParams, outParams);
+        MethodData methodData("isActive", params);
+        _called.append(methodData);
+    }
+    return _isActive;
+}
+
+void
+FakeTimer::setIsActive(bool active) {
+    _isActive = active;
+}
+
+void
+FakeTimer::start(int msec) {
+    if (_recording) {
+        QList<QObject*> inParams;
+        inParams.append(new IntWrapper(msec));
+
+        QList<QObject*> outParams;
+
+        MethodParams params(inParams, outParams);
+        MethodData methodData("start", params);
+        _called.append(methodData);
+    }
+}
+
+void
+FakeTimer::stop() {
+    if (_recording) {
+        QList<QObject*> inParams;
+        QList<QObject*> outParams;
+
+        MethodParams params(inParams, outParams);
+        MethodData methodData("stop", params);
+        _called.append(methodData);
+    }
+}
+
+void
+FakeTimer::emitTimeout() {
+    emit timeout();
+}

=== added file 'ubuntu-download-manager-tests/fake_timer.h'
--- ubuntu-download-manager-tests/fake_timer.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/fake_timer.h	2013-08-22 21:00:52 +0000
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+#ifndef FAKE_TIMER_H
+#define FAKE_TIMER_H
+
+#include <QObject>
+#include <timer.h>
+#include "./fake.h"
+
+
+class FakeTimer : public Timer, public Fake {
+    Q_OBJECT
+
+ public:
+    explicit FakeTimer(QObject *parent = 0);
+
+    bool isActive() override;
+    void setIsActive(bool active);
+    void start(int msec) override;
+    void stop() override;
+
+    void emitTimeout();
+
+ private:
+    bool _isActive;
+};
+
+#endif  // FAKE_TIMER_H

=== added file 'ubuntu-download-manager-tests/irl_tests.py'
--- ubuntu-download-manager-tests/irl_tests.py	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/irl_tests.py	2013-08-22 21:00:52 +0000
@@ -0,0 +1,84 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, 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 warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Test the ubuntu downloader."""
+
+import gobject
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+
+DBusGMainLoop(set_as_default=True)
+
+MANAGER_PATH = '/'
+MANAGER_IFACE = 'com.canonical.applications.DownloaderManager'
+DOWNLOAD_IFACE = 'com.canonical.applications.Download'
+IMAGE_FILE = 'http://i.imgur.com/y51njgu.jpg'
+
+
+def download_created(path):
+    """Deal with the download created signal."""
+    print 'Download created in %s' % path
+
+
+def finished_callback(path, loop):
+    """Deal with the finis signal."""
+    print 'Download performed in "%s"' % path
+    loop.quit()
+
+
+def progress_callback(total, progress):
+    """Deal with the progress signals."""
+    print 'Progress is %s/%s' % (progress, total)
+
+if __name__ == '__main__':
+
+    bus = dbus.SessionBus()
+    loop = gobject.MainLoop()
+    manager = bus.get_object('com.canonical.applications.Downloader',
+            MANAGER_PATH)
+    manager_dev_iface = dbus.Interface(manager, dbus_interface=MANAGER_IFACE)
+
+    # ensure that download created works
+    manager_dev_iface.connect_to_signal('downloadCreated', download_created)
+
+    down_path = manager_dev_iface.createDownload(IMAGE_FILE, {}, {})
+
+    download = bus.get_object('com.canonical.applications.Downloader',
+            down_path)
+
+    download_dev_iface = dbus.Interface(download, dbus_interface=DOWNLOAD_IFACE)
+
+    # connect to signals
+    download_dev_iface.connect_to_signal('progress', progress_callback)
+    download_dev_iface.connect_to_signal('finished',
+            lambda path: finished_callback(path, loop))
+
+    download_dev_iface.start()
+
+    loop.run()

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.cpp'
--- ubuntu-download-manager-tests/test_download_daemon.cpp	2013-08-21 12:21:49 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.cpp	2013-08-22 21:00:52 +0000
@@ -24,9 +24,11 @@
 
 void
 TestDownloadDaemon::init() {
+    _timer = new FakeTimer();
     _app = new FakeApplication();
     _conn = new FakeDBusConnection();
-    _daemon = new DownloadDaemon(_app, _conn, this);
+    _man = new FakeDownloadManager(QSharedPointer<DBusConnection>(_conn));
+    _daemon = new DownloadDaemon(_app, _conn, _timer, _man, this);
 }
 
 void
@@ -37,6 +39,10 @@
         delete _conn;
     if (_daemon != NULL)
         delete _daemon;
+    if (_timer != NULL)
+        delete _timer;
+    if (_man != NULL)
+        delete _man;
 }
 
 void
@@ -99,3 +105,39 @@
     QCOMPARE(1, calledMethods.count());
     QCOMPARE(QString("exit"), calledMethods[0].methodName());
 }
+
+void
+TestDownloadDaemon::testTimerStop() {
+    _timer->setIsActive(true);
+    _timer->record();
+    _man->emitSizeChaged(1);
+
+    QList<MethodData> calledMethods = _timer->calledMethods();
+    QCOMPARE(2, calledMethods.count());
+    QCOMPARE(QString("isActive"), calledMethods[0].methodName());
+    QCOMPARE(QString("stop"), calledMethods[1].methodName());
+}
+
+void
+TestDownloadDaemon::testTimerStart() {
+    _timer->setIsActive(false);
+    _timer->record();
+    _man->emitSizeChaged(0);
+
+    QList<MethodData> calledMethods = _timer->calledMethods();
+    QCOMPARE(2, calledMethods.count());
+    QCOMPARE(QString("isActive"), calledMethods[0].methodName());
+    QCOMPARE(QString("start"), calledMethods[1].methodName());
+}
+
+void
+TestDownloadDaemon::testTimeoutExit() {
+    _app->record();
+    // emit the timeout signal and assert that exit was called
+    _timer->emitTimeout();
+
+    QList<MethodData> calledMethods = _app->calledMethods();
+    QCOMPARE(1, calledMethods.count());
+    QCOMPARE(QString("exit"), calledMethods[0].methodName());
+}
+

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.h'
--- ubuntu-download-manager-tests/test_download_daemon.h	2013-08-21 11:40:25 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.h	2013-08-22 21:00:52 +0000
@@ -23,6 +23,8 @@
 #include <download_daemon.h>
 #include "./fake_application.h"
 #include "./fake_dbus_connection.h"
+#include "./fake_download_manager.h"
+#include "./fake_timer.h"
 #include "./test_runner.h"
 
 class TestDownloadDaemon : public QObject {
@@ -38,9 +40,14 @@
     void testStart();
     void testStartFailServiceRegister();
     void testStartFailObjectRegister();
+    void testTimerStop();
+    void testTimerStart();
+    void testTimeoutExit();
 
  private:
+    FakeTimer* _timer;
     FakeApplication* _app;
+    FakeDownloadManager* _man;
     FakeDBusConnection* _conn;
     DownloadDaemon* _daemon;
 };

=== modified file 'ubuntu-download-manager-tests/test_download_manager.cpp'
--- ubuntu-download-manager-tests/test_download_manager.cpp	2013-07-26 14:05:22 +0000
+++ ubuntu-download-manager-tests/test_download_manager.cpp	2013-08-22 21:00:52 +0000
@@ -387,3 +387,47 @@
         QCOMPARE(download->throttle(), speed);
     }
 }
+
+void
+TestDownloadManager::testSizeChangedEmittedOnAddition_data() {
+    QTest::addColumn<int>("size");
+
+    QTest::newRow("First row") << 4;
+    QTest::newRow("Second row") << 5;
+    QTest::newRow("Third row") << 0;
+    QTest::newRow("Last row") << 34;
+}
+
+void
+TestDownloadManager::testSizeChangedEmittedOnAddition() {
+    QFETCH(int, size);
+    QSignalSpy spy(_man, SIGNAL(sizeChanged(int)));
+    _q->setSize(size);
+    _q->emitDownloadAdded("");
+
+    QCOMPARE(spy.count(), 1);
+    QList<QVariant> arguments = spy.takeFirst();
+    QCOMPARE(arguments.at(0).toInt(), size);
+}
+
+void
+TestDownloadManager::testSizeChangedEmittedOnRemoval_data() {
+    QTest::addColumn<int>("size");
+
+    QTest::newRow("First row") << 4;
+    QTest::newRow("Second row") << 5;
+    QTest::newRow("Third row") << 0;
+    QTest::newRow("Last row") << 34;
+}
+
+void
+TestDownloadManager::testSizeChangedEmittedOnRemoval() {
+    QFETCH(int, size);
+    QSignalSpy spy(_man, SIGNAL(sizeChanged(int)));
+    _q->setSize(size);
+    _q->emitDownloadRemoved("");
+
+    QCOMPARE(spy.count(), 1);
+    QList<QVariant> arguments = spy.takeFirst();
+    QCOMPARE(arguments.at(0).toInt(), size);
+}

=== modified file 'ubuntu-download-manager-tests/test_download_manager.h'
--- ubuntu-download-manager-tests/test_download_manager.h	2013-07-26 14:05:22 +0000
+++ ubuntu-download-manager-tests/test_download_manager.h	2013-08-22 21:00:52 +0000
@@ -44,6 +44,8 @@
     void testCreateDownloadWithHash_data();
     void testSetThrottleNotDownloads_data();
     void testSetThrottleWithDownloads_data();
+    void testSizeChangedEmittedOnAddition_data();
+    void testSizeChangedEmittedOnRemoval_data();
 
     // tests
     void testCreateDownload();
@@ -52,6 +54,8 @@
     void testAllDownloadsWithMetadata();
     void testSetThrottleNotDownloads();
     void testSetThrottleWithDownloads();
+    void testSizeChangedEmittedOnAddition();
+    void testSizeChangedEmittedOnRemoval();
 
  private:
     QCryptographicHash::Algorithm algoFromString(const QString& data);

=== modified file 'ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro'
--- ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-08-21 11:40:25 +0000
+++ ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-08-22 21:00:52 +0000
@@ -32,7 +32,9 @@
     fake_system_network_info.cpp \
     fake_process.cpp \
     fake_process_factory.cpp \
-    fake_application.cpp
+    fake_application.cpp \
+    fake_timer.cpp \
+    fake_download_manager.cpp
 
 HEADERS += \
     fake.h \
@@ -53,7 +55,9 @@
     fake_system_network_info.h \
     fake_process.h \
     fake_process_factory.h \
-    fake_application.h
+    fake_application.h \
+    fake_timer.h \
+    fake_download_manager.h
 
 LIBS += -L$$OUT_PWD/../libubuntudownloadmanager/ -lubuntudownloadmanager
 

=== modified file 'ubuntu-download-manager/ubuntu-download-manager.pro'
--- ubuntu-download-manager/ubuntu-download-manager.pro	2013-07-21 20:16:06 +0000
+++ ubuntu-download-manager/ubuntu-download-manager.pro	2013-08-22 21:00:52 +0000
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core
+QT       += core systeminfo
 
 QT       -= gui