diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-16 22:19:00 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-19 09:19:11 +0100 |
commit | a0459de4d5b4bbb062536146cdefaad796480c7c (patch) | |
tree | ff4267ff88b1eb7938957218c1bde7159bb281cc | |
parent | 08b42791ffddec7c51a3e887654f4d476d780b91 (diff) | |
download | rockbox-a0459de4d5b4bbb062536146cdefaad796480c7c.tar.gz rockbox-a0459de4d5b4bbb062536146cdefaad796480c7c.zip |
rbutil: HttpGet: Return NetworkError in done signal.
Return the status value instead of simply a bool.
Change-Id: I2bffaac0087418656e80c74dc352011a4ea32ab1
-rw-r--r-- | utils/rbutilqt/base/bootloaderinstallbase.cpp | 13 | ||||
-rw-r--r-- | utils/rbutilqt/base/bootloaderinstallbase.h | 3 | ||||
-rw-r--r-- | utils/rbutilqt/base/httpget.cpp | 6 | ||||
-rw-r--r-- | utils/rbutilqt/base/httpget.h | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/voicefile.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/voicefile.h | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/zipinstaller.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/zipinstaller.h | 2 | ||||
-rw-r--r-- | utils/rbutilqt/rbutilqt.cpp | 8 | ||||
-rw-r--r-- | utils/rbutilqt/rbutilqt.h | 4 | ||||
-rw-r--r-- | utils/rbutilqt/test/test-httpget.cpp | 16 | ||||
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.cpp | 13 | ||||
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.h | 4 |
13 files changed, 35 insertions, 46 deletions
diff --git a/utils/rbutilqt/base/bootloaderinstallbase.cpp b/utils/rbutilqt/base/bootloaderinstallbase.cpp index c07d87bf36..a185b25619 100644 --- a/utils/rbutilqt/base/bootloaderinstallbase.cpp +++ b/utils/rbutilqt/base/bootloaderinstallbase.cpp | |||
@@ -57,16 +57,7 @@ void BootloaderInstallBase::downloadBlStart(QUrl source) | |||
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
60 | void BootloaderInstallBase::downloadReqFinished(int id, bool error) | 60 | void BootloaderInstallBase::downloadBlFinish(QNetworkReply::NetworkError error) |
61 | { | ||
62 | LOG_INFO() << "Download Request" << id | ||
63 | << "finished, error:" << m_http.errorString(); | ||
64 | |||
65 | downloadBlFinish(error); | ||
66 | } | ||
67 | |||
68 | |||
69 | void BootloaderInstallBase::downloadBlFinish(bool error) | ||
70 | { | 61 | { |
71 | LOG_INFO() << "Downloading bootloader finished, error:" | 62 | LOG_INFO() << "Downloading bootloader finished, error:" |
72 | << error; | 63 | << error; |
@@ -80,7 +71,7 @@ void BootloaderInstallBase::downloadBlFinish(bool error) | |||
80 | emit done(true); | 71 | emit done(true); |
81 | return; | 72 | return; |
82 | } | 73 | } |
83 | if(error) { | 74 | if(error != QNetworkReply::NoError) { |
84 | emit logItem(tr("Download error: %1") | 75 | emit logItem(tr("Download error: %1") |
85 | .arg(m_http.errorString()), LOGERROR); | 76 | .arg(m_http.errorString()), LOGERROR); |
86 | emit done(true); | 77 | emit done(true); |
diff --git a/utils/rbutilqt/base/bootloaderinstallbase.h b/utils/rbutilqt/base/bootloaderinstallbase.h index 0d9423a06f..567b4e9093 100644 --- a/utils/rbutilqt/base/bootloaderinstallbase.h +++ b/utils/rbutilqt/base/bootloaderinstallbase.h | |||
@@ -68,8 +68,7 @@ class BootloaderInstallBase : public QObject | |||
68 | static QString postinstallHints(QString model); | 68 | static QString postinstallHints(QString model); |
69 | 69 | ||
70 | protected slots: | 70 | protected slots: |
71 | void downloadReqFinished(int id, bool error); | 71 | void downloadBlFinish(QNetworkReply::NetworkError error); |
72 | void downloadBlFinish(bool error); | ||
73 | void installBlfile(void); | 72 | void installBlfile(void); |
74 | void progressAborted(void); | 73 | void progressAborted(void); |
75 | 74 | ||
diff --git a/utils/rbutilqt/base/httpget.cpp b/utils/rbutilqt/base/httpget.cpp index 2df9501fd6..fb74514e73 100644 --- a/utils/rbutilqt/base/httpget.cpp +++ b/utils/rbutilqt/base/httpget.cpp | |||
@@ -145,7 +145,7 @@ void HttpGet::requestFinished(QNetworkReply* reply) | |||
145 | { | 145 | { |
146 | m_lastStatusCode | 146 | m_lastStatusCode |
147 | = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); | 147 | = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); |
148 | LOG_INFO() << "Request finished, status code:" << m_lastStatusCode; | 148 | LOG_INFO() << "Request finished, status code:" << m_lastStatusCode << reply->error(); |
149 | m_lastServerTimestamp | 149 | m_lastServerTimestamp |
150 | = reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toLocalTime(); | 150 | = reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toLocalTime(); |
151 | LOG_INFO() << "Data from cache:" | 151 | LOG_INFO() << "Data from cache:" |
@@ -178,11 +178,11 @@ void HttpGet::requestFinished(QNetworkReply* reply) | |||
178 | m_outputFile->write(m_data); | 178 | m_outputFile->write(m_data); |
179 | m_outputFile->close(); | 179 | m_outputFile->close(); |
180 | } | 180 | } |
181 | emit done(false); | 181 | emit done(QNetworkReply::NoError); |
182 | } | 182 | } |
183 | else { | 183 | else { |
184 | m_data.clear(); | 184 | m_data.clear(); |
185 | emit done(true); | 185 | emit done(reply->error()); |
186 | } | 186 | } |
187 | reply->deleteLater(); | 187 | reply->deleteLater(); |
188 | m_reply = nullptr; | 188 | m_reply = nullptr; |
diff --git a/utils/rbutilqt/base/httpget.h b/utils/rbutilqt/base/httpget.h index 472ad83b81..443a606e6d 100644 --- a/utils/rbutilqt/base/httpget.h +++ b/utils/rbutilqt/base/httpget.h | |||
@@ -78,7 +78,7 @@ class HttpGet : public QObject | |||
78 | void abort(void); | 78 | void abort(void); |
79 | 79 | ||
80 | signals: | 80 | signals: |
81 | void done(bool); | 81 | void done(QNetworkReply::NetworkError error); |
82 | void dataReadProgress(int, int); | 82 | void dataReadProgress(int, int); |
83 | void headerFinished(void); | 83 | void headerFinished(void); |
84 | 84 | ||
diff --git a/utils/rbutilqt/base/voicefile.cpp b/utils/rbutilqt/base/voicefile.cpp index eabf7a721a..c5a239d720 100644 --- a/utils/rbutilqt/base/voicefile.cpp +++ b/utils/rbutilqt/base/voicefile.cpp | |||
@@ -175,7 +175,7 @@ bool VoiceFileCreator::createVoiceFile() | |||
175 | } | 175 | } |
176 | 176 | ||
177 | 177 | ||
178 | void VoiceFileCreator::downloadDone(bool error) | 178 | void VoiceFileCreator::downloadDone(QNetworkReply::NetworkError error) |
179 | { | 179 | { |
180 | LOG_INFO() << "download done, error:" << error; | 180 | LOG_INFO() << "download done, error:" << error; |
181 | 181 | ||
@@ -190,7 +190,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
190 | 190 | ||
191 | if(getter->isCached()) | 191 | if(getter->isCached()) |
192 | emit logItem(tr("Cached file used."), LOGINFO); | 192 | emit logItem(tr("Cached file used."), LOGINFO); |
193 | if(error) | 193 | if(error != QNetworkReply::NoError) |
194 | { | 194 | { |
195 | emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); | 195 | emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); |
196 | emit done(true); | 196 | emit done(true); |
diff --git a/utils/rbutilqt/base/voicefile.h b/utils/rbutilqt/base/voicefile.h index c813910a69..feb0ac6e5a 100644 --- a/utils/rbutilqt/base/voicefile.h +++ b/utils/rbutilqt/base/voicefile.h | |||
@@ -52,7 +52,7 @@ signals: | |||
52 | void logProgress(int, int); //! set progress bar. | 52 | void logProgress(int, int); //! set progress bar. |
53 | 53 | ||
54 | private slots: | 54 | private slots: |
55 | void downloadDone(bool error); | 55 | void downloadDone(QNetworkReply::NetworkError error); |
56 | 56 | ||
57 | private: | 57 | private: |
58 | 58 | ||
diff --git a/utils/rbutilqt/base/zipinstaller.cpp b/utils/rbutilqt/base/zipinstaller.cpp index 8de6c53b16..ba0b89121c 100644 --- a/utils/rbutilqt/base/zipinstaller.cpp +++ b/utils/rbutilqt/base/zipinstaller.cpp | |||
@@ -102,7 +102,7 @@ void ZipInstaller::installStart() | |||
102 | } | 102 | } |
103 | 103 | ||
104 | 104 | ||
105 | void ZipInstaller::downloadDone(bool error) | 105 | void ZipInstaller::downloadDone(QNetworkReply::NetworkError error) |
106 | { | 106 | { |
107 | LOG_INFO() << "download done, error:" << error; | 107 | LOG_INFO() << "download done, error:" << error; |
108 | QStringList zipContents; // needed later | 108 | QStringList zipContents; // needed later |
@@ -118,7 +118,7 @@ void ZipInstaller::downloadDone(bool error) | |||
118 | } | 118 | } |
119 | if(m_getter->isCached()) | 119 | if(m_getter->isCached()) |
120 | emit logItem(tr("Cached file used."), LOGINFO); | 120 | emit logItem(tr("Cached file used."), LOGINFO); |
121 | if(error) { | 121 | if(error != QNetworkReply::NoError) { |
122 | emit logItem(tr("Download error: %1").arg(m_getter->errorString()), LOGERROR); | 122 | emit logItem(tr("Download error: %1").arg(m_getter->errorString()), LOGERROR); |
123 | emit done(true); | 123 | emit done(true); |
124 | return; | 124 | return; |
diff --git a/utils/rbutilqt/base/zipinstaller.h b/utils/rbutilqt/base/zipinstaller.h index 35967af6b1..32a42ef6a2 100644 --- a/utils/rbutilqt/base/zipinstaller.h +++ b/utils/rbutilqt/base/zipinstaller.h | |||
@@ -59,7 +59,7 @@ public slots: | |||
59 | void abort(void); | 59 | void abort(void); |
60 | 60 | ||
61 | private slots: | 61 | private slots: |
62 | void downloadDone(bool); | 62 | void downloadDone(QNetworkReply::NetworkError error); |
63 | void installStart(void); | 63 | void installStart(void); |
64 | void installContinue(void); | 64 | void installContinue(void); |
65 | 65 | ||
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp index 9cb5b7cf30..6d0da3390f 100644 --- a/utils/rbutilqt/rbutilqt.cpp +++ b/utils/rbutilqt/rbutilqt.cpp | |||
@@ -214,9 +214,9 @@ void RbUtilQt::downloadInfo() | |||
214 | } | 214 | } |
215 | 215 | ||
216 | 216 | ||
217 | void RbUtilQt::downloadDone(bool error) | 217 | void RbUtilQt::downloadDone(QNetworkReply::NetworkError error) |
218 | { | 218 | { |
219 | if(error) { | 219 | if(error != QNetworkReply::NoError) { |
220 | LOG_INFO() << "network error:" << daily->errorString(); | 220 | LOG_INFO() << "network error:" << daily->errorString(); |
221 | ui.statusbar->showMessage(tr("Can't get version information!")); | 221 | ui.statusbar->showMessage(tr("Can't get version information!")); |
222 | QMessageBox::critical(this, tr("Network error"), | 222 | QMessageBox::critical(this, tr("Network error"), |
@@ -614,9 +614,9 @@ void RbUtilQt::checkUpdate(void) | |||
614 | update->getFile(QUrl(url)); | 614 | update->getFile(QUrl(url)); |
615 | } | 615 | } |
616 | 616 | ||
617 | void RbUtilQt::downloadUpdateDone(bool error) | 617 | void RbUtilQt::downloadUpdateDone(QNetworkReply::NetworkError error) |
618 | { | 618 | { |
619 | if(error) { | 619 | if(error != QNetworkReply::NoError) { |
620 | LOG_INFO() << "network error:" << update->errorString(); | 620 | LOG_INFO() << "network error:" << update->errorString(); |
621 | } | 621 | } |
622 | else { | 622 | else { |
diff --git a/utils/rbutilqt/rbutilqt.h b/utils/rbutilqt/rbutilqt.h index e20749d438..c507317fa2 100644 --- a/utils/rbutilqt/rbutilqt.h +++ b/utils/rbutilqt/rbutilqt.h | |||
@@ -87,7 +87,7 @@ class RbUtilQt : public QMainWindow | |||
87 | 87 | ||
88 | void createTalkFiles(void); | 88 | void createTalkFiles(void); |
89 | void createVoiceFile(void); | 89 | void createVoiceFile(void); |
90 | void downloadDone(bool); | 90 | void downloadDone(QNetworkReply::NetworkError error); |
91 | void downloadInfo(void); | 91 | void downloadInfo(void); |
92 | void backup(void); | 92 | void backup(void); |
93 | 93 | ||
@@ -97,7 +97,7 @@ class RbUtilQt : public QMainWindow | |||
97 | void updateTabs(int); | 97 | void updateTabs(int); |
98 | 98 | ||
99 | void checkUpdate(void); | 99 | void checkUpdate(void); |
100 | void downloadUpdateDone(bool errror); | 100 | void downloadUpdateDone(QNetworkReply::NetworkError error); |
101 | }; | 101 | }; |
102 | 102 | ||
103 | #endif | 103 | #endif |
diff --git a/utils/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp index 9230122f63..86f1a6e13e 100644 --- a/utils/rbutilqt/test/test-httpget.cpp +++ b/utils/rbutilqt/test/test-httpget.cpp | |||
@@ -195,11 +195,11 @@ void TestHttpGet::cleanup(void) | |||
195 | { | 195 | { |
196 | rmTree(m_cachedir.absolutePath()); | 196 | rmTree(m_cachedir.absolutePath()); |
197 | if(m_getter) { | 197 | if(m_getter) { |
198 | m_getter->abort(); delete m_getter; m_getter = NULL; | 198 | m_getter->abort(); delete m_getter; m_getter = nullptr; |
199 | } | 199 | } |
200 | if(m_daemon) { delete m_daemon; m_daemon = NULL; } | 200 | if(m_daemon) { delete m_daemon; m_daemon = nullptr; } |
201 | if(m_doneSpy) { delete m_doneSpy; m_doneSpy = NULL; } | 201 | if(m_doneSpy) { delete m_doneSpy; m_doneSpy = nullptr; } |
202 | if(m_progressSpy) { delete m_progressSpy; m_progressSpy = NULL; } | 202 | if(m_progressSpy) { delete m_progressSpy; m_progressSpy = nullptr; } |
203 | } | 203 | } |
204 | 204 | ||
205 | void TestHttpGet::testFileUrlRequest(void) | 205 | void TestHttpGet::testFileUrlRequest(void) |
@@ -299,7 +299,7 @@ void TestHttpGet::testCachedRequest(void) | |||
299 | 299 | ||
300 | QList<QString> requests = m_daemon->lastRequestData(); | 300 | QList<QString> requests = m_daemon->lastRequestData(); |
301 | QCOMPARE(m_doneSpy->count(), 1); | 301 | QCOMPARE(m_doneSpy->count(), 1); |
302 | QCOMPARE(m_doneSpy->at(0).at(0).toBool(), false); | 302 | QCOMPARE(m_doneSpy->at(0).at(0).toInt(), QNetworkReply::NoError); |
303 | QCOMPARE(m_waitTimeoutOccured, false); | 303 | QCOMPARE(m_waitTimeoutOccured, false); |
304 | QCOMPARE(requests.size(), 2); | 304 | QCOMPARE(requests.size(), 2); |
305 | QCOMPARE(requests.at(0).startsWith("GET"), true); | 305 | QCOMPARE(requests.at(0).startsWith("GET"), true); |
@@ -311,7 +311,7 @@ void TestHttpGet::testCachedRequest(void) | |||
311 | while(m_doneSpy->count() < 2 && m_waitTimeoutOccured == false) | 311 | while(m_doneSpy->count() < 2 && m_waitTimeoutOccured == false) |
312 | QCoreApplication::processEvents(); | 312 | QCoreApplication::processEvents(); |
313 | QCOMPARE(m_doneSpy->count(), 2); // 2 requests, 2 times done() | 313 | QCOMPARE(m_doneSpy->count(), 2); // 2 requests, 2 times done() |
314 | QCOMPARE(m_doneSpy->at(1).at(0).toBool(), false); | 314 | QCOMPARE(m_doneSpy->at(1).at(0).toInt(), QNetworkReply::NoError); |
315 | QCOMPARE(m_waitTimeoutOccured, false); | 315 | QCOMPARE(m_waitTimeoutOccured, false); |
316 | QCOMPARE(m_daemon->lastRequestData().size(), 3); | 316 | QCOMPARE(m_daemon->lastRequestData().size(), 3); |
317 | // redirect will not cache as the redirection target file. | 317 | // redirect will not cache as the redirection target file. |
@@ -402,7 +402,7 @@ void TestHttpGet::testResponseCode(void) | |||
402 | QCoreApplication::processEvents(); | 402 | QCoreApplication::processEvents(); |
403 | 403 | ||
404 | QCOMPARE(m_doneSpy->count(), 1); | 404 | QCOMPARE(m_doneSpy->count(), 1); |
405 | QCOMPARE(m_doneSpy->at(0).at(0).toBool(), true); | 405 | QCOMPARE(m_doneSpy->at(0).at(0).toInt(), QNetworkReply::ContentNotFoundError); |
406 | QCOMPARE(m_waitTimeoutOccured, false); | 406 | QCOMPARE(m_waitTimeoutOccured, false); |
407 | QCOMPARE(m_daemon->lastRequestData().size(), 1); | 407 | QCOMPARE(m_daemon->lastRequestData().size(), 1); |
408 | QCOMPARE(m_daemon->lastRequestData().at(0).startsWith("GET"), true); | 408 | QCOMPARE(m_daemon->lastRequestData().at(0).startsWith("GET"), true); |
@@ -472,7 +472,7 @@ void TestHttpGet::testNoServer(void) | |||
472 | QCoreApplication::processEvents(); | 472 | QCoreApplication::processEvents(); |
473 | 473 | ||
474 | QCOMPARE(m_doneSpy->count(), 1); | 474 | QCOMPARE(m_doneSpy->count(), 1); |
475 | QCOMPARE(m_doneSpy->at(0).at(0).toBool(), true); | 475 | QCOMPARE(m_doneSpy->at(0).at(0).toInt(), QNetworkReply::ConnectionRefusedError); |
476 | QCOMPARE(m_waitTimeoutOccured, false); | 476 | QCOMPARE(m_waitTimeoutOccured, false); |
477 | } | 477 | } |
478 | 478 | ||
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp index e6043de892..5be60050d6 100644 --- a/utils/rbutilqt/themesinstallwindow.cpp +++ b/utils/rbutilqt/themesinstallwindow.cpp | |||
@@ -100,7 +100,7 @@ void ThemesInstallWindow::downloadInfo() | |||
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
103 | void ThemesInstallWindow::downloadDone(bool error) | 103 | void ThemesInstallWindow::downloadDone(QNetworkReply::NetworkError error) |
104 | { | 104 | { |
105 | LOG_INFO() << "Download done, error:" << error; | 105 | LOG_INFO() << "Download done, error:" << error; |
106 | 106 | ||
@@ -116,7 +116,7 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
116 | << iniDetails.value("error/description").toString() | 116 | << iniDetails.value("error/description").toString() |
117 | << iniDetails.value("error/query").toString(); | 117 | << iniDetails.value("error/query").toString(); |
118 | 118 | ||
119 | if(error) { | 119 | if(error != QNetworkReply::NoError) { |
120 | logger->addItem(tr("Network error: %1.\n" | 120 | logger->addItem(tr("Network error: %1.\n" |
121 | "Please check your network and proxy settings.") | 121 | "Please check your network and proxy settings.") |
122 | .arg(getter->errorString()), LOGERROR); | 122 | .arg(getter->errorString()), LOGERROR); |
@@ -236,19 +236,18 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p | |||
236 | } | 236 | } |
237 | 237 | ||
238 | 238 | ||
239 | void ThemesInstallWindow::updateImage(bool error) | 239 | void ThemesInstallWindow::updateImage(QNetworkReply::NetworkError error) |
240 | { | 240 | { |
241 | LOG_INFO() << "Updating image:"<< !error; | 241 | LOG_INFO() << "Updating image:"<< !error; |
242 | 242 | ||
243 | if(error) { | 243 | if(error != QNetworkReply::NoError) { |
244 | ui.themePreview->clear(); | 244 | ui.themePreview->clear(); |
245 | ui.themePreview->setText(tr("Retrieving theme preview failed.\n" | 245 | ui.themePreview->setText(tr("Retrieving theme preview failed.\n" |
246 | "HTTP response code: %1").arg(igetter.httpResponse())); | 246 | "HTTP response code: %1").arg(igetter.httpResponse())); |
247 | return; | 247 | return; |
248 | } | 248 | } |
249 | 249 | else { | |
250 | QPixmap p; | 250 | QPixmap p; |
251 | if(!error) { | ||
252 | imgData = igetter.readAll(); | 251 | imgData = igetter.readAll(); |
253 | if(imgData.isNull()) return; | 252 | if(imgData.isNull()) return; |
254 | p.loadFromData(imgData); | 253 | p.loadFromData(imgData); |
diff --git a/utils/rbutilqt/themesinstallwindow.h b/utils/rbutilqt/themesinstallwindow.h index 96a1ea42b4..c3ea850efd 100644 --- a/utils/rbutilqt/themesinstallwindow.h +++ b/utils/rbutilqt/themesinstallwindow.h | |||
@@ -65,8 +65,8 @@ class ThemesInstallWindow : public QDialog | |||
65 | bool windowSelectOnly; | 65 | bool windowSelectOnly; |
66 | 66 | ||
67 | private slots: | 67 | private slots: |
68 | void downloadDone(bool); | 68 | void downloadDone(QNetworkReply::NetworkError error); |
69 | void updateImage(bool); | 69 | void updateImage(QNetworkReply::NetworkError error); |
70 | void abort(void); | 70 | void abort(void); |
71 | void updateDetails(QListWidgetItem* cur, QListWidgetItem* prev); | 71 | void updateDetails(QListWidgetItem* cur, QListWidgetItem* prev); |
72 | void updateSize(void); | 72 | void updateSize(void); |