Merge lp:~jonas-drange/ubuntu-system-settings/lp1509022 into lp:ubuntu-system-settings

[Jonas G. Drange]

add servicewatcher to system image binding

add servicewatcher to system image binding

[lp:~jonas-drange/ubuntu-system-settings/lp1509022]

1637. By Jonas G. Drange on 2016-04-25

-1 to indicate uninitialized target number

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1637
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2710/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6874/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/893
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5202/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6885
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2710/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Nicely simplified, I like it!

review: Approve

=== modified file 'plugins/system-update/system_update.cpp'
--- plugins/system-update/system_update.cpp	2016-03-02 17:26:10 +0000
+++ plugins/system-update/system_update.cpp	2016-04-25 11:52:41 +0000
@@ -39,11 +39,15 @@
 SystemUpdate::SystemUpdate(QObject *parent) :
     QObject(parent),
     m_currentBuildNumber(-1),
+    m_targetBuildNumber(-1),
     m_detailedVersion(),
     m_lastUpdateDate(),
     m_downloadMode(-1),
-    m_systemBusConnection (QDBusConnection::systemBus()),
-    m_SystemServiceIface ("com.canonical.SystemImage",
+    m_systemBusConnection(QDBusConnection::systemBus()),
+    m_serviceWatcher("com.canonical.SystemImage",
+                     m_systemBusConnection,
+                     QDBusServiceWatcher::WatchForOwnerChange),
+    m_SystemServiceIface("com.canonical.SystemImage",
                          "/Service",
                          "com.canonical.SystemImage",
                          m_systemBusConnection)
@@ -52,6 +56,33 @@
 
     qDBusRegisterMetaType<QMap<QString, QString> >();
 
+    connect(&m_serviceWatcher,
+             SIGNAL(serviceOwnerChanged(QString, QString, QString)),
+             this,
+             SLOT(slotNameOwnerChanged(QString, QString, QString)));
+
+    setUpInterface();
+}
+
+SystemUpdate::~SystemUpdate() {
+}
+
+
+void SystemUpdate::slotNameOwnerChanged(const QString &name,
+                                        const QString &oldOwner,
+                                        const QString &newOwner) {
+    Q_UNUSED (oldOwner);
+    Q_UNUSED (newOwner);
+
+    if (name != "com.canonical.SystemImage")
+        return;
+    qWarning() << "got si slot name owner change, setting up...";
+    if (m_SystemServiceIface.isValid())
+        setUpInterface();
+}
+
+void SystemUpdate::setUpInterface() {
+    qWarning() << "setting up the si interface...";
     connect(&m_SystemServiceIface, SIGNAL(UpdateAvailableStatus(bool, bool, QString, int, QString, QString)),
                this, SLOT(ProcessAvailableStatus(bool, bool, QString, int, QString, QString)));
     // signals to forward directly to QML
@@ -71,9 +102,8 @@
                 this, SLOT(ProcessSettingChanged(QString, QString)));
     connect(&m_SystemServiceIface, SIGNAL(Rebooting(bool)),
                 this, SIGNAL(rebooting(bool)));
-}
 
-SystemUpdate::~SystemUpdate() {
+    initializeProperties();
 }
 
 void SystemUpdate::checkForUpdate() {
@@ -106,7 +136,8 @@
         Q_EMIT updateProcessFailed(_("Can't pause current request (can't contact service)"));
 }
 
