on xenial help sign in
fixes for the backend
commita3a6e2da67693f46f9e565ec8033457fd61311c5 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 15 Jul 2016, 16:11 (10 years ago) parent3a65dce
2 files changed+21−8
plugins/Ubuntu/SystemImage/SystemImage.cpp+19−6 plugins/Ubuntu/SystemImage/SystemImage.h+2−2
plugins/Ubuntu/SystemImage/SystemImage.cpp+19−6
@@ -33,15 +33,19 @@ SystemImage::SystemImage(QObject *parent)
3333 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateAvailableStatus"),
3434 this, SLOT(onUpdateAvailableStatus(bool,bool,QString,int,QString,QString)));
3535 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateDownloaded"),
36− this, SLOT(onUpdateDownloaded(bool)));
36+ this, SLOT(onUpdateDownloaded()));
3737 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateFailed"),
3838 this, SLOT(onUpdateFailed(int,QString)));
3939 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Applied"),
4040 this, SLOT(onUpdateApplied(bool)));
41+
42+ QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateProgress"),
43+ this, SLOT(onUpdateProgress(int,double)));
4144}
4245
4346void SystemImage::checkForUpdate()
4447{
48+ qDebug() << "!!! Checking for update";
4549 const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,
4650 QStringLiteral("CheckForUpdate"));
4751 QDBusConnection::systemBus().asyncCall(msg);
@@ -49,6 +53,7 @@ void SystemImage::checkForUpdate()
4953
5054void SystemImage::applyUpdate()
5155{
56+ qDebug() << "!!! Applying update";
5257 const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,
5358 QStringLiteral("ApplyUpdate"));
5459 QDBusConnection::systemBus().asyncCall(msg);
@@ -77,14 +82,17 @@ void SystemImage::onUpdateAvailableStatus(bool is_available, bool downloading, c
7782 m_lastUpdateDate = last_update_date;
7883 m_errorReason = error_reason;
7984 Q_EMIT updateAvailableStatus();
85+
86+ qDebug() << "!!! Downloading:" << downloading << ", version:" << available_version << ", last update:" << last_update_date <<
87+ ", size:" << m_updateSize;
8088}
8189
82−void SystemImage::onUpdateDownloaded(bool downloaded)
90+void SystemImage::onUpdateDownloaded()
8391{
84− if (downloaded != m_downloaded) {
85− m_downloaded = downloaded;
86− Q_EMIT updateDownloadedChanged();
87− }
92+ qDebug() << "!!! Update downloaded";
93+
94+ m_downloaded = true;
95+ Q_EMIT updateDownloadedChanged();
8896}
8997
9098void SystemImage::onUpdateFailed(int consecutive_failure_count, const QString &last_reason)
@@ -102,6 +110,11 @@ void SystemImage::onUpdateApplied(bool applied)
102110 }
103111}
104112
113+void SystemImage::onUpdateProgress(int percentage, double eta)
114+{
115+ qDebug() << "!!! Download progress:" << percentage << "%, ETA seconds:" << eta;
116+}
117+
105118void SystemImage::resetUpdateStatus()
106119{
107120 m_updateAvailable = false;
plugins/Ubuntu/SystemImage/SystemImage.h+2−2
@@ -51,9 +51,10 @@ public Q_SLOTS:
5151private Q_SLOTS:
5252 void onUpdateAvailableStatus(bool is_available, bool updateDownloading, const QString &available_version,
5353 int update_size, const QString &last_update_date, const QString &error_reason);
54− void onUpdateDownloaded(bool downloaded);
54+ void onUpdateDownloaded();
5555 void onUpdateFailed(int consecutive_failure_count, const QString & last_reason);
5656 void onUpdateApplied(bool applied);
57+ void onUpdateProgress(int percentage, double eta);
5758
5859Q_SIGNALS:
5960 void updateAvailableStatus();
@@ -71,7 +72,6 @@ private:
7172 QString m_updateSize;
7273 QString m_lastUpdateDate;
7374 QString m_errorReason;
74− bool m_updateDownloaded;
7575};
7676
7777#endif // SYSTEMIMAGE_H