1
=== modified file 'plugins/system-update/PageComponent.qml'
2
--- plugins/system-update/PageComponent.qml	2014-10-08 15:51:44 +0000
3
+++ plugins/system-update/PageComponent.qml	2014-10-17 11:45:42 +0000
4
@@ -420,17 +420,18 @@
5
420
420
6
421
                    function resume () {
421
                    function resume () {
7
422
                        console.warn("RESUME: " + modelData.packageName);
422
                        console.warn("RESUME: " + modelData.packageName);
12
423
                        if (modelData.systemUpdate)
423
                        UpdateManager.startDownload(modelData.packageName);
9
424
                            return UpdateManager.startDownload(modelData.packageName);
10
425
                        modelData.updateState = true;
11
426
                        tracker.resume();
13
427
                    }
424
                    }
14
428
425
15
429
                    function start () {
426
                    function start () {
16
430
                        console.warn("START: " + modelData.packageName);
427
                        console.warn("START: " + modelData.packageName);
17
428
                        if (!modelData.selected || modelData.systemUpdate) {
18
429
                            UpdateManager.startDownload(modelData.packageName);
19
430
                        } else {
20
431
                            tracker.resume();
21
432
                        }
22
431
                        modelData.selected = true;
433
                        modelData.selected = true;
23
432
                        modelData.updateState = true;
434
                        modelData.updateState = true;
24
433
                        UpdateManager.startDownload(modelData.packageName);
25
434
                    }
435
                    }
