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

GH-352 Make OneSix instance update downloads cancellable

Browse Source
This commit is contained in:
Petr Mrázek
2016-08-14 02:33:31 +02:00
parent 2f0441b3c1
commit 042f3ef55c
32 changed files with 796 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
api/logic/minecraft/MinecraftVersionList.cpp
View File

@ -61,6 +61,10 @@ public:
explicit MCVListVersionUpdateTask(MinecraftVersionList *vlist, std::shared_ptr<MinecraftVersion> updatedVersion);
virtual ~MCVListVersionUpdateTask() override{};
virtual void executeTask() override;
bool canAbort() const override;
public slots:
bool abort() override;
protected
slots:
@ -71,6 +75,7 @@ protected:
QByteArray versionIndexData;
std::shared_ptr<MinecraftVersion> updatedVersion;
MinecraftVersionList *m_list;
bool m_aborted = false;
};
class ListLoadError : public Exception
@ -410,6 +415,11 @@ MCVListVersionUpdateTask::MCVListVersionUpdateTask(MinecraftVersionList *vlist,
void MCVListVersionUpdateTask::executeTask()
{
if(m_aborted)
{
emitFailed(tr("Task aborted."));
return;
}
auto job = new NetJob("Version index");
job->addNetAction(Net::Download::makeByteArray(QUrl(updatedVersion->getUrl()), &versionIndexData));
specificVersionDownloadJob.reset(job);
@ -419,6 +429,21 @@ void MCVListVersionUpdateTask::executeTask()
specificVersionDownloadJob->start();
}
bool MCVListVersionUpdateTask::canAbort() const
{
return true;
}
bool MCVListVersionUpdateTask::abort()
{
m_aborted = true;
if(specificVersionDownloadJob)
{
return specificVersionDownloadJob->abort();
}
return true;
}
void MCVListVersionUpdateTask::json_downloaded()
{
specificVersionDownloadJob.reset();