Merge lp:~jonas-drange/ubuntu-settings-components/cups-notifications into lp:~phablet-team/ubuntu-settings-components/printer-components

[Jonas G. Drange]

* Deprecate QTimer based update()
* Replace with cups subscription based update()
* Fixes tests.

[Jonas G. Drange (jonas-drange)]

http://bazaar.launchpad.net/~jonas-drange/ubuntu-settings-components/cups-notifications/revision/223 is the revision where ALL signals are in PrinterBackend.

[lp:~jonas-drange/ubuntu-settings-components/cups-notifications]

224. By Jonas G. Drange on 2017-02-02

implements fewer signals

225. By Jonas G. Drange on 2017-02-02

removes unused stuff

[Andrew Hayzen (ahayzen)]

This looks good, can you do a pull of trunk. Then this can be approved. We can link the JobModel in a separate branch :-)

[lp:~jonas-drange/ubuntu-settings-components/cups-notifications]

226. By Jonas G. Drange on 2017-02-03

merges trunk

227. By Jonas G. Drange on 2017-02-03

mock backend returns an empty job list for now

[Andrew Hayzen (ahayzen)]

LGTM, and the tests pass now :-)

100% tests passed, 0 tests failed out of 7

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Printers/CMakeLists.txt'
--- plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-02-02 16:00:55 +0000
+++ plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-02-03 12:26:13 +0000
@@ -2,14 +2,21 @@
 
 add_definitions(-DUBUNTUSETTINGSPRINTERS_LIBRARY)
 
-include_directories(${CUPS_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CUPS_INCLUDE_DIR})
 
 find_package(Qt5Gui REQUIRED)
 find_package(Qt5PrintSupport REQUIRED)
 find_package(Qt5Qml REQUIRED)
+find_package(Qt5DBus REQUIRED)
 find_package(Qt5Concurrent REQUIRED)
 
+qt5_add_dbus_interface(
+    GEN_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/org.cups.cupsd.Notifier.xml
+    cupsdnotifier)
+
 add_library(UbuntuSettingsPrintersQml SHARED
+    ${GEN_SOURCES}
     backend/backend.cpp
     backend/backend_cups.cpp
     backend/backend_pdf.cpp
@@ -29,6 +36,7 @@
 )
 
 target_link_libraries(UbuntuSettingsPrintersQml
+    Qt5::DBus
     Qt5::Gui
     Qt5::PrintSupport
     Qt5::Qml
 
=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-02-02 17:22:55 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-02-03 12:26:13 +0000
@@ -149,14 +149,34 @@
     virtual void refresh();
 
 Q_SIGNALS:
-    void printerAdded(const QString &name);
-    void printerModified(const QString &name, const bool ppdChanged);
-    void printerDeleted(const QString &name);
-    void printerStateChanged(const QString &name);
-
     void printerDriversLoaded(const QList<PrinterDriver> &drivers);
     void printerDriversFailedToLoad(const QString &errorMessage);
 
+    void printerAdded(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs
+    );
+    void printerDeleted(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs
+    );
+    void printerModified(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs
+    );
+
 protected:
     const QString m_printerName;
 };
 
=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-02 17:22:55 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-03 12:26:13 +0000
@@ -19,29 +19,56 @@
 #include "i18n.h"
 #include "utils.h"
 
+#include <QDBusConnection>
 
 PrinterCupsBackend::PrinterCupsBackend(QObject *parent)
-    : PrinterCupsBackend(new CupsFacade(), QPrinterInfo(), parent)
+    : PrinterCupsBackend(new CupsFacade(), QPrinterInfo(),
+                         new OrgCupsCupsdNotifierInterface("",
+                                                           CUPSD_NOTIFIER_DBUS_PATH,
+                                                           QDBusConnection::systemBus()),
+                         parent)
 {
-    // If we create the CupsFacade, we're in charge of RAII.
+    // Use proper RAII of things we create:
     m_cups->setParent(this);
-
-    connect(m_cups, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)),
-            this, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)));
-    connect(m_cups, SIGNAL(printerDriversFailedToLoad(const QString&)),
-            this, SIGNAL(printerDriversFailedToLoad(const QString&)));
+    m_notifier->setParent(this);
 }
 
 PrinterCupsBackend::PrinterCupsBackend(CupsFacade *cups, QPrinterInfo info,
+                                       OrgCupsCupsdNotifierInterface *notifier,
                                        QObject *parent)
     : PrinterBackend(info.printerName(), parent)
     , m_cups(cups)
     , m_info(info)
