Merge lp:~mandel/ubuntu-system-settings/download-checksum into lp:ubuntu-system-settings/rtm-14.09

[Manuel de la Peña]

Add checksum support for the click downloads.

Backport the checksum support for the download manager that is present in trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:989
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/60/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/61/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/39
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17933

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

I have proposed a branch for the backport already, can you look at https://code.launchpad.net/~ken-vandine/ubuntu-system-settings/rtm-check-hash/+merge/247489

I've been holding off trying to land that until we get the error case fixed, any progress on that?

review: Disapprove

Unmerged revisions

989. By Manuel de la Peña on 2015-02-10

Backport the checksum support that was added in vivid.

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-01-30 18:36:21 +0000
+++ plugins/system-update/PageComponent.qml	2015-02-10 16:30:49 +0000
@@ -47,6 +47,11 @@
     property var notificationAction;
     property string errorDialogText: ""
 
+    onUpdatesAvailableChanged: {
+        if (updatesAvailable < 1 && root.state != "SEARCHING")
+            root.state = "NOUPDATES";
+    }
+
     QDBusActionGroup {
         id: indicatorPower
         busType: 1
@@ -508,11 +513,11 @@
                                 fontSize: "small"
                                 text: {
                                     if (!labelUpdateStatus.visible)
-                                        return convert_bytes_to_size(modelData.binaryFilesize);
+                                        return Utilities.formatSize(modelData.binaryFilesize);
 
                                     return i18n.tr("%1 of %2").arg(
-                                        convert_bytes_to_size(modelData.binaryFilesize * (progress.value * 0.01))).arg(
-                                        convert_bytes_to_size(modelData.binaryFilesize)
+                                        Utilities.formatSize(modelData.binaryFilesize * (progress.value * 0.01))).arg(
+                                        Utilities.formatSize(modelData.binaryFilesize)
                                     );
                                 }
                             }
@@ -538,6 +543,7 @@
                                 packageName: modelData.packageName
                                 clickToken: modelData.clickToken
                                 download: modelData.downloadUrl
+                                downloadSha512: modelData.downloadSha512
 
                                 onFinished: {
                                     progress.visible = false;
@@ -613,12 +619,12 @@
                                 elide: Text.ElideRight
                                 fontSize: "small"
                             }
-                            
+
                             Label {
                                 id: labelSize
                                 objectName: "labelSize"
                                 anchors.right: parent.right
-                                text: convert_bytes_to_size(modelData.binaryFilesize)
+                                text: Utilities.formatSize(modelData.binaryFilesize)
                                 fontSize: "small"
                                 visible: !labelUpdateStatus.visible && !installing && !installed
                             }
@@ -746,27 +752,4 @@
             onClicked: pageStack.push(Qt.resolvedUrl("Configuration.qml"))
         }
     }
-
-    function convert_bytes_to_size(bytes) {
-        var SIZE_IN_GIB = 1024.0 * 1024.0 * 1024.0;
-        var SIZE_IN_MIB = 1024.0 * 1024.0;
-        var SIZE_IN_KIB = 1024.0;
-
-        var result = "";
-        var size = 0;
-        if (bytes < SIZE_IN_KIB) {
-            result = bytes + i18n.tr(" bytes");
-        } else if (bytes < SIZE_IN_MIB) {
-            size = (bytes / SIZE_IN_KIB).toFixed(1);
-            result = size + i18n.tr(" KiB");
-        } else if (bytes < SIZE_IN_GIB) {
-            size = (bytes / SIZE_IN_MIB).toFixed(1);
-            result = size + i18n.tr(" MiB");
-        } else {
-            size = (bytes / SIZE_IN_GIB).toFixed(1);
-            result = size + i18n.tr(" GiB");
-        }
-
-        return result;
-    }
 }

=== modified file 'plugins/system-update/download_tracker.cpp'
--- plugins/system-update/download_tracker.cpp	2015-01-15 11:08:33 +0000
+++ plugins/system-update/download_tracker.cpp	2015-02-10 16:30:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 - Canonical Ltd.
+ * Copyright (C) 2014-2015 - Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -18,19 +18,19 @@
  * Authored by: Diego Sarmentero <[e-mail]>
  */
 
-#include <QDebug>
-#include <QProcessEnvironment>
-
 #include <ubuntu/download_manager/download_struct.h>
 #include <ubuntu/download_manager/error.h>
+#include <QProcessEnvironment>
 
 #include "download_tracker.h"
 #include "network/network.h"
 
+
 namespace {
     const QString DOWNLOAD_COMMAND = "post-download-command";
     const QString APP_ID = "app_id";
     const QString PKCON_COMMAND = "pkcon";
+    const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
 }
 
 namespace UpdatePlugin {
@@ -88,7 +88,7 @@
         vmap[APP_ID] = m_packageName;
         StringMap map;
         map[X_CLICK_TOKEN] = m_clickToken;
-        DownloadStruct dstruct = DownloadStruct(m_downloadUrl, vmap, map);
+        DownloadStruct dstruct(m_downloadUrl, m_download_sha512, DOWNLOAD_MANAGER_SHA512, vmap, map);
         m_manager->createDownload(dstruct);
     }
 }

