From 84549ed8078bdbd029aa5a89facc0412b8b5e753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 26 Apr 2015 13:47:14 +0200 Subject: GH-849 Further NetJob related fixes --- logic/updater/DownloadTask.cpp | 7 +++---- logic/updater/DownloadTask.h | 2 +- logic/updater/UpdateChecker.cpp | 6 +++--- logic/updater/UpdateChecker.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'logic/updater') diff --git a/logic/updater/DownloadTask.cpp b/logic/updater/DownloadTask.cpp index 65d894f9..f19607a5 100644 --- a/logic/updater/DownloadTask.cpp +++ b/logic/updater/DownloadTask.cpp @@ -159,11 +159,10 @@ void DownloadTask::fileDownloadFinished() emitSucceeded(); } -void DownloadTask::fileDownloadFailed() +void DownloadTask::fileDownloadFailed(QString reason) { - // TODO: Give more info about the failure. - qCritical() << "Failed to download update files."; - emitFailed(tr("Failed to download update files.")); + qCritical() << "Failed to download update files:" << reason; + emitFailed(tr("Failed to download update files: %1").arg(reason)); } void DownloadTask::fileDownloadProgressChanged(qint64 current, qint64 total) diff --git a/logic/updater/DownloadTask.h b/logic/updater/DownloadTask.h index 24e39415..182e76d6 100644 --- a/logic/updater/DownloadTask.h +++ b/logic/updater/DownloadTask.h @@ -78,7 +78,7 @@ protected slots: void vinfoDownloadFailed(); void fileDownloadFinished(); - void fileDownloadFailed(); + void fileDownloadFailed(QString reason); void fileDownloadProgressChanged(qint64 current, qint64 total); }; diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp index 7d214ed4..1cdac916 100644 --- a/logic/updater/UpdateChecker.cpp +++ b/logic/updater/UpdateChecker.cpp @@ -96,7 +96,7 @@ void UpdateChecker::checkForUpdate(QString updateChannel, bool notifyNoUpdate) job->addNetAction(ByteArrayDownload::make(indexUrl)); connect(job, &NetJob::succeeded, [this, notifyNoUpdate]() { updateCheckFinished(notifyNoUpdate); }); - connect(job, SIGNAL(failed()), SLOT(updateCheckFailed())); + connect(job, &NetJob::failed, this, &UpdateChecker::updateCheckFailed); indexJob.reset(job); job->start(); } @@ -260,10 +260,10 @@ void UpdateChecker::chanListDownloadFinished(bool notifyNoUpdate) emit channelListLoaded(); } -void UpdateChecker::chanListDownloadFailed() +void UpdateChecker::chanListDownloadFailed(QString reason) { m_chanListLoading = false; - qCritical() << "Failed to download channel list."; + qCritical() << QString("Failed to download channel list: %1").arg(reason); emit channelListLoaded(); } diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h index 760245cd..39ccd138 100644 --- a/logic/updater/UpdateChecker.h +++ b/logic/updater/UpdateChecker.h @@ -70,7 +70,7 @@ private slots: void updateCheckFailed(); void chanListDownloadFinished(bool notifyNoUpdate); - void chanListDownloadFailed(); + void chanListDownloadFailed(QString reason); private: friend class UpdateCheckerTest; -- cgit v1.2.3