+    , m_notifier(notifier)
 {
+    connect(m_cups, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)),
+            this, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)));
+    connect(m_cups, SIGNAL(printerDriversFailedToLoad(const QString&)),
+            this, SIGNAL(printerDriversFailedToLoad(const QString&)));
+
+    connect(m_notifier, SIGNAL(PrinterAdded(const QString&, const QString&,
+                                            const QString&, uint,
+                                            const QString&, bool)),
+            this, SIGNAL(printerAdded(const QString&, const QString&,
+                                      const QString&, uint,
+                                      const QString&, bool)));
+    connect(m_notifier, SIGNAL(PrinterDeleted(const QString&, const QString&,
+                                              const QString&, uint,
+                                              const QString&, bool)),
+            this, SIGNAL(printerDeleted(const QString&, const QString&,
+                                        const QString&, uint,
+                                        const QString&, bool)));
+    connect(m_notifier, SIGNAL(PrinterModified(const QString&, const QString&,
+                                               const QString&, uint,
+                                               const QString&, bool)),
+            this, SIGNAL(printerModified(const QString&, const QString&,
+                                         const QString&, uint,
+                                         const QString&, bool)));
 }
 
 PrinterCupsBackend::~PrinterCupsBackend()
 {
+    cancelSubscription();
 }
 
 QString PrinterCupsBackend::printerAdd(const QString &name,
@@ -316,14 +343,13 @@
         QPrinterInfo info = QPrinterInfo::printerInfo(name);
 
         if (!info.isNull()) {
-            list.append(new Printer(new PrinterCupsBackend(m_cups, info)));
+            list.append(new Printer(new PrinterCupsBackend(m_cups, info, m_notifier)));
         } else {
             qWarning() << "Printer is null so skipping (" << name << ")";
         }
     }
 
     // Cups allows a faux PDF printer.
-    // TODO: Translate.
     list.append(new Printer(new PrinterPdfBackend(__("Create PDF"))));
 
     return list;
@@ -362,3 +388,14 @@
         m_info = QPrinterInfo::printerInfo(m_printerName);
     }
 }
+
+void PrinterCupsBackend::createSubscription()
+{
+    m_cupsSubscriptionId = m_cups->createSubscription();
+}
+
+void PrinterCupsBackend::cancelSubscription()
+{
+    if (m_cupsSubscriptionId > 0)
+        m_cups->cancelSubscription(m_cupsSubscriptionId);
+}
 
=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-02-02 17:22:55 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-02-03 12:26:13 +0000
@@ -19,14 +19,18 @@
 
 #include "backend/backend.h"
 #include "cups/cupsfacade.h"
+#include "cupsdnotifier.h" // Note: this file was generated.
 
 #include <QPrinterInfo>
 
+#define CUPSD_NOTIFIER_DBUS_PATH "/org/cups/cupsd/Notifier"
+
 class PRINTERS_DECL_EXPORT PrinterCupsBackend : public PrinterBackend
 {
 public:
     explicit PrinterCupsBackend(QObject *parent = Q_NULLPTR);
     explicit PrinterCupsBackend(CupsFacade *cups, QPrinterInfo info,
+                                OrgCupsCupsdNotifierInterface* notifier,
                                 QObject *parent = Q_NULLPTR);
     virtual ~PrinterCupsBackend() override;
 
@@ -125,10 +129,14 @@
 
 public Q_SLOTS:
     virtual void refresh() override;
+    void createSubscription();
 
 private:
+    void cancelSubscription();
     CupsFacade *m_cups;
     QPrinterInfo m_info;
+    OrgCupsCupsdNotifierInterface *m_notifier;
+    int m_cupsSubscriptionId = -1;
 };
 
 #endif // USC_PRINTERS_CUPS_BACKEND_H
 
=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-02 16:00:55 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-03 12:26:13 +0000
@@ -433,6 +433,16 @@
     Q_EMIT requestPrinterDriverCancel();
 }
 