=== modified file 'plugins/system-update/download_tracker.h'
--- plugins/system-update/download_tracker.h	2015-01-14 11:23:42 +0000
+++ plugins/system-update/download_tracker.h	2015-02-10 16:30:49 +0000
@@ -42,6 +42,7 @@
     Q_PROPERTY(QString clickToken READ clickToken WRITE setClickToken)
     Q_PROPERTY(QString download READ download WRITE setDownload)
     Q_PROPERTY(QString packageName READ packageName WRITE setPackageName)
+    Q_PROPERTY(QString downloadSha512 READ downloadSha512 WRITE setDownloadSha512)
     Q_PROPERTY(int progress READ progress NOTIFY progressChanged)
 
 public:
@@ -54,10 +55,12 @@
     QString download() { return m_downloadUrl; }
     QString clickToken() { return m_clickToken; }
     QString packageName() { return m_packageName; }
+    QString downloadSha512() { return m_download_sha512; }
+    int progress() { return m_progress; }
     void setDownload(const QString& url);
     void setClickToken(const QString& token);
     void setPackageName(const QString& package);
-    int progress() { return m_progress; }
+    void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; }
 
 public Q_SLOTS:
     void bindDownload(Download* download);
@@ -84,6 +87,7 @@
     Download* m_download = nullptr;
     Manager* m_manager = nullptr;
     int m_progress = 0;
+    QString m_download_sha512 = QString::null;
 
     void startService();
     QString getPkconCommand();

=== modified file 'plugins/system-update/network/network.cpp'
--- plugins/system-update/network/network.cpp	2014-09-18 13:50:15 +0000
+++ plugins/system-update/network/network.cpp	2015-02-10 16:30:49 +0000
@@ -107,6 +107,7 @@
                     QString version = object.value("version").toString();
                     QString icon_url = object.value("icon_url").toString();
                     QString url = object.value("download_url").toString();
+                    QString download_sha512 = object.value("download_sha512").toString();
                     int size = object.value("binary_filesize").toVariant().toInt();
                     if (m_apps.contains(name)) {
                         m_apps[name]->setRemoteVersion(version);
@@ -114,6 +115,7 @@
                             m_apps[name]->setIconUrl(icon_url);
                             m_apps[name]->setDownloadUrl(url);
                             m_apps[name]->setBinaryFilesize(size);
+                            m_apps[name]->setDownloadSha512(download_sha512);
                             updates = true;
                         }
                     }

=== modified file 'plugins/system-update/update.cpp'
--- plugins/system-update/update.cpp	2015-01-14 11:23:42 +0000
+++ plugins/system-update/update.cpp	2015-02-10 16:30:49 +0000
@@ -32,6 +32,7 @@
     QObject(parent),
     m_binary_filesize(0),
     m_click_url(""),
+    m_clickToken(""),
     m_downloadUrl(""),
     m_download_progress(0),
     m_error(""),

=== modified file 'plugins/system-update/update.h'
--- plugins/system-update/update.h	2014-09-12 19:12:36 +0000
+++ plugins/system-update/update.h	2015-02-10 16:30:49 +0000
@@ -57,6 +57,7 @@
                NOTIFY downloadProgressChanged)
     Q_PROPERTY(QString downloadUrl READ downloadUrl NOTIFY downloadUrlChanged)
     Q_PROPERTY(QString clickToken READ clickToken NOTIFY clickTokenChanged)
+    Q_PROPERTY(QString downloadSha512 READ downloadSha512 NOTIFY downloadSha512Changed)
 
 Q_SIGNALS:
     void systemUpdateChanged();
@@ -75,6 +76,7 @@
     void downloadUrlChanged();
     void clickTokenChanged();
     void packageNameChanged();
+    void downloadSha512Changed();
 
 public:
     explicit Update(QObject *parent = 0);
@@ -97,6 +99,7 @@
     const QString& getClickUrl() const { return m_click_url; }
     QString downloadUrl() { return m_downloadUrl; }
     QString clickToken() { return m_clickToken; }
+    QString downloadSha512() { return m_download_sha512; }
 
     void setSystemUpdate(bool isSystem);
     void initializeApplication(QString packagename, QString title,
@@ -115,6 +118,7 @@
     void setClickUrl(const QString &url) { m_click_url = url; }
     void setDownloadUrl(const QString &url);
     void setClickToken(const QString &token) { m_clickToken = token; Q_EMIT clickTokenChanged(); }
+    void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; Q_EMIT downloadSha512Changed(); }
 
 private:
     int m_binary_filesize;
@@ -134,6 +138,7 @@
     bool m_update;
     bool m_update_ready;
     bool m_update_state;
+    QString m_download_sha512;
 
     bool getIgnoreUpdates();
 };