26
435
                    Column {
436
                    Column {
27
436
                        id: textArea
437
                        id: textArea
28
@@ -561,6 +562,7 @@
29
561
                                packageName: modelData.packageName
562
                                packageName: modelData.packageName
30
562
                                clickToken: modelData.clickToken
563
                                clickToken: modelData.clickToken
31
563
                                download: modelData.downloadUrl
564
                                download: modelData.downloadUrl
32
565
                                downloadSha512: modelData.downloadSha512
33
564
566
34
565
                                onFinished: {
567
                                onFinished: {
35
566
                                    progress.visible = false;
568
                                    progress.visible = false;
36
567
569
37
=== modified file 'plugins/system-update/download_tracker.cpp'
38
--- plugins/system-update/download_tracker.cpp	2014-09-30 02:05:36 +0000
39
+++ plugins/system-update/download_tracker.cpp	2014-10-17 11:45:42 +0000
40
@@ -27,6 +27,7 @@
41
27
#define DOWNLOAD_COMMAND "post-download-command"
27
#define DOWNLOAD_COMMAND "post-download-command"
42
28
#define APP_ID "app_id"
28
#define APP_ID "app_id"
43
29
#define PKCON_COMMAND "pkcon"
29
#define PKCON_COMMAND "pkcon"
44
30
#define DOWNLOAD_MANAGER_SHA512 "sha512"
45
30
31
46
31
namespace UpdatePlugin {
32
namespace UpdatePlugin {
47
32
33
48
@@ -81,7 +82,7 @@
49
81
        vmap[APP_ID] = m_packageName;
82
        vmap[APP_ID] = m_packageName;
50
82
        StringMap map;
83
        StringMap map;
51
83
        map[X_CLICK_TOKEN] = m_clickToken;
84
        map[X_CLICK_TOKEN] = m_clickToken;
53
84
        DownloadStruct dstruct = DownloadStruct(m_downloadUrl, vmap, map);
85
        DownloadStruct dstruct = DownloadStruct(m_downloadUrl, m_download_sha512, DOWNLOAD_MANAGER_SHA512, vmap, map);
54
85
        m_manager->createDownload(dstruct);
86
        m_manager->createDownload(dstruct);
55
86
    }
87
    }
56
87
}
88
}
57
88
89
58
=== modified file 'plugins/system-update/download_tracker.h'
59
--- plugins/system-update/download_tracker.h	2014-09-30 02:05:36 +0000
60
+++ plugins/system-update/download_tracker.h	2014-10-17 11:45:42 +0000
61
@@ -42,6 +42,7 @@
62
42
    Q_PROPERTY(QString clickToken READ clickToken WRITE setClickToken)
42
    Q_PROPERTY(QString clickToken READ clickToken WRITE setClickToken)
63
43
    Q_PROPERTY(QString download READ download WRITE setDownload)
43
    Q_PROPERTY(QString download READ download WRITE setDownload)
64
44
    Q_PROPERTY(QString packageName READ packageName WRITE setPackageName)
44
    Q_PROPERTY(QString packageName READ packageName WRITE setPackageName)
65
45
    Q_PROPERTY(QString downloadSha512 READ downloadSha512 WRITE setDownloadSha512)
66
45
    Q_PROPERTY(int progress READ progress NOTIFY progressChanged)
46
    Q_PROPERTY(int progress READ progress NOTIFY progressChanged)
67
46
47
68
47
public:
48
public:
69
@@ -54,10 +55,12 @@
70
54
    QString download() { return m_downloadUrl; }
55
    QString download() { return m_downloadUrl; }
71
55
    QString clickToken() { return m_clickToken; }
56
    QString clickToken() { return m_clickToken; }
72
56
    QString packageName() { return m_packageName; }
57
    QString packageName() { return m_packageName; }
73
58
    QString downloadSha512() { return m_download_sha512; }
74
59
    int progress() { return m_progress; }
75
57
    void setDownload(const QString& url);
60
    void setDownload(const QString& url);
76
58
    void setClickToken(const QString& token);
61
    void setClickToken(const QString& token);
77
59
    void setPackageName(const QString& package);
62
    void setPackageName(const QString& package);
79
60
    int progress() { return m_progress; }
63
    void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; }
80
61
64
81
62
public Q_SLOTS:
65
public Q_SLOTS:
82
63
    void bindDownload(Download* download);
66
    void bindDownload(Download* download);
83
@@ -82,6 +85,7 @@
84
82
    Download* m_download;
85
    Download* m_download;
85
83
    Manager* m_manager;
86
    Manager* m_manager;
86
84
    int m_progress;
87
    int m_progress;
87
88
    QString m_download_sha512;
88
85
89
89
86
    void startService();
90
    void startService();
90
87
    QString getPkconCommand();
91
    QString getPkconCommand();
91
88
92
92
=== modified file 'plugins/system-update/network/network.cpp'
93
--- plugins/system-update/network/network.cpp	2014-09-18 13:50:15 +0000
94
+++ plugins/system-update/network/network.cpp	2014-10-17 11:45:42 +0000
95
@@ -107,6 +107,7 @@
96
107
                    QString version = object.value("version").toString();
107
                    QString version = object.value("version").toString();
97
108
                    QString icon_url = object.value("icon_url").toString();
108
                    QString icon_url = object.value("icon_url").toString();
98
109
                    QString url = object.value("download_url").toString();
109
                    QString url = object.value("download_url").toString();
99
110
                    QString download_sha512 = object.value("download_sha512").toString();
100
110
                    int size = object.value("binary_filesize").toVariant().toInt();
111
                    int size = object.value("binary_filesize").toVariant().toInt();
101
111
                    if (m_apps.contains(name)) {
112
                    if (m_apps.contains(name)) {
102
112
                        m_apps[name]->setRemoteVersion(version);
113
                        m_apps[name]->setRemoteVersion(version);
103
@@ -114,6 +115,7 @@
104
114
                            m_apps[name]->setIconUrl(icon_url);
115
                            m_apps[name]->setIconUrl(icon_url);
105
115
                            m_apps[name]->setDownloadUrl(url);
116
                            m_apps[name]->setDownloadUrl(url);
106
116
                            m_apps[name]->setBinaryFilesize(size);
117
                            m_apps[name]->setBinaryFilesize(size);
107
118
                            m_apps[name]->setDownloadSha512(download_sha512);
108
117
                            updates = true;
119
                            updates = true;
109
118
                        }
120
                        }
110
119
                    }