+int CupsFacade::createSubscription()
+{
+    return helper.createSubscription();
+}
+
+void CupsFacade::cancelSubscription(const int &subscriptionId)
+{
+    helper.cancelSubscription(subscriptionId);
+}
+
 PrinterDriverLoader::PrinterDriverLoader(
         const QString &deviceId, const QString &language,
         const QString &makeModel, const QString &product,
 
=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-02-02 16:00:55 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-02-03 12:26:13 +0000
@@ -92,6 +92,8 @@
     QList<cups_job_t *> printerGetJobs(const QString &name);
     int printFileToDest(const QString &filepath, const QString &title,
                         const cups_dest_t *dest);
+    int createSubscription();
+    void cancelSubscription(const int &subscriptionId);
 
 public Q_SLOTS:
     void requestPrinterDrivers(
 
=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-01-30 11:37:07 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-02-03 12:26:13 +0000
@@ -735,3 +735,64 @@
     return cupsDoRequest(m_connection, request,
                          resourceChar.toUtf8());
 }
+
+int CupsPkHelper::createSubscription()
+{
+    ipp_t *req;
+    ipp_t *resp;
+    ipp_attribute_t *attr;
+    int subscriptionId = -1;
+
+    req = ippNewRequest(IPP_CREATE_PRINTER_SUBSCRIPTION);
+    ippAddString(req, IPP_TAG_OPERATION, IPP_TAG_URI,
+                 "printer-uri", NULL, "/");
+    ippAddString(req, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+                 "notify-events", NULL, "all");
+    ippAddString(req, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
+                 "notify-recipient-uri", NULL, "dbus://");
+    ippAddInteger(req, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+                  "notify-lease-duration", 0);
+
+    resp = cupsDoRequest(m_connection, req,
+                         getResource(CphResourceRoot).toUtf8());
+    if (!isReplyOk(resp, true)) {
+        return subscriptionId;
+    }
+
+    attr = ippFindAttribute(resp, "notify-subscription-id", IPP_TAG_INTEGER);
+
+    if (!attr) {
+        qWarning() << "ipp-create-printer-subscription response doesn't"
+                       "  contain subscription id.";
+    } else {
+        subscriptionId = ippGetInteger(attr, 0);
+    }
+
+    ippDelete (resp);
+
+    return subscriptionId;
+}
+
+void CupsPkHelper::cancelSubscription(const int &subscriptionId)
+{
+    ipp_t *req;
+    ipp_t *resp;
+
+    if (subscriptionId <= 0) {
+        return;
+    }
+
+    req = ippNewRequest(IPP_CANCEL_SUBSCRIPTION);
+    ippAddString(req, IPP_TAG_OPERATION, IPP_TAG_URI,
+                 "printer-uri", NULL, "/");
+    ippAddInteger(req, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+                  "notify-subscription-id", subscriptionId);
+
+    resp = cupsDoRequest(m_connection, req,
+                         getResource(CphResourceRoot).toUtf8());
+    if (!isReplyOk(resp, true)) {
+        return;
+    }
+
+    ippDelete(resp);
+}
 
=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-01-26 16:14:55 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-02-03 12:26:13 +0000
@@ -73,6 +73,8 @@
         const QStringList &includeSchemes = QStringList(),
         const QStringList &excludeSchemes = QStringList()
     );
+    int createSubscription();
+    void cancelSubscription(const int &subscriptionId);
 
 private:
     enum CphResource
 
=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-02-02 16:00:55 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-02-03 12:26:13 +0000
@@ -24,31 +24,41 @@
 #include <QDebug>
 #include <QQmlEngine>
 
-PrinterModel::PrinterModel(const int updateIntervalMSecs, QObject *parent)
-    : PrinterModel(new PrinterCupsBackend, updateIntervalMSecs, parent)
+PrinterModel::PrinterModel(QObject *parent)
+    : PrinterModel(new PrinterCupsBackend, parent)
 {
 }
 
-PrinterModel::PrinterModel(PrinterBackend *backend,
-                           const int updateIntervalMSecs,
-                           QObject *parent)
+PrinterModel::PrinterModel(PrinterBackend *backend, QObject *parent)
     : QAbstractListModel(parent)
     , m_backend(backend)
 {
     update();
-    startUpdateTimer(updateIntervalMSecs);
+
+    QObject::connect(m_backend, &PrinterBackend::printerAdded,
+                     this, &PrinterModel::printerSignalCatchall);
+    QObject::connect(m_backend, &PrinterBackend::printerModified,
+                     this, &PrinterModel::printerSignalCatchall);
+    QObject::connect(m_backend, &PrinterBackend::printerDeleted,
+                     this, &PrinterModel::printerSignalCatchall);
 }
 
 PrinterModel::~PrinterModel()
 {
 }
 