-void SystemUpdate::setCurrentDetailedVersion() {
+
+void SystemUpdate::initializeProperties() {
     QDBusPendingReply<QMap<QString, QString> > reply = m_SystemServiceIface.call("Information");
     reply.waitForFinished();
     if (reply.isValid()) {
@@ -114,6 +145,7 @@
         m_currentBuildNumber = result["current_build_number"].toInt();
         m_deviceName = result["device_name"];
         m_lastUpdateDate = QDateTime::fromString(result["last_update_date"], Qt::ISODate);
+        m_targetBuildNumber = result["target_build_number"].toInt();
 
         QMap<QString, QVariant> details;
         QStringList keyvalue = result["version_detail"].split(",", QString::SkipEmptyParts);
@@ -130,68 +162,37 @@
 }
 
 bool SystemUpdate::checkTarget() {
-    int target = 0;
-    int current = 0;
-    QDBusPendingReply<QMap<QString, QString> > reply = m_SystemServiceIface.call("Information");
-    reply.waitForFinished();
-    if (reply.isValid()) {
-        QMap<QString, QString> result = reply.argumentAt<0>();
-        target = result.value("target_build_number", "0").toInt();
-        current = result.value("current_build_number", "0").toInt();
-    } else {
-        qWarning() << "Error when retrieving version information: " << reply.error();
-    }
-
-    return target > current;
+    return m_targetBuildNumber > m_currentBuildNumber;
 }
 
 QString SystemUpdate::deviceName() {
-    if (m_deviceName.isNull())
-        setCurrentDetailedVersion();
-
     return m_deviceName;
 }
 
 QDateTime SystemUpdate::lastUpdateDate() {
-    if (!m_lastUpdateDate.isValid())
-        setCurrentDetailedVersion();
-
     return m_lastUpdateDate;
 }
 
 int SystemUpdate::currentBuildNumber() {
-    if (m_currentBuildNumber == -1)
-        setCurrentDetailedVersion();
-
     return m_currentBuildNumber;
 }
 
 QString SystemUpdate::currentUbuntuBuildNumber() {
-    if (!m_detailedVersion.contains("ubuntu"))
-        setCurrentDetailedVersion();
     QString val = m_detailedVersion.value("ubuntu").toString();
     return val.isEmpty() ? _("Unavailable") : val;
 }
 
 QString SystemUpdate::currentDeviceBuildNumber() {
-    if (!m_detailedVersion.contains("device"))
-        setCurrentDetailedVersion();
     QString val = m_detailedVersion.value("device").toString();
     return val.isEmpty() ? _("Unavailable") : val;
 }
 
 QString SystemUpdate::currentCustomBuildNumber() {
-    if (!m_detailedVersion.contains("custom"))
-        setCurrentDetailedVersion();
     QString val = m_detailedVersion.value("custom").toString();
     return val.isEmpty() ? _("Unavailable") : val;
 }
 
 QMap<QString, QVariant> SystemUpdate::detailedVersionDetails() {
-     if (m_detailedVersion.empty()) {
-        setCurrentDetailedVersion();
-     }
-
     return m_detailedVersion;
 }
 
@@ -242,6 +243,7 @@
                                           QString lastUpdateDate,
                                           QString errorReason)
 {
+    qWarning()<<"ProcessAvailableStatus";
     update = new Update(this);
     QString packageName(UBUNTU_PACKAGE_NAME);
     update->initializeApplication(packageName, "Ubuntu",
 
=== modified file 'plugins/system-update/system_update.h'
--- plugins/system-update/system_update.h	2016-03-02 15:23:21 +0000
+++ plugins/system-update/system_update.h	2016-04-25 11:52:41 +0000
@@ -24,6 +24,7 @@
 
 #include <QtDBus>
 #include <QDBusInterface>
+#include <QDBusServiceWatcher>
 #include <QObject>
 #include <QProcess>
 #include <QUrl>
@@ -79,20 +80,25 @@
 
 private Q_SLOTS:
     void updateDownloadProgress(int percentage, double eta);
+    void slotNameOwnerChanged(const QString&, const QString&, const QString&);
 
 private:
+    // Synchronously initialize properties from the Information call.
+    void initializeProperties();
+    // Sets up connections on the DBus interface.
+    void setUpInterface();
+
     int m_currentBuildNumber;
+    int m_targetBuildNumber;
     QMap<QString, QVariant> m_detailedVersion;
     QDateTime m_lastUpdateDate;
     int m_downloadMode;
     QString m_deviceName;
 
     QDBusConnection m_systemBusConnection;
-    QString m_objectPath;
+    QDBusServiceWatcher m_serviceWatcher;
     QDBusInterface m_SystemServiceIface;
     Update *update;
-
-    void setCurrentDetailedVersion();
 };
 
 }