CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-849 Further NetJob related fixes

Browse Source
This commit is contained in:
Petr Mrázek
2015-04-26 13:47:14 +02:00
parent d5c79db12c
commit 84549ed807
11 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
logic/updater/DownloadTask.cpp
View File

@ -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)

2
logic/updater/DownloadTask.h
View File

@ -78,7 +78,7 @@ protected slots:
void vinfoDownloadFailed();
void fileDownloadFinished();
void fileDownloadFailed();
void fileDownloadFailed(QString reason);
void fileDownloadProgressChanged(qint64 current, qint64 total);
};

6
logic/updater/UpdateChecker.cpp
View File

@ -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();
}

2
logic/updater/UpdateChecker.h
View File

@ -70,7 +70,7 @@ private slots:
void updateCheckFailed();
void chanListDownloadFinished(bool notifyNoUpdate);
void chanListDownloadFailed();
void chanListDownloadFailed(QString reason);
private:
friend class UpdateCheckerTest;