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 /utils/rbutilqt/base | |
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
Diffstat (limited to 'utils/rbutilqt/base')
-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 |
8 files changed, 13 insertions, 23 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 | ||