a3a6e2d · unity8 · git.iko.soy

git.iko.soy/unity8

fixes for the backend

a3a6e2dLukáš Tinkl10 years ago

plugins/Ubuntu/SystemImage/SystemImage.cpp+19−6

@@ -33,15 +33,19 @@ SystemImage::SystemImage(QObject *parent)

33 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateAvailableStatus"),

34 this, SLOT(onUpdateAvailableStatus(bool,bool,QString,int,QString,QString)));

35 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateDownloaded"),

36− this, SLOT(onUpdateDownloaded(bool)));

36+ this, SLOT(onUpdateDownloaded()));

37 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateFailed"),

38 this, SLOT(onUpdateFailed(int,QString)));

39 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Applied"),

40 this, SLOT(onUpdateApplied(bool)));

41+

42+ QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateProgress"),

43+ this, SLOT(onUpdateProgress(int,double)));

41}

44}

43void SystemImage::checkForUpdate()

46void SystemImage::checkForUpdate()

44{

47{

48+ qDebug() << "!!! Checking for update";

45 const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

49 const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

46 QStringLiteral("CheckForUpdate"));

50 QStringLiteral("CheckForUpdate"));

47 QDBusConnection::systemBus().asyncCall(msg);

51 QDBusConnection::systemBus().asyncCall(msg);

@@ -49,6 +53,7 @@ void SystemImage::checkForUpdate()

50void SystemImage::applyUpdate()

54void SystemImage::applyUpdate()

51{

55{

56+ qDebug() << "!!! Applying update";

52 const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

57 const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,

53 QStringLiteral("ApplyUpdate"));

58 QStringLiteral("ApplyUpdate"));

54 QDBusConnection::systemBus().asyncCall(msg);

59 QDBusConnection::systemBus().asyncCall(msg);

@@ -77,14 +82,17 @@ void SystemImage::onUpdateAvailableStatus(bool is_available, bool downloading, c

77 m_lastUpdateDate = last_update_date;

82 m_lastUpdateDate = last_update_date;

78 m_errorReason = error_reason;

83 m_errorReason = error_reason;

79 Q_EMIT updateAvailableStatus();

84 Q_EMIT updateAvailableStatus();

85+

86+ qDebug() << "!!! Downloading:" << downloading << ", version:" << available_version << ", last update:" << last_update_date <<

87+ ", size:" << m_updateSize;

80}

88}

82−void SystemImage::onUpdateDownloaded(bool downloaded)

90+void SystemImage::onUpdateDownloaded()

83{

91{

84− if (downloaded != m_downloaded) {

92+ qDebug() << "!!! Update downloaded";

93+

85− m_downloaded = downloaded;

94+ m_downloaded = true;

86− Q_EMIT updateDownloadedChanged();

95+ Q_EMIT updateDownloadedChanged();

87− }

88}

96}

90void SystemImage::onUpdateFailed(int consecutive_failure_count, const QString &last_reason)

98void SystemImage::onUpdateFailed(int consecutive_failure_count, const QString &last_reason)

@@ -102,6 +110,11 @@ void SystemImage::onUpdateApplied(bool applied)

102 }

110 }

103}

111}

104

112

113+void SystemImage::onUpdateProgress(int percentage, double eta)

114+{

115+ qDebug() << "!!! Download progress:" << percentage << "%, ETA seconds:" << eta;

116+}

117+

105void SystemImage::resetUpdateStatus()

118void SystemImage::resetUpdateStatus()

106{

119{

107 m_updateAvailable = false;

120 m_updateAvailable = false;

plugins/Ubuntu/SystemImage/SystemImage.h+2−2

@@ -51,9 +51,10 @@ public Q_SLOTS:

51private Q_SLOTS:

52 void onUpdateAvailableStatus(bool is_available, bool updateDownloading, const QString &available_version,

53 int update_size, const QString &last_update_date, const QString &error_reason);

54− void onUpdateDownloaded(bool downloaded);

54+ void onUpdateDownloaded();

55 void onUpdateFailed(int consecutive_failure_count, const QString & last_reason);

56 void onUpdateApplied(bool applied);

57+ void onUpdateProgress(int percentage, double eta);

58Q_SIGNALS:

59Q_SIGNALS:

59 void updateAvailableStatus();

60 void updateAvailableStatus();

@@ -71,7 +72,6 @@ private:

71 QString m_updateSize;

72 QString m_updateSize;

72 QString m_lastUpdateDate;

73 QString m_lastUpdateDate;

73 QString m_errorReason;

74 QString m_errorReason;

74− bool m_updateDownloaded;

75};

77#endif // SYSTEMIMAGE_H