121
                    }
111
120
122
112
=== modified file 'plugins/system-update/update.cpp'
113
--- plugins/system-update/update.cpp	2014-09-12 23:47:39 +0000
114
+++ plugins/system-update/update.cpp	2014-10-17 11:45:42 +0000
115
@@ -29,6 +29,7 @@
116
29
    QObject(parent),
29
    QObject(parent),
117
30
    m_binary_filesize(0),
30
    m_binary_filesize(0),
118
31
    m_click_url(""),
31
    m_click_url(""),
119
32
    m_clickToken(""),
120
32
    m_downloadUrl(""),
33
    m_downloadUrl(""),
121
33
    m_download_progress(0),
34
    m_download_progress(0),
122
34
    m_error(""),
35
    m_error(""),
123
35
36
124
=== modified file 'plugins/system-update/update.h'
125
--- plugins/system-update/update.h	2014-09-12 19:12:36 +0000
126
+++ plugins/system-update/update.h	2014-10-17 11:45:42 +0000
127
@@ -57,6 +57,7 @@
128
57
               NOTIFY downloadProgressChanged)
57
               NOTIFY downloadProgressChanged)
129
58
    Q_PROPERTY(QString downloadUrl READ downloadUrl NOTIFY downloadUrlChanged)
58
    Q_PROPERTY(QString downloadUrl READ downloadUrl NOTIFY downloadUrlChanged)
130
59
    Q_PROPERTY(QString clickToken READ clickToken NOTIFY clickTokenChanged)
59
    Q_PROPERTY(QString clickToken READ clickToken NOTIFY clickTokenChanged)
131
60
    Q_PROPERTY(QString downloadSha512 READ downloadSha512 NOTIFY downloadSha512Changed)
132
60
61
133
61
Q_SIGNALS:
62
Q_SIGNALS:
134
62
    void systemUpdateChanged();
63
    void systemUpdateChanged();
135
@@ -75,6 +76,7 @@
136
75
    void downloadUrlChanged();
76
    void downloadUrlChanged();
137
76
    void clickTokenChanged();
77
    void clickTokenChanged();
138
77
    void packageNameChanged();
78
    void packageNameChanged();
139
79
    void downloadSha512Changed();
140
78
80
141
79
public:
81
public:
142
80
    explicit Update(QObject *parent = 0);
82
    explicit Update(QObject *parent = 0);
143
@@ -97,6 +99,7 @@
144
97
    const QString& getClickUrl() const { return m_click_url; }
99
    const QString& getClickUrl() const { return m_click_url; }
145
98
    QString downloadUrl() { return m_downloadUrl; }
100
    QString downloadUrl() { return m_downloadUrl; }
146
99
    QString clickToken() { return m_clickToken; }
101
    QString clickToken() { return m_clickToken; }
147
102
    QString downloadSha512() { return m_download_sha512; }
148
100
103
149
101
    void setSystemUpdate(bool isSystem);
104
    void setSystemUpdate(bool isSystem);
