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.
98 lines
3.1 KiB
C++
98 lines
3.1 KiB
C++
#include "LibrariesTask.h"
|
|
|
|
#include "minecraft/MinecraftInstance.h"
|
|
#include "minecraft/PackProfile.h"
|
|
|
|
#include "Application.h"
|
|
|
|
LibrariesTask::LibrariesTask(MinecraftInstance * inst)
|
|
{
|
|
m_inst = inst;
|
|
}
|
|
|
|
void LibrariesTask::executeTask()
|
|
{
|
|
setStatus(tr("Getting the library files from Mojang..."));
|
|
qDebug() << m_inst->name() << ": downloading libraries";
|
|
MinecraftInstance *inst = (MinecraftInstance *)m_inst;
|
|
|
|
// Build a list of URLs that will need to be downloaded.
|
|
auto components = inst->getPackProfile();
|
|
auto profile = components->getProfile();
|
|
|
|
auto job = new NetJob(tr("Libraries for instance %1").arg(inst->name()), APPLICATION->network());
|
|
downloadJob.reset(job);
|
|
|
|
auto metacache = APPLICATION->metacache();
|
|
|
|
auto processArtifactPool = [&](const QList<LibraryPtr> & pool, QStringList & errors, const QString & localPath)
|
|
{
|
|
for (auto lib : pool)
|
|
{
|
|
if(!lib)
|
|
{
|
|
emitFailed(tr("Null jar is specified in the metadata, aborting."));
|
|
return false;
|
|
}
|
|
auto dls = lib->getDownloads(currentSystem, metacache.get(), errors, localPath);
|
|
for(auto dl : dls)
|
|
{
|
|
downloadJob->addNetAction(dl);
|
|
}
|
|
}
|
|
return true;
|
|
};
|
|
|
|
QStringList failedLocalLibraries;
|
|
QList<LibraryPtr> libArtifactPool;
|
|
libArtifactPool.append(profile->getLibraries());
|
|
libArtifactPool.append(profile->getNativeLibraries());
|
|
libArtifactPool.append(profile->getMavenFiles());
|
|
for (auto agent : profile->getAgents())
|
|
{
|
|
libArtifactPool.append(agent->library());
|
|
}
|
|
libArtifactPool.append(profile->getMainJar());
|
|
processArtifactPool(libArtifactPool, failedLocalLibraries, inst->getLocalLibraryPath());
|
|
|
|
QStringList failedLocalJarMods;
|
|
processArtifactPool(profile->getJarMods(), failedLocalJarMods, inst->jarModsDir());
|
|
|
|
if (!failedLocalJarMods.empty() || !failedLocalLibraries.empty())
|
|
{
|
|
downloadJob.reset();
|
|
QString failed_all = (failedLocalLibraries + failedLocalJarMods).join("\n");
|
|
emitFailed(tr("Some artifacts marked as 'local' are missing their files:\n%1\n\nYou need to either add the files, or removed the packages that require them.\nYou'll have to correct this problem manually.").arg(failed_all));
|
|
return;
|
|
}
|
|
|
|
connect(downloadJob.get(), &NetJob::succeeded, this, &LibrariesTask::emitSucceeded);
|
|
connect(downloadJob.get(), &NetJob::failed, this, &LibrariesTask::jarlibFailed);
|
|
connect(downloadJob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
|
|
connect(downloadJob.get(), &NetJob::progress, this, &LibrariesTask::progress);
|
|
downloadJob->start();
|
|
}
|
|
|
|
bool LibrariesTask::canAbort() const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void LibrariesTask::jarlibFailed(QString reason)
|
|
{
|
|
emitFailed(tr("Game update failed: it was impossible to fetch the required libraries.\nReason:\n%1").arg(reason));
|
|
}
|
|
|
|
bool LibrariesTask::abort()
|
|
{
|
|
if(downloadJob)
|
|
{
|
|
return downloadJob->abort();
|
|
}
|
|
else
|
|
{
|
|
qWarning() << "Prematurely aborted LibrariesTask";
|
|
}
|
|
return true;
|
|
}
|