-void PrinterModel::startUpdateTimer(const int &msecs)
+void PrinterModel::printerSignalCatchall(
+    const QString &text, const QString &printerUri,
+    const QString &printerName, uint printerState,
+    const QString &printerStateReason, bool acceptingJobs)
 {
-    // Start a timer to poll for changes in the printers
-    m_update_timer.setParent(this);
-    connect(&m_update_timer, SIGNAL(timeout()), this, SLOT(update()));
-    m_update_timer.start(msecs);
+    Q_UNUSED(text);
+    Q_UNUSED(printerUri);
+    Q_UNUSED(printerName);
+    Q_UNUSED(printerState);
+    Q_UNUSED(printerStateReason);
+    Q_UNUSED(acceptingJobs);
+    update();
 }
 
 void PrinterModel::update()
 
=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.h'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-02-02 16:00:55 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-02-03 12:26:13 +0000
@@ -35,9 +35,8 @@
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 public:
-    explicit PrinterModel(const int updateIntervalMSecs=5000, QObject *parent = Q_NULLPTR);
-    explicit PrinterModel(PrinterBackend *backend, const int updateIntervalMSecs=5000,
-                          QObject *parent = Q_NULLPTR);
+    explicit PrinterModel(QObject *parent = Q_NULLPTR);
+    explicit PrinterModel(PrinterBackend *backend, QObject *parent = Q_NULLPTR);
     ~PrinterModel();
 
     enum Roles
@@ -80,7 +79,6 @@
 
     Q_INVOKABLE QVariantMap get(const int row) const;
 private:
