devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: HttpGet: Return NetworkError in done signal.

Browse source 
Return the status value instead of simply a bool.

Change-Id: I2bffaac0087418656e80c74dc352011a4ea32ab1
This commit is contained in:
Dominik Riebeling 2022-03-16 22:19:00 +01:00
parent 08b42791ff
commit a0459de4d5
13 changed files with 35 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

13
utils/rbutilqt/base/bootloaderinstallbase.cpp
View file

@ -57,16 +57,7 @@ void BootloaderInstallBase::downloadBlStart(QUrl source)
}
void BootloaderInstallBase::downloadReqFinished(int id, bool error)
{
LOG_INFO() << "Download Request" << id
<< "finished, error:" << m_http.errorString();
downloadBlFinish(error);
}
void BootloaderInstallBase::downloadBlFinish(bool error)
void BootloaderInstallBase::downloadBlFinish(QNetworkReply::NetworkError error)
{
LOG_INFO() << "Downloading bootloader finished, error:"
<< error;
@ -80,7 +71,7 @@ void BootloaderInstallBase::downloadBlFinish(bool error)
emit done(true);
return;
}
if(error) {
if(error != QNetworkReply::NoError) {
emit logItem(tr("Download error: %1")
.arg(m_http.errorString()), LOGERROR);
emit done(true);

3
utils/rbutilqt/base/bootloaderinstallbase.h
View file

@ -68,8 +68,7 @@ class BootloaderInstallBase : public QObject
static QString postinstallHints(QString model);
protected slots:
void downloadReqFinished(int id, bool error);
void downloadBlFinish(bool error);
void downloadBlFinish(QNetworkReply::NetworkError error);
void installBlfile(void);
void progressAborted(void);

6
utils/rbutilqt/base/httpget.cpp
View file

@ -145,7 +145,7 @@ void HttpGet::requestFinished(QNetworkReply* reply)
{
m_lastStatusCode
= reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
LOG_INFO() << "Request finished, status code:" << m_lastStatusCode;
LOG_INFO() << "Request finished, status code:" << m_lastStatusCode << reply->error();
m_lastServerTimestamp
= reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toLocalTime();
LOG_INFO() << "Data from cache:"
@ -178,11 +178,11 @@ void HttpGet::requestFinished(QNetworkReply* reply)
m_outputFile->write(m_data);
m_outputFile->close();
}
emit done(false);
emit done(QNetworkReply::NoError);
}
else {
m_data.clear();
emit done(true);
emit done(reply->error());
}
reply->deleteLater();
m_reply = nullptr;

2
utils/rbutilqt/base/httpget.h
View file

@ -78,7 +78,7 @@ class HttpGet : public QObject
void abort(void);
signals:
void done(bool);
void done(QNetworkReply::NetworkError error);
void dataReadProgress(int, int);
void headerFinished(void);

4
utils/rbutilqt/base/voicefile.cpp
View file

@ -175,7 +175,7 @@ bool VoiceFileCreator::createVoiceFile()
}
void VoiceFileCreator::downloadDone(bool error)
void VoiceFileCreator::downloadDone(QNetworkReply::NetworkError error)
{
LOG_INFO() << "download done, error:" << error;
@ -190,7 +190,7 @@ void VoiceFileCreator::downloadDone(bool error)
if(getter->isCached())
emit logItem(tr("Cached file used."), LOGINFO);
if(error)
if(error != QNetworkReply::NoError)
{
emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
emit done(true);

2
utils/rbutilqt/base/voicefile.h
View file

@ -52,7 +52,7 @@ signals:
void logProgress(int, int); //! set progress bar.
private slots:
void downloadDone(bool error);
void downloadDone(QNetworkReply::NetworkError error);
private:

4
utils/rbutilqt/base/zipinstaller.cpp
View file

@ -102,7 +102,7 @@ void ZipInstaller::installStart()
}
void ZipInstaller::downloadDone(bool error)
void ZipInstaller::downloadDone(QNetworkReply::NetworkError error)
{
LOG_INFO() << "download done, error:" << error;
QStringList zipContents; // needed later
@ -118,7 +118,7 @@ void ZipInstaller::downloadDone(bool error)
}
if(m_getter->isCached())
emit logItem(tr("Cached file used."), LOGINFO);
if(error) {
if(error != QNetworkReply::NoError) {
emit logItem(tr("Download error: %1").arg(m_getter->errorString()), LOGERROR);
emit done(true);
return;

2
utils/rbutilqt/base/zipinstaller.h
View file

@ -59,7 +59,7 @@ public slots:
void abort(void);
private slots:
void downloadDone(bool);
void downloadDone(QNetworkReply::NetworkError error);
void installStart(void);
void installContinue(void);