2022-07-09 03:14:43 +05:30
|
|
|
#include "FlameInstanceCreationTask.h"
|
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
#include "modplatform/flame/FlameAPI.h"
|
2022-07-09 03:14:43 +05:30
|
|
|
#include "modplatform/flame/PackManifest.h"
|
|
|
|
|
|
|
|
#include "Application.h"
|
|
|
|
#include "FileSystem.h"
|
2022-07-15 00:43:23 +05:30
|
|
|
#include "InstanceList.h"
|
2022-07-09 03:14:43 +05:30
|
|
|
#include "Json.h"
|
|
|
|
|
|
|
|
#include "minecraft/MinecraftInstance.h"
|
|
|
|
#include "minecraft/PackProfile.h"
|
|
|
|
|
2022-08-01 01:15:01 +05:30
|
|
|
#include "modplatform/helpers/OverrideUtils.h"
|
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
#include "settings/INISettingsObject.h"
|
|
|
|
|
|
|
|
#include "ui/dialogs/BlockedModsDialog.h"
|
2022-09-11 21:46:25 +05:30
|
|
|
#include "ui/dialogs/CustomMessageBox.h"
|
2022-07-09 03:14:43 +05:30
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
const static QMap<QString, QString> forgemap = { { "1.2.5", "3.4.9.171" },
|
|
|
|
{ "1.4.2", "6.0.1.355" },
|
|
|
|
{ "1.4.7", "6.6.2.534" },
|
|
|
|
{ "1.5.2", "7.8.1.737" } };
|
|
|
|
|
|
|
|
static const FlameAPI api;
|
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
bool FlameCreationTask::abort()
|
|
|
|
{
|
2022-08-01 02:51:59 +05:30
|
|
|
if (!canAbort())
|
|
|
|
return false;
|
|
|
|
|
2022-08-06 05:55:21 +05:30
|
|
|
m_abort = true;
|
2022-07-15 01:11:49 +05:30
|
|
|
if (m_process_update_file_info_job)
|
|
|
|
m_process_update_file_info_job->abort();
|
2022-07-09 03:14:43 +05:30
|
|
|
if (m_files_job)
|
|
|
|
m_files_job->abort();
|
|
|
|
if (m_mod_id_resolver)
|
|
|
|
m_mod_id_resolver->abort();
|
|
|
|
|
2022-08-01 02:51:59 +05:30
|
|
|
return Task::abort();
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
bool FlameCreationTask::updateInstance()
|
|
|
|
{
|
|
|
|
auto instance_list = APPLICATION->instances();
|
|
|
|
|
|
|
|
// FIXME: How to handle situations when there's more than one install already for a given modpack?
|
|
|
|
auto inst = instance_list->getInstanceByManagedName(originalName());
|
|
|
|
|
|
|
|
if (!inst) {
|
|
|
|
inst = instance_list->getInstanceById(originalName());
|
|
|
|
|
|
|
|
if (!inst)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString index_path(FS::PathCombine(m_stagingPath, "manifest.json"));
|
|
|
|
|
|
|
|
try {
|
|
|
|
Flame::loadManifest(m_pack, index_path);
|
|
|
|
} catch (const JSONValidationError& e) {
|
|
|
|
setError(tr("Could not understand pack manifest:\n") + e.cause());
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto version_id = inst->getManagedPackVersionName();
|
|
|
|
auto version_str = !version_id.isEmpty() ? tr(" (version %1)").arg(version_id) : "";
|
|
|
|
|
2022-08-01 04:59:12 +05:30
|
|
|
auto info = CustomMessageBox::selectable(
|
|
|
|
m_parent, tr("Similar modpack was found!"),
|
|
|
|
tr("One or more of your instances are from this same modpack%1. Do you want to create a "
|
|
|
|
"separate instance, or update the existing one?\n\nNOTE: Make sure you made a backup of your important instance data before "
|
|
|
|
"updating, as worlds can be corrupted and some configuration may be lost (due to pack overrides).")
|
|
|
|
.arg(version_str), QMessageBox::Information, QMessageBox::Ok | QMessageBox::Reset | QMessageBox::Abort);
|
2022-07-15 01:11:49 +05:30
|
|
|
info->setButtonText(QMessageBox::Ok, tr("Update existing instance"));
|
|
|
|
info->setButtonText(QMessageBox::Abort, tr("Create new instance"));
|
2022-08-01 04:59:12 +05:30
|
|
|
info->setButtonText(QMessageBox::Reset, tr("Cancel"));
|
2022-07-15 01:11:49 +05:30
|
|
|
|
2022-08-01 04:59:12 +05:30
|
|
|
info->exec();
|
|
|
|
|
|
|
|
if (info->clickedButton() == info->button(QMessageBox::Abort))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (info->clickedButton() == info->button(QMessageBox::Reset)) {
|
|
|
|
m_abort = true;
|
2022-07-15 01:11:49 +05:30
|
|
|
return false;
|
2022-08-01 04:59:12 +05:30
|
|
|
}
|
2022-07-15 01:11:49 +05:30
|
|
|
|
|
|
|
QDir old_inst_dir(inst->instanceRoot());
|
|
|
|
|
2022-08-01 01:15:01 +05:30
|
|
|
QString old_index_folder(FS::PathCombine(old_inst_dir.absolutePath(), "flame"));
|
|
|
|
QString old_index_path(FS::PathCombine(old_index_folder, "manifest.json"));
|
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
QFileInfo old_index_file(old_index_path);
|
|
|
|
if (old_index_file.exists()) {
|
|
|
|
Flame::Manifest old_pack;
|
|
|
|
Flame::loadManifest(old_pack, old_index_path);
|
|
|
|
|
|
|
|
auto& old_files = old_pack.files;
|
|
|
|
|
|
|
|
auto& files = m_pack.files;
|
|
|
|
|
2022-08-01 01:15:01 +05:30
|
|
|
// Remove repeated files, we don't need to download them!
|
2022-07-15 01:11:49 +05:30
|
|
|
auto files_iterator = files.begin();
|
|
|
|
while (files_iterator != files.end()) {
|
|
|
|
auto const& file = files_iterator;
|
|
|
|
|
|
|
|
auto old_file = old_files.find(file.key());
|
|
|
|
if (old_file != old_files.end()) {
|
|
|
|
// We found a match, but is it a different version?
|
|
|
|
if (old_file->fileId == file->fileId) {
|
|
|
|
qDebug() << "Removed file at" << file->targetFolder << "with id" << file->fileId << "from list of downloads";
|
|
|
|
|
|
|
|
old_files.remove(file.key());
|
|
|
|
files_iterator = files.erase(files_iterator);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
files_iterator++;
|
|
|
|
}
|
2022-08-01 01:15:01 +05:30
|
|
|
|
fix: move file deletion to the end of the instance update
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-06 05:56:02 +05:30
|
|
|
QDir old_minecraft_dir(inst->gameRoot());
|
2022-08-01 01:15:01 +05:30
|
|
|
|
|
|
|
// We will remove all the previous overrides, to prevent duplicate files!
|
|
|
|
// TODO: Currently 'overrides' will always override the stuff on update. How do we preserve unchanged overrides?
|
|
|
|
// FIXME: We may want to do something about disabled mods.
|
|
|
|
auto old_overrides = Override::readOverrides("overrides", old_index_folder);
|
2022-09-26 15:20:31 +05:30
|
|
|
for (const auto& entry : old_overrides) {
|
fix: move file deletion to the end of the instance update
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-06 05:56:02 +05:30
|
|
|
if (entry.isEmpty())
|
|
|
|
continue;
|
|
|
|
qDebug() << "Scheduling" << entry << "for removal";
|
|
|
|
m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(entry));
|
2022-08-01 01:15:01 +05:30
|
|
|
}
|
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
// Remove remaining old files (we need to do an API request to know which ids are which files...)
|
|
|
|
QStringList fileIds;
|
|
|
|
|
|
|
|
for (auto& file : old_files) {
|
|
|
|
fileIds.append(QString::number(file.fileId));
|
|
|
|
}
|
|
|
|
|
|
|
|
auto* raw_response = new QByteArray;
|
|
|
|
auto job = api.getFiles(fileIds, raw_response);
|
|
|
|
|
|
|
|
QEventLoop loop;
|
|
|
|
|
fix: move file deletion to the end of the instance update
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-06 05:56:02 +05:30
|
|
|
connect(job, &NetJob::succeeded, this, [this, raw_response, fileIds, old_inst_dir, &old_files, old_minecraft_dir] {
|
2022-07-15 01:11:49 +05:30
|
|
|
// Parse the API response
|
|
|
|
QJsonParseError parse_error{};
|
|
|
|
auto doc = QJsonDocument::fromJson(*raw_response, &parse_error);
|
|
|
|
if (parse_error.error != QJsonParseError::NoError) {
|
|
|
|
qWarning() << "Error while parsing JSON response from Flame files task at " << parse_error.offset
|
|
|
|
<< " reason: " << parse_error.errorString();
|
|
|
|
qWarning() << *raw_response;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
|
|
QJsonArray entries;
|
|
|
|
if (fileIds.size() == 1)
|
|
|
|
entries = { Json::requireObject(Json::requireObject(doc), "data") };
|
|
|
|
else
|
|
|
|
entries = Json::requireArray(Json::requireObject(doc), "data");
|
|
|
|
|
|
|
|
for (auto entry : entries) {
|
|
|
|
auto entry_obj = Json::requireObject(entry);
|
|
|
|
|
|
|
|
Flame::File file;
|
|
|
|
// We don't care about blocked mods, we just need local data to delete the file
|
|
|
|
file.parseFromObject(entry_obj, false);
|
|
|
|
|
|
|
|
auto id = Json::requireInteger(entry_obj, "id");
|
|
|
|
old_files.insert(id, file);
|
|
|
|
}
|
|
|
|
} catch (Json::JsonException& e) {
|
|
|
|
qCritical() << e.cause() << e.what();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete the files
|
|
|
|
for (auto& file : old_files) {
|
|
|
|
if (file.fileName.isEmpty() || file.targetFolder.isEmpty())
|
|
|
|
continue;
|
|
|
|
|
fix: move file deletion to the end of the instance update
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-06 05:56:02 +05:30
|
|
|
QString relative_path(FS::PathCombine(file.targetFolder, file.fileName));
|
|
|
|
qDebug() << "Scheduling" << relative_path << "for removal";
|
|
|
|
m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(relative_path));
|
2022-07-15 01:11:49 +05:30
|
|
|
}
|
|
|
|
});
|
|
|
|
connect(job, &NetJob::finished, &loop, &QEventLoop::quit);
|
|
|
|
|
|
|
|
m_process_update_file_info_job = job;
|
|
|
|
job->start();
|
|
|
|
|
|
|
|
loop.exec();
|
|
|
|
|
|
|
|
m_process_update_file_info_job = nullptr;
|
2022-08-21 18:30:23 +05:30
|
|
|
} else {
|
|
|
|
// We don't have an old index file, so we may duplicate stuff!
|
|
|
|
auto dialog = CustomMessageBox::selectable(m_parent,
|
|
|
|
tr("No index file."),
|
|
|
|
tr("We couldn't find a suitable index file for the older version. This may cause some of the files to be duplicated. Do you want to continue?"),
|
|
|
|
QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Cancel);
|
|
|
|
|
|
|
|
if (dialog->exec() == QDialog::DialogCode::Rejected) {
|
|
|
|
m_abort = true;
|
|
|
|
return false;
|
|
|
|
}
|
2022-07-15 01:11:49 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
setOverride(true);
|
|
|
|
qDebug() << "Will override instance!";
|
|
|
|
|
2022-08-01 04:26:14 +05:30
|
|
|
m_instance = inst;
|
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
// We let it go through the createInstance() stage, just with a couple modifications for updating
|
|
|
|
return false;
|
|
|
|
}
|
2022-07-09 03:14:43 +05:30
|
|
|
|
|
|
|
bool FlameCreationTask::createInstance()
|
|
|
|
{
|
|
|
|
QEventLoop loop;
|
|
|
|
|
2022-08-01 01:15:01 +05:30
|
|
|
QString parent_folder(FS::PathCombine(m_stagingPath, "flame"));
|
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
try {
|
2022-07-15 01:11:49 +05:30
|
|
|
QString index_path(FS::PathCombine(m_stagingPath, "manifest.json"));
|
|
|
|
if (!m_pack.is_loaded)
|
|
|
|
Flame::loadManifest(m_pack, index_path);
|
|
|
|
|
|
|
|
// Keep index file in case we need it some other time (like when changing versions)
|
2022-08-01 01:15:01 +05:30
|
|
|
QString new_index_place(FS::PathCombine(parent_folder, "manifest.json"));
|
2022-07-15 01:11:49 +05:30
|
|
|
FS::ensureFilePathExists(new_index_place);
|
|
|
|
QFile::rename(index_path, new_index_place);
|
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
} catch (const JSONValidationError& e) {
|
|
|
|
setError(tr("Could not understand pack manifest:\n") + e.cause());
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
if (!m_pack.overrides.isEmpty()) {
|
|
|
|
QString overridePath = FS::PathCombine(m_stagingPath, m_pack.overrides);
|
2022-07-09 03:14:43 +05:30
|
|
|
if (QFile::exists(overridePath)) {
|
2022-08-01 01:15:01 +05:30
|
|
|
// Create a list of overrides in "overrides.txt" inside flame/
|
|
|
|
Override::createOverrides("overrides", parent_folder, overridePath);
|
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
QString mcPath = FS::PathCombine(m_stagingPath, "minecraft");
|
|
|
|
if (!QFile::rename(overridePath, mcPath)) {
|
2022-07-15 01:11:49 +05:30
|
|
|
setError(tr("Could not rename the overrides folder:\n") + m_pack.overrides);
|
2022-07-09 03:14:43 +05:30
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
logWarning(
|
2022-07-15 01:11:49 +05:30
|
|
|
tr("The specified overrides folder (%1) is missing. Maybe the modpack was already used before?").arg(m_pack.overrides));
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
QString forgeVersion;
|
|
|
|
QString fabricVersion;
|
|
|
|
// TODO: is Quilt relevant here?
|
2022-07-15 01:11:49 +05:30
|
|
|
for (auto& loader : m_pack.minecraft.modLoaders) {
|
2022-07-09 03:14:43 +05:30
|
|
|
auto id = loader.id;
|
|
|
|
if (id.startsWith("forge-")) {
|
|
|
|
id.remove("forge-");
|
|
|
|
forgeVersion = id;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (id.startsWith("fabric-")) {
|
|
|
|
id.remove("fabric-");
|
|
|
|
fabricVersion = id;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
logWarning(tr("Unknown mod loader in manifest: %1").arg(id));
|
|
|
|
}
|
|
|
|
|
|
|
|
QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg");
|
|
|
|
auto instanceSettings = std::make_shared<INISettingsObject>(configPath);
|
|
|
|
MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
|
2022-07-15 01:11:49 +05:30
|
|
|
auto mcVersion = m_pack.minecraft.version;
|
2022-07-09 03:14:43 +05:30
|
|
|
|
|
|
|
// Hack to correct some 'special sauce'...
|
|
|
|
if (mcVersion.endsWith('.')) {
|
|
|
|
mcVersion.remove(QRegularExpression("[.]+$"));
|
|
|
|
logWarning(tr("Mysterious trailing dots removed from Minecraft version while importing pack."));
|
|
|
|
}
|
|
|
|
|
|
|
|
auto components = instance.getPackProfile();
|
|
|
|
components->buildingFromScratch();
|
|
|
|
components->setComponentVersion("net.minecraft", mcVersion, true);
|
|
|
|
if (!forgeVersion.isEmpty()) {
|
|
|
|
// FIXME: dirty, nasty, hack. Proper solution requires dependency resolution and knowledge of the metadata.
|
|
|
|
if (forgeVersion == "recommended") {
|
|
|
|
if (forgemap.contains(mcVersion)) {
|
|
|
|
forgeVersion = forgemap[mcVersion];
|
|
|
|
} else {
|
|
|
|
logWarning(tr("Could not map recommended Forge version for Minecraft %1").arg(mcVersion));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
components->setComponentVersion("net.minecraftforge", forgeVersion);
|
|
|
|
}
|
|
|
|
if (!fabricVersion.isEmpty())
|
|
|
|
components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
|
|
|
|
|
|
|
|
if (m_instIcon != "default") {
|
|
|
|
instance.setIconKey(m_instIcon);
|
|
|
|
} else {
|
2022-07-15 01:11:49 +05:30
|
|
|
if (m_pack.name.contains("Direwolf20")) {
|
2022-07-09 03:14:43 +05:30
|
|
|
instance.setIconKey("steve");
|
2022-07-15 01:11:49 +05:30
|
|
|
} else if (m_pack.name.contains("FTB") || m_pack.name.contains("Feed The Beast")) {
|
2022-07-09 03:14:43 +05:30
|
|
|
instance.setIconKey("ftb_logo");
|
|
|
|
} else {
|
|
|
|
instance.setIconKey("flame");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
QString jarmodsPath = FS::PathCombine(m_stagingPath, "minecraft", "jarmods");
|
|
|
|
QFileInfo jarmodsInfo(jarmodsPath);
|
|
|
|
if (jarmodsInfo.isDir()) {
|
|
|
|
// install all the jar mods
|
|
|
|
qDebug() << "Found jarmods:";
|
|
|
|
QDir jarmodsDir(jarmodsPath);
|
|
|
|
QStringList jarMods;
|
2022-09-26 15:20:31 +05:30
|
|
|
for (const auto& info : jarmodsDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files)) {
|
2022-07-09 03:14:43 +05:30
|
|
|
qDebug() << info.fileName();
|
|
|
|
jarMods.push_back(info.absoluteFilePath());
|
|
|
|
}
|
|
|
|
auto profile = instance.getPackProfile();
|
|
|
|
profile->installJarMods(jarMods);
|
|
|
|
// nuke the original files
|
|
|
|
FS::deletePath(jarmodsPath);
|
|
|
|
}
|
|
|
|
|
2022-07-15 00:43:23 +05:30
|
|
|
instance.setManagedPack("flame", {}, m_pack.name, {}, m_pack.version);
|
|
|
|
instance.setName(name());
|
2022-07-09 03:14:43 +05:30
|
|
|
|
2022-07-15 01:11:49 +05:30
|
|
|
m_mod_id_resolver = new Flame::FileResolvingTask(APPLICATION->network(), m_pack);
|
|
|
|
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::succeeded, this, [this, &loop] { idResolverSucceeded(loop); });
|
2022-07-09 03:14:43 +05:30
|
|
|
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::failed, [&](QString reason) {
|
|
|
|
m_mod_id_resolver.reset();
|
|
|
|
setError(tr("Unable to resolve mod IDs:\n") + reason);
|
|
|
|
});
|
|
|
|
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::progress, this, &FlameCreationTask::setProgress);
|
|
|
|
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::status, this, &FlameCreationTask::setStatus);
|
|
|
|
|
|
|
|
m_mod_id_resolver->start();
|
|
|
|
|
|
|
|
loop.exec();
|
|
|
|
|
fix: move file deletion to the end of the instance update
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-06 05:56:02 +05:30
|
|
|
bool did_succeed = getError().isEmpty();
|
|
|
|
|
2022-09-11 21:46:25 +05:30
|
|
|
// Update information of the already installed instance, if any.
|
fix: move file deletion to the end of the instance update
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-06 05:56:02 +05:30
|
|
|
if (m_instance && did_succeed) {
|
2022-08-21 17:56:27 +05:30
|
|
|
setAbortable(false);
|
2022-08-01 04:26:14 +05:30
|
|
|
auto inst = m_instance.value();
|
|
|
|
|
2022-09-11 21:46:25 +05:30
|
|
|
// Only change the name if it didn't use a custom name, so that the previous custom name
|
|
|
|
// is preserved, but if we're using the original one, we update the version string.
|
|
|
|
// NOTE: This needs to come before the copyManagedPack call!
|
|
|
|
if (inst->name().contains(inst->getManagedPackVersionName())) {
|
|
|
|
if (askForChangingInstanceName(m_parent, inst->name(), instance.name()) == InstanceNameChange::ShouldChange)
|
|
|
|
inst->setName(instance.name());
|
|
|
|
}
|
|
|
|
|
2022-08-01 04:26:14 +05:30
|
|
|
inst->copyManagedPack(instance);
|
|
|
|
}
|
|
|
|
|
fix: move file deletion to the end of the instance update
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-06 05:56:02 +05:30
|
|
|
return did_succeed;
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
|
|
|
|
{
|
|
|
|
auto results = m_mod_id_resolver->getResults();
|
2022-07-22 01:13:08 +05:30
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
// first check for blocked mods
|
2022-10-24 16:38:38 +05:30
|
|
|
QList<BlockedMod> blocked_mods;
|
2022-07-09 03:14:43 +05:30
|
|
|
auto anyBlocked = false;
|
|
|
|
for (const auto& result : results.files.values()) {
|
|
|
|
if (!result.resolved || result.url.isEmpty()) {
|
2022-10-24 16:38:38 +05:30
|
|
|
|
|
|
|
BlockedMod blocked_mod;
|
|
|
|
blocked_mod.name = result.fileName;
|
|
|
|
blocked_mod.websiteUrl = result.websiteUrl;
|
|
|
|
blocked_mod.hash = result.hash;
|
|
|
|
blocked_mod.matched = false;
|
|
|
|
blocked_mod.localPath = "";
|
|
|
|
|
|
|
|
blocked_mods.append(blocked_mod);
|
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
anyBlocked = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (anyBlocked) {
|
|
|
|
qWarning() << "Blocked mods found, displaying mod list";
|
|
|
|
|
|
|
|
auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked mods found"),
|
2022-11-12 06:35:19 +05:30
|
|
|
tr("The following files are not available for download in third party launchers.<br/>"
|
|
|
|
"You will need to manually download them and add them to the instance."),
|
|
|
|
blocked_mods);
|
|
|
|
|
2022-07-09 03:14:43 +05:30
|
|
|
message_dialog->setModal(true);
|
|
|
|
|
|
|
|
if (message_dialog->exec()) {
|
2022-11-11 18:11:32 +05:30
|
|
|
qDebug() << "Post dialog blocked mods list: " << blocked_mods;
|
2022-10-25 23:29:37 +05:30
|
|
|
copyBlockedMods(blocked_mods);
|
2022-07-22 01:13:08 +05:30
|
|
|
setupDownloadJob(loop);
|
2022-07-09 03:14:43 +05:30
|
|
|
} else {
|
|
|
|
m_mod_id_resolver.reset();
|
|
|
|
setError("Canceled");
|
2022-08-01 01:15:01 +05:30
|
|
|
loop.quit();
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|
|
|
|
} else {
|
2022-07-22 01:13:08 +05:30
|
|
|
setupDownloadJob(loop);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-10-26 08:48:14 +05:30
|
|
|
/// @brief copy the matched blocked mods to the instance staging area
|
|
|
|
/// @param blocked_mods list of the blocked mods and their matched paths
|
2022-11-01 19:36:36 +05:30
|
|
|
void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
|
|
|
|
{
|
2022-10-25 23:29:37 +05:30
|
|
|
setStatus(tr("Copying Blocked Mods..."));
|
|
|
|
setAbortable(false);
|
|
|
|
int i = 0;
|
|
|
|
int total = blocked_mods.length();
|
|
|
|
setProgress(i, total);
|
2022-11-01 19:36:36 +05:30
|
|
|
for (auto const& mod : blocked_mods) {
|
2022-10-31 11:12:35 +05:30
|
|
|
if (!mod.matched) {
|
|
|
|
qDebug() << mod.name << "was not matched to a local file, skipping copy";
|
2022-10-25 23:29:37 +05:30
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2022-10-31 11:12:35 +05:30
|
|
|
auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", "mods", mod.name);
|
2022-10-25 23:29:37 +05:30
|
|
|
|
|
|
|
setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));
|
|
|
|
|
2022-10-31 11:12:35 +05:30
|
|
|
qDebug() << "Will try to copy" << mod.localPath << "to" << dest_path;
|
2022-10-25 23:29:37 +05:30
|
|
|
|
2022-11-01 19:36:36 +05:30
|
|
|
if (!FS::copy(mod.localPath, dest_path)()) {
|
2022-10-31 11:12:35 +05:30
|
|
|
qDebug() << "Copy of" << mod.localPath << "to" << dest_path << "Failed";
|
2022-11-01 19:36:36 +05:30
|
|
|
}
|
2022-10-25 23:29:37 +05:30
|
|
|
|
2022-10-31 11:12:35 +05:30
|
|
|
i++;
|
|
|
|
setProgress(i, total);
|
2022-10-25 23:29:37 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
setAbortable(true);
|
|
|
|
}
|
|
|
|
|
2022-07-22 01:13:08 +05:30
|
|
|
void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
|
|
|
|
{
|
|
|
|
m_files_job = new NetJob(tr("Mod download"), APPLICATION->network());
|
|
|
|
for (const auto& result : m_mod_id_resolver->getResults().files) {
|
|
|
|
QString filename = result.fileName;
|
|
|
|
if (!result.required) {
|
|
|
|
filename += ".disabled";
|
|
|
|
}
|
2022-07-09 03:14:43 +05:30
|
|
|
|
2022-07-22 01:13:08 +05:30
|
|
|
auto relpath = FS::PathCombine("minecraft", result.targetFolder, filename);
|
|
|
|
auto path = FS::PathCombine(m_stagingPath, relpath);
|
2022-07-09 03:14:43 +05:30
|
|
|
|
2022-07-22 01:13:08 +05:30
|
|
|
switch (result.type) {
|
|
|
|
case Flame::File::Type::Folder: {
|
|
|
|
logWarning(tr("This 'Folder' may need extracting: %1").arg(relpath));
|
|
|
|
// fall-through intentional, we treat these as plain old mods and dump them wherever.
|
|
|
|
}
|
|
|
|
case Flame::File::Type::SingleFile:
|
|
|
|
case Flame::File::Type::Mod: {
|
|
|
|
if (!result.url.isEmpty()) {
|
|
|
|
qDebug() << "Will download" << result.url << "to" << path;
|
|
|
|
auto dl = Net::Download::makeFile(result.url, path);
|
|
|
|
m_files_job->addNetAction(dl);
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|
2022-07-22 01:13:08 +05:30
|
|
|
break;
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|
2022-07-22 01:13:08 +05:30
|
|
|
case Flame::File::Type::Modpack:
|
|
|
|
logWarning(tr("Nesting modpacks in modpacks is not implemented, nothing was downloaded: %1").arg(relpath));
|
|
|
|
break;
|
|
|
|
case Flame::File::Type::Cmod2:
|
|
|
|
case Flame::File::Type::Ctoc:
|
|
|
|
case Flame::File::Type::Unknown:
|
|
|
|
logWarning(tr("Unrecognized/unhandled PackageType for: %1").arg(relpath));
|
|
|
|
break;
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|
2022-07-22 01:13:08 +05:30
|
|
|
}
|
2022-07-09 03:14:43 +05:30
|
|
|
|
2022-07-22 01:13:08 +05:30
|
|
|
m_mod_id_resolver.reset();
|
|
|
|
connect(m_files_job.get(), &NetJob::succeeded, this, [&]() {
|
|
|
|
m_files_job.reset();
|
|
|
|
});
|
|
|
|
connect(m_files_job.get(), &NetJob::failed, [&](QString reason) {
|
|
|
|
m_files_job.reset();
|
|
|
|
setError(reason);
|
|
|
|
});
|
2022-10-31 11:12:35 +05:30
|
|
|
connect(m_files_job.get(), &NetJob::progress, this, &FlameCreationTask::setProgress);
|
2022-07-22 01:13:08 +05:30
|
|
|
connect(m_files_job.get(), &NetJob::finished, &loop, &QEventLoop::quit);
|
2022-07-09 03:14:43 +05:30
|
|
|
|
2022-07-22 01:13:08 +05:30
|
|
|
setStatus(tr("Downloading mods..."));
|
|
|
|
m_files_job->start();
|
2022-07-09 03:14:43 +05:30
|
|
|
}
|