-    QTimer m_update_timer;
     PrinterBackend *m_backend;
 
     /* FIXME: there's currently no need to share the Printer obj with QML, so
@@ -89,8 +87,10 @@
     QMap<QString, JobModel *> m_job_models;
 
 private Q_SLOTS:
-    void startUpdateTimer(const int &msecs);
     void update();
+    void printerSignalCatchall(const QString &text, const QString &printerUri,
+        const QString &printerName, uint printerState,
+        const QString &printerStateReason, bool acceptingJobs);
 
 Q_SIGNALS:
     void countChanged();
 
=== added file 'plugins/Ubuntu/Settings/Printers/org.cups.cupsd.Notifier.xml'
--- plugins/Ubuntu/Settings/Printers/org.cups.cupsd.Notifier.xml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/org.cups.cupsd.Notifier.xml	2017-02-03 12:26:13 +0000
@@ -0,0 +1,146 @@
+<node>
+
+    <interface name="org.cups.cupsd.Notifier">
+
+        <signal name="ServerStarted">
+            <arg type="s" name="text" />
+        </signal>
+
+        <signal name="ServerRestarted">
+            <arg type="s" name="text" />
+        </signal>
+
+        <signal name="ServerStopped">
+            <arg type="s" name="text" />
+        </signal>
+
+        <signal name="ServerAudit">
+            <arg type="s" name="text" />
+        </signal>
+
+        <signal name="PrinterAdded">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterDeleted">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterModified">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterRestarted">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterStopped">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterShutdown">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterStateChanged">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterFinishingsChanged">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="PrinterMediaChanged">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+        </signal>
+
+        <signal name="JobCreated">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+            <arg type="u" name="job_id" />
+            <arg type="u" name="job_state" />
+            <arg type="s" name="job_state_reasons" />
+            <arg type="s" name="job_name" />
+            <arg type="u" name="job_impressions_completed" />
+        </signal>
+
+        <signal name="JobCompleted">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+            <arg type="u" name="job_id" />
+            <arg type="u" name="job_state" />
+            <arg type="s" name="job_state_reasons" />
+            <arg type="s" name="job_name" />
+            <arg type="u" name="job_impressions_completed" />
+        </signal>
+
+        <signal name="JobState">
+            <arg type="s" name="text" />
+            <arg type="s" name="printer_uri" />
+            <arg type="s" name="printer_name" />
+            <arg type="u" name="printer_state" />
+            <arg type="s" name="printer_state_reasons" />
+            <arg type="b" name="printer_is_accepting_jobs" />
+            <arg type="u" name="job_id" />
+            <arg type="u" name="job_state" />
+            <arg type="s" name="job_state_reasons" />
+            <arg type="s" name="job_name" />
+            <arg type="u" name="job_impressions_completed" />
+        </signal>
+
+    </interface>
+
+</node>
 
=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.cpp'
--- plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-02-01 14:56:58 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-02-03 12:26:13 +0000
@@ -19,17 +19,15 @@
 
 #include <QQmlEngine>
 
-Printers::Printers(int printerUpdateIntervalMSecs, QObject *parent)
-    : Printers(new PrinterCupsBackend, printerUpdateIntervalMSecs, parent)
+Printers::Printers(QObject *parent) : Printers(new PrinterCupsBackend, parent)
 {
 }
 
-Printers::Printers(PrinterBackend *backend, int printerUpdateIntervalMSecs,
-                   QObject *parent)
+Printers::Printers(PrinterBackend *backend, QObject *parent)
     : QObject(parent)
     , m_backend(backend)
     , m_drivers(backend)
-    , m_model(backend, printerUpdateIntervalMSecs)
+    , m_model(backend)
 {
     m_allPrinters.setSourceModel(&m_model);
     m_allPrinters.setSortRole(PrinterModel::Roles::DefaultPrinterRole);
@@ -45,6 +43,10 @@
 
     connect(&m_drivers, SIGNAL(filterComplete()),
             this, SIGNAL(driverFilterChanged()));
+
+    if (m_backend->backendType() == PrinterBackend::BackendType::CupsType) {
+        ((PrinterCupsBackend*) m_backend)->createSubscription();
+    }
 }
 
 Printers::~Printers()
 
=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.h'
--- plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-02-01 14:56:58 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-02-03 12:26:13 +0000
@@ -43,12 +43,10 @@
     Q_PROPERTY(QString lastMessage READ lastMessage CONSTANT)
 
 public:
-    explicit Printers(int printerUpdateIntervalMSecs = 5000, QObject *parent = nullptr);
+    explicit Printers(QObject *parent = Q_NULLPTR);
 
     // Note: Printers takes ownership of backend.
-    explicit Printers(PrinterBackend *backend,
-                      int printerUpdateIntervalMSecs = 5000,
-                      QObject *parent = nullptr);
+    explicit Printers(PrinterBackend *backend, QObject *parent = Q_NULLPTR);
     ~Printers();
 
     QAbstractItemModel* allPrinters();
 
=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-02-02 17:22:55 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-02-03 12:26:13 +0000
@@ -224,10 +224,9 @@
 
     virtual QList<QSharedPointer<PrinterJob>> printerGetJobs(const QString &name) override
     {
-
+        return QList<QSharedPointer<PrinterJob>>();
     }
 
-
     virtual QString printerName() const override
     {
         return m_printerName;
@@ -329,24 +328,40 @@
     }
 
 
-    void mockPrinterAdded(const QString &name)
-    {
-        Q_EMIT printerAdded(name);
-    }
-
-    void mockPrinterModified(const QString &name, const bool ppdChanged)
-    {
-        Q_EMIT printerModified(name, ppdChanged);
-    }
-
-    void mockPrinterDeleted(const QString &name)
-    {
-        Q_EMIT printerDeleted(name);
-    }
-
-    void mockPrinterStateChanged(const QString &name)
-    {
-        Q_EMIT printerStateChanged(name);
+    void mockPrinterAdded(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs
+    )
+    {
+        Q_EMIT printerAdded(text, printerUri, printerName, printerState, printerStateReason, acceptingJobs);
+    }
+
+    void mockPrinterModified(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs
+    )
+    {
+        Q_EMIT printerModified(text, printerUri, printerName, printerState, printerStateReason, acceptingJobs);
+    }
+
+    void mockPrinterDeleted(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs
+    )
+    {
+        Q_EMIT printerDeleted(text, printerUri, printerName, printerState, printerStateReason, acceptingJobs);
     }
 
     void mockDriversLoaded(const QList<PrinterDriver> &drivers)
 
=== modified file 'tests/unittests/Printers/tst_printerfilter.cpp'
--- tests/unittests/Printers/tst_printerfilter.cpp	2017-01-22 14:21:11 +0000
+++ tests/unittests/Printers/tst_printerfilter.cpp	2017-02-03 12:26:13 +0000
@@ -33,7 +33,7 @@
     void testEmptyCount()
     {
         QScopedPointer<PrinterBackend> backend(new MockPrinterBackend);
-        PrinterModel model(backend.data(), 100);
+        PrinterModel model(backend.data());
 
         PrinterFilter filter;
         filter.setSourceModel(&model);
@@ -42,7 +42,7 @@
     void testNonEmptyCount()
     {
         QScopedPointer<PrinterBackend> backend(new MockPrinterBackend);
-        PrinterModel model(backend.data(), 100);
+        PrinterModel model(backend.data());
 
         PrinterBackend* printerABackend = new MockPrinterBackend("a-printer");
         PrinterBackend* printerBBackend = new MockPrinterBackend("b-printer");
@@ -53,13 +53,14 @@
 
         PrinterFilter filter;
         filter.setSourceModel(&model);
+        ((MockPrinterBackend*) backend.data())->mockPrinterAdded("Test added printer", "", printerA.name(), 0, "", true);
 
-        QTRY_COMPARE_WITH_TIMEOUT(filter.count(), 2, 101);
+        QCOMPARE(filter.count(), 2);
     }
     void testCountChanged()
     {
         QScopedPointer<PrinterBackend> backend(new MockPrinterBackend);
-        PrinterModel model(backend.data(), 100);
+        PrinterModel model(backend.data());
 
         PrinterBackend* printerABackend = new MockPrinterBackend("a-printer");
         PrinterBackend* printerBBackend = new MockPrinterBackend("b-printer");
@@ -73,8 +74,9 @@
 
         QSignalSpy modelCountSpy(&model, SIGNAL(countChanged()));
         QSignalSpy filterCountSpy(&filter, SIGNAL(countChanged()));
-        QTRY_COMPARE_WITH_TIMEOUT(modelCountSpy.count(), 1, 101);
-        QTRY_COMPARE_WITH_TIMEOUT(filterCountSpy.count(), 1, 101);
+        ((MockPrinterBackend*) backend.data())->mockPrinterAdded("Test added printer", "", printerA.name(), 0, "", true);
+        QCOMPARE(modelCountSpy.count(), 1);
+        QCOMPARE(filterCountSpy.count(), 1);
     }
 };
 
 
=== modified file 'tests/unittests/Printers/tst_printermodel.cpp'
--- tests/unittests/Printers/tst_printermodel.cpp	2017-01-22 14:21:11 +0000
+++ tests/unittests/Printers/tst_printermodel.cpp	2017-02-03 12:26:13 +0000
@@ -36,7 +36,7 @@
     void init()
     {
         m_backend = new MockPrinterBackend;
-        m_model = new PrinterModel(m_backend, 100);
+        m_model = new PrinterModel(m_backend);
     }
     void cleanup()
     {
@@ -80,9 +80,10 @@
 
         PrinterBackend* printerABackend = new MockPrinterBackend("a-printer");
         Printer* printerA = new Printer(printerABackend);
-        ((MockPrinterBackend*) m_backend)->m_availablePrinters << printerA;
+        getBackend()->m_availablePrinters << printerA;
+        getBackend()->mockPrinterAdded("Test added printer", "", printerA->name(), 0, "", true);
 
-        QTRY_COMPARE_WITH_TIMEOUT(m_model->count(), 1, 500);
+        QCOMPARE(m_model->count(), 1);
         QCOMPARE(countSpy.count(), 1);
         QCOMPARE(insertSpy.count(), 1);
 
@@ -99,8 +100,10 @@
         PrinterBackend* printerBBackend = new MockPrinterBackend("b-printer");
         Printer* printerB = new Printer(printerBBackend);
         ((MockPrinterBackend*) m_backend)->m_availablePrinters << printerA << printerB;
+        getBackend()->mockPrinterAdded("Test added printer", "", printerA->name(), 0, "", true);
+        getBackend()->mockPrinterAdded("Test added printer", "", printerB->name(), 0, "", true);
 
-        QTRY_COMPARE_WITH_TIMEOUT(m_model->count(), 2, 500);
+        QCOMPARE(m_model->count(), 2);
 
         // Setup spy and move a printer
         int from = 1;
@@ -109,7 +112,10 @@
 
         // Check signals were fired
         QSignalSpy moveSpy(m_model, SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
-        QTRY_COMPARE_WITH_TIMEOUT(moveSpy.count(), 1, 500);
+
+        getBackend()->mockPrinterModified("Test e.g. renamed printer", "", printerA->name(), 0, "", true);
+
+        QCOMPARE(moveSpy.count(), 1);
         QCOMPARE(m_model->count(), 2);
 
         // Check item was moved from -> to
@@ -127,14 +133,18 @@
         Printer* printerB = new Printer(printerBBackend);
         ((MockPrinterBackend*) m_backend)->m_availablePrinters << printerA << printerB;
 
-        QTRY_COMPARE_WITH_TIMEOUT(m_model->count(), 2, 500);
+        getBackend()->mockPrinterAdded("Test added printer", "", printerA->name(), 0, "", true);
+        getBackend()->mockPrinterAdded("Test added printer", "", printerB->name(), 0, "", true);
+
+        QCOMPARE(m_model->count(), 2);
 
         // Setup spy and remove a printer
         QSignalSpy countSpy(m_model, SIGNAL(countChanged()));
         QSignalSpy removeSpy(m_model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
         ((MockPrinterBackend*) m_backend)->m_availablePrinters.removeLast();
+        getBackend()->mockPrinterDeleted("Test deleted printer", "", printerB->name(), 0, "", false);
 
-        QTRY_COMPARE_WITH_TIMEOUT(m_model->count(), 1, 500);
+        QCOMPARE(m_model->count(), 1);
         QCOMPARE(countSpy.count(), 1);
         QCOMPARE(removeSpy.count(), 1);
 
@@ -156,17 +166,20 @@
         Printer* printerD = new Printer(printerDBackend);
         ((MockPrinterBackend*) m_backend)->m_availablePrinters << printerA << printerB << printerC << printerD;
 
-        QTRY_COMPARE_WITH_TIMEOUT(m_model->count(), 4, 500);
+        getBackend()->mockPrinterAdded("Test added printer", "", printerA->name(), 0, "", true);
+
+        QCOMPARE(m_model->count(), 4);
 
         // Setup spy and remove middle two printers
         QSignalSpy countSpy(m_model, SIGNAL(countChanged()));
         QSignalSpy removeSpy(m_model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+
         ((MockPrinterBackend*) m_backend)->m_availablePrinters.removeAt(2);
         ((MockPrinterBackend*) m_backend)->m_availablePrinters.removeAt(1);
 
-        // Wait until one count signal has been fired
-        // (to ensure this is only one iteration of update)
-        QTRY_COMPARE_WITH_TIMEOUT(countSpy.count(), 1, 500);
+        getBackend()->mockPrinterDeleted("Test deleted printer", "", printerB->name(), 0, "", false);
+
+        QCOMPARE(countSpy.count(), 1);
         QCOMPARE(m_model->count(), 2);
         QCOMPARE(removeSpy.count(), 2);
 
@@ -181,6 +194,10 @@
         QCOMPARE(args.at(2).toInt(), 1);
     }
 private:
+    MockPrinterBackend* getBackend()
+    {
+        return (MockPrinterBackend*) m_backend;
+    }
     PrinterBackend *m_backend;
     PrinterModel *m_model;
 };
 
=== modified file 'tests/unittests/Printers/tst_printers.cpp'
--- tests/unittests/Printers/tst_printers.cpp	2017-01-27 13:52:47 +0000
+++ tests/unittests/Printers/tst_printers.cpp	2017-02-03 12:26:13 +0000
@@ -88,10 +88,10 @@
         PrinterBackend* backend = new MockPrinterBackend;
         ((MockPrinterBackend*) backend)->m_availablePrinters = in;
 
-        Printers printers(backend, 100);
+        Printers printers(backend);
         auto all = printers.allPrinters();
 
-        QTRY_COMPARE_WITH_TIMEOUT(all->rowCount(), out.size(), 101);
+        QCOMPARE(all->rowCount(), out.size());
         for (int i = 0; i < all->rowCount(); i++) {
             QCOMPARE(
                  all->data(all->index(i, 0)).toString(),