5da87d1904
Beginning with efa3fbff39, we separated
the failing and the aborting signals, as they can mean different
things in certain contexts. Still, some places are not yet changed to
reflect this modification. This can cause aborting of progress dialogs
to not work, instead making the application hang in an unusable satte.
This goes through some places where it's not hooked up yet, fixing their
behaviour in those kinds of situation.
115 lines
3.6 KiB
C++
115 lines
3.6 KiB
C++
#include "AssetUpdateTask.h"
|
|
|
|
#include "minecraft/MinecraftInstance.h"
|
|
#include "minecraft/PackProfile.h"
|
|
#include "net/ChecksumValidator.h"
|
|
#include "minecraft/AssetsUtils.h"
|
|
|
|
#include "Application.h"
|
|
|
|
AssetUpdateTask::AssetUpdateTask(MinecraftInstance * inst)
|
|
{
|
|
m_inst = inst;
|
|
}
|
|
|
|
AssetUpdateTask::~AssetUpdateTask()
|
|
{
|
|
}
|
|
|
|
void AssetUpdateTask::executeTask()
|
|
{
|
|
setStatus(tr("Updating assets index..."));
|
|
auto components = m_inst->getPackProfile();
|
|
auto profile = components->getProfile();
|
|
auto assets = profile->getMinecraftAssets();
|
|
QUrl indexUrl = assets->url;
|
|
QString localPath = assets->id + ".json";
|
|
auto job = new NetJob(
|
|
tr("Asset index for %1").arg(m_inst->name()),
|
|
APPLICATION->network()
|
|
);
|
|
|
|
auto metacache = APPLICATION->metacache();
|
|
auto entry = metacache->resolveEntry("asset_indexes", localPath);
|
|
entry->setStale(true);
|
|
auto hexSha1 = assets->sha1.toLatin1();
|
|
qDebug() << "Asset index SHA1:" << hexSha1;
|
|
auto dl = Net::Download::makeCached(indexUrl, entry);
|
|
auto rawSha1 = QByteArray::fromHex(assets->sha1.toLatin1());
|
|
dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
|
|
job->addNetAction(dl);
|
|
|
|
downloadJob.reset(job);
|
|
|
|
connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::assetIndexFinished);
|
|
connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetIndexFailed);
|
|
connect(downloadJob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
|
|
connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
|
|
|
|
qDebug() << m_inst->name() << ": Starting asset index download";
|
|
downloadJob->start();
|
|
}
|
|
|
|
bool AssetUpdateTask::canAbort() const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void AssetUpdateTask::assetIndexFinished()
|
|
{
|
|
AssetsIndex index;
|
|
qDebug() << m_inst->name() << ": Finished asset index download";
|
|
|
|
auto components = m_inst->getPackProfile();
|
|
auto profile = components->getProfile();
|
|
auto assets = profile->getMinecraftAssets();
|
|
|
|
QString asset_fname = "assets/indexes/" + assets->id + ".json";
|
|
// FIXME: this looks like a job for a generic validator based on json schema?
|
|
if (!AssetsUtils::loadAssetsIndexJson(assets->id, asset_fname, index))
|
|
{
|
|
auto metacache = APPLICATION->metacache();
|
|
auto entry = metacache->resolveEntry("asset_indexes", assets->id + ".json");
|
|
metacache->evictEntry(entry);
|
|
emitFailed(tr("Failed to read the assets index!"));
|
|
}
|
|
|
|
auto job = index.getDownloadJob();
|
|
if(job)
|
|
{
|
|
setStatus(tr("Getting the assets files from Mojang..."));
|
|
downloadJob = job;
|
|
connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::emitSucceeded);
|
|
connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed);
|
|
connect(downloadJob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
|
|
connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
|
|
downloadJob->start();
|
|
return;
|
|
}
|
|
emitSucceeded();
|
|
}
|
|
|
|
void AssetUpdateTask::assetIndexFailed(QString reason)
|
|
{
|
|
qDebug() << m_inst->name() << ": Failed asset index download";
|
|
emitFailed(tr("Failed to download the assets index:\n%1").arg(reason));
|
|
}
|
|
|
|
void AssetUpdateTask::assetsFailed(QString reason)
|
|
{
|
|
emitFailed(tr("Failed to download assets:\n%1").arg(reason));
|
|
}
|
|
|
|
bool AssetUpdateTask::abort()
|
|
{
|
|
if(downloadJob)
|
|
{
|
|
return downloadJob->abort();
|
|
}
|
|
else
|
|
{
|
|
qWarning() << "Prematurely aborted AssetUpdateTask";
|
|
}
|
|
return true;
|
|
}
|