150
102
    void initializeApplication(QString packagename, QString title,
105
    void initializeApplication(QString packagename, QString title,
151
@@ -115,6 +118,7 @@
152
115
    void setClickUrl(const QString &url) { m_click_url = url; }
118
    void setClickUrl(const QString &url) { m_click_url = url; }
153
116
    void setDownloadUrl(const QString &url);
119
    void setDownloadUrl(const QString &url);
154
117
    void setClickToken(const QString &token) { m_clickToken = token; Q_EMIT clickTokenChanged(); }
120
    void setClickToken(const QString &token) { m_clickToken = token; Q_EMIT clickTokenChanged(); }
155
121
    void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; Q_EMIT downloadSha512Changed(); }
156
118
122
157
119
private:
123
private:
158
120
    int m_binary_filesize;
124
    int m_binary_filesize;
159
@@ -134,6 +138,7 @@
160
134
    bool m_update;
138
    bool m_update;
161
135
    bool m_update_ready;
139
    bool m_update_ready;
162
136
    bool m_update_state;
140
    bool m_update_state;
163
141
    QString m_download_sha512;
164
137
142
165
138
    bool getIgnoreUpdates();
143
    bool getIgnoreUpdates();
166
139
};
144
};
167
140
145
168
=== modified file 'plugins/system-update/update_manager.cpp'
169
--- plugins/system-update/update_manager.cpp	2014-10-08 15:51:44 +0000
170
+++ plugins/system-update/update_manager.cpp	2014-10-17 11:45:42 +0000
171
@@ -321,7 +321,6 @@
172
321
{
321
{
173
322
    app->setError("");
322
    app->setError("");
174
323
    app->setClickToken(clickToken);
323
    app->setClickToken(clickToken);
175
324
    app->setDownloadUrl(app->getClickUrl());
176
325
}
324
}
177
326
325
178
327
void UpdateManager::updateClickScope()
326
void UpdateManager::updateClickScope()
179
328
327
180
=== added file 'tests/autopilot/ubuntu_system_settings/utils/mock_update_click_server.py'
181
--- tests/autopilot/ubuntu_system_settings/utils/mock_update_click_server.py	1970-01-01 00:00:00 +0000
182
+++ tests/autopilot/ubuntu_system_settings/utils/mock_update_click_server.py	2014-10-17 11:45:42 +0000
183
@@ -0,0 +1,60 @@
184
1
import json
185
2
import threading
186
3
from http.server import BaseHTTPRequestHandler, HTTPServer
187
4
188
5
189
6
KEEP_ALIVE = True
190
7
191
8
192
9
class MyHandler(BaseHTTPRequestHandler):
193
10
194
11
    def do_HEAD(self):
195
12
        self.send_response(200)
196
13
        self.send_header("X-Click-Token", "X-Click-Token")
197
14
        self.end_headers()
198
15
199
16
    def response_item_info(self):
200
17
        response = [{
201
18
            "name": "com.ubuntu.calculator",
202
19
            "version": "9.0",
203
20
            "icon_url": ("https://raw.githubusercontent.com/ninja-ide/"
204
21
                         "ninja-ide/master/ninja_ide/img/ninja_icon.png"),
205
22
            "download_url": ("https://public.apps.ubuntu.com/download/com."
206
23
                             "ubuntu/calculator/com.ubuntu.calculator_1"
207
24
                             ".3.329_all.click"),
208
25
            "binary_filesize": 3423,
209
26
            "download_sha512": "343244fsdfdsffs"
210
27
        }]
211
28
        self.send_response(200)
212
29
        self.send_header("Content-type", "application/json")
213
30
        self.end_headers()
214
31
        self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
215
32
216
33
    def do_POST(self):
217
34
        """Respond to a POST request."""
218
35
        self.do_GET()
219
36
220
37
    def do_GET(self):
221
38
        """Respond to a GET request."""
222
39
        if self.path.find("iteminfo/") != -1:
223
40
            self.response_item_info()
224
41
        elif self.path.find("shutdown") != -1:
225
42
            global KEEP_ALIVE
226
43
            KEEP_ALIVE = False
227
44
228
45
229
46
def run_click_server():
230
47
    server_address = ('', 8000)
231
48
    httpd = HTTPServer(server_address, MyHandler)
232
49
    global KEEP_ALIVE
233
50
    print('start')
234
51
    while KEEP_ALIVE:
235
52
        httpd.handle_request()
236
53
237
54
238
55
def run_mocked_settings():
239
56
    t = threading.Thread(target=run_click_server)
240
57
    t.start()
241
58
242
59
243
60
run_mocked_settings()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-10-24
Sebastien Bacher (community)		2014-09-30	Needs Information on 2014-10-01
Review via email: mp+236554@code.launchpad.net