1 files changed, 67 insertions, 62 deletions

diff --git a/api/logic/minecraft/update/AssetUpdateTask.cpp b/api/logic/minecraft/update/AssetUpdateTask.cpp
index 2ad2b5b2..051b1279 100644
--- a/api/logic/minecraft/update/AssetUpdateTask.cpp
+++ b/api/logic/minecraft/update/AssetUpdateTask.cpp
@@ -7,96 +7,101 @@
 
 AssetUpdateTask::AssetUpdateTask(MinecraftInstance * inst)
 {
-	m_inst = inst;
+    m_inst = inst;
 }
+
+AssetUpdateTask::~AssetUpdateTask()
+{
+}
+
 void AssetUpdateTask::executeTask()
 {
-	setStatus(tr("Updating assets index..."));
-	auto components = m_inst->getComponentList();
-	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()));
+    setStatus(tr("Updating assets index..."));
+    auto components = m_inst->getComponentList();
+    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()));
 
-	auto metacache = ENV.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);
+    auto metacache = ENV.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);
+    downloadJob.reset(job);
 
-	connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::assetIndexFinished);
-	connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetIndexFailed);
-	connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
+    connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::assetIndexFinished);
+    connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetIndexFailed);
+    connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
 
-	qDebug() << m_inst->name() << ": Starting asset index download";
-	downloadJob->start();
+    qDebug() << m_inst->name() << ": Starting asset index download";
+    downloadJob->start();
 }
 
 bool AssetUpdateTask::canAbort() const
 {
-	return true;
+    return true;
 }
 
 void AssetUpdateTask::assetIndexFinished()
 {
-	AssetsIndex index;
-	qDebug() << m_inst->name() << ": Finished asset index download";
+    AssetsIndex index;
+    qDebug() << m_inst->name() << ": Finished asset index download";
 
-	auto components = m_inst->getComponentList();
-	auto profile = components->getProfile();
-	auto assets = profile->getMinecraftAssets();
+    auto components = m_inst->getComponentList();
+    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 = ENV.metacache();
-		auto entry = metacache->resolveEntry("asset_indexes", assets->id + ".json");
-		metacache->evictEntry(entry);
-		emitFailed(tr("Failed to read the assets index!"));
-	}
+    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 = ENV.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::progress, this, &AssetUpdateTask::progress);
-		downloadJob->start();
-		return;
-	}
-	emitSucceeded();
+    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::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));
+    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));
+    emitFailed(tr("Failed to download assets:\n%1").arg(reason));
 }
 
 bool AssetUpdateTask::abort()
 {
-	if(downloadJob)
-	{
-		return downloadJob->abort();
-	}
-	else
-	{
-		qWarning() << "Prematurely aborted FMLLibrariesTask";
-	}
-	return true;
+    if(downloadJob)
+    {
+        return downloadJob->abort();
+    }
+    else
+    {
+        qWarning() << "Prematurely aborted AssetUpdateTask";
+    }
+    return true;
 }