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.
135 lines
4.0 KiB
C++
135 lines
4.0 KiB
C++
#include "FMLLibrariesTask.h"
|
|
|
|
#include "FileSystem.h"
|
|
#include "minecraft/VersionFilterData.h"
|
|
#include "minecraft/MinecraftInstance.h"
|
|
#include "minecraft/PackProfile.h"
|
|
|
|
#include "BuildConfig.h"
|
|
#include "Application.h"
|
|
|
|
FMLLibrariesTask::FMLLibrariesTask(MinecraftInstance * inst)
|
|
{
|
|
m_inst = inst;
|
|
}
|
|
void FMLLibrariesTask::executeTask()
|
|
{
|
|
// Get the mod list
|
|
MinecraftInstance *inst = (MinecraftInstance *)m_inst;
|
|
auto components = inst->getPackProfile();
|
|
auto profile = components->getProfile();
|
|
|
|
if (!profile->hasTrait("legacyFML"))
|
|
{
|
|
emitSucceeded();
|
|
return;
|
|
}
|
|
|
|
QString version = components->getComponentVersion("net.minecraft");
|
|
auto &fmlLibsMapping = g_VersionFilterData.fmlLibsMapping;
|
|
if (!fmlLibsMapping.contains(version))
|
|
{
|
|
emitSucceeded();
|
|
return;
|
|
}
|
|
|
|
auto &libList = fmlLibsMapping[version];
|
|
|
|
// determine if we need some libs for FML or forge
|
|
setStatus(tr("Checking for FML libraries..."));
|
|
if(!components->getComponent("net.minecraftforge"))
|
|
{
|
|
emitSucceeded();
|
|
return;
|
|
}
|
|
|
|
// now check the lib folder inside the instance for files.
|
|
for (auto &lib : libList)
|
|
{
|
|
QFileInfo libInfo(FS::PathCombine(inst->libDir(), lib.filename));
|
|
if (libInfo.exists())
|
|
continue;
|
|
fmlLibsToProcess.append(lib);
|
|
}
|
|
|
|
// if everything is in place, there's nothing to do here...
|
|
if (fmlLibsToProcess.isEmpty())
|
|
{
|
|
emitSucceeded();
|
|
return;
|
|
}
|
|
|
|
// download missing libs to our place
|
|
setStatus(tr("Downloading FML libraries..."));
|
|
auto dljob = new NetJob("FML libraries", APPLICATION->network());
|
|
auto metacache = APPLICATION->metacache();
|
|
for (auto &lib : fmlLibsToProcess)
|
|
{
|
|
auto entry = metacache->resolveEntry("fmllibs", lib.filename);
|
|
QString urlString = BuildConfig.FMLLIBS_BASE_URL + lib.filename;
|
|
dljob->addNetAction(Net::Download::makeCached(QUrl(urlString), entry));
|
|
}
|
|
|
|
connect(dljob, &NetJob::succeeded, this, &FMLLibrariesTask::fmllibsFinished);
|
|
connect(dljob, &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed);
|
|
connect(dljob, &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
|
|
connect(dljob, &NetJob::progress, this, &FMLLibrariesTask::progress);
|
|
downloadJob.reset(dljob);
|
|
downloadJob->start();
|
|
}
|
|
|
|
bool FMLLibrariesTask::canAbort() const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void FMLLibrariesTask::fmllibsFinished()
|
|
{
|
|
downloadJob.reset();
|
|
if (!fmlLibsToProcess.isEmpty())
|
|
{
|
|
setStatus(tr("Copying FML libraries into the instance..."));
|
|
MinecraftInstance *inst = (MinecraftInstance *)m_inst;
|
|
auto metacache = APPLICATION->metacache();
|
|
int index = 0;
|
|
for (auto &lib : fmlLibsToProcess)
|
|
{
|
|
progress(index, fmlLibsToProcess.size());
|
|
auto entry = metacache->resolveEntry("fmllibs", lib.filename);
|
|
auto path = FS::PathCombine(inst->libDir(), lib.filename);
|
|
if (!FS::ensureFilePathExists(path))
|
|
{
|
|
emitFailed(tr("Failed creating FML library folder inside the instance."));
|
|
return;
|
|
}
|
|
if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->libDir(), lib.filename)))
|
|
{
|
|
emitFailed(tr("Failed copying Forge/FML library: %1.").arg(lib.filename));
|
|
return;
|
|
}
|
|
index++;
|
|
}
|
|
progress(index, fmlLibsToProcess.size());
|
|
}
|
|
emitSucceeded();
|
|
}
|
|
void FMLLibrariesTask::fmllibsFailed(QString reason)
|
|
{
|
|
QStringList failed = downloadJob->getFailedFiles();
|
|
QString failed_all = failed.join("\n");
|
|
emitFailed(tr("Failed to download the following files:\n%1\n\nReason:%2\nPlease try again.").arg(failed_all, reason));
|
|
}
|
|
|
|
bool FMLLibrariesTask::abort()
|
|
{
|
|
if(downloadJob)
|
|
{
|
|
return downloadJob->abort();
|
|
}
|
|
else
|
|
{
|
|
qWarning() << "Prematurely aborted FMLLibrariesTask";
|
|
}
|
|
return true;
|
|
}
|