2022-07-08 05:40:41 +05:30
|
|
|
#include "ModrinthInstanceCreationTask.h"
|
|
|
|
|
|
|
|
#include "Application.h"
|
|
|
|
#include "FileSystem.h"
|
2022-07-08 21:30:44 +05:30
|
|
|
#include "InstanceList.h"
|
2022-07-08 05:40:41 +05:30
|
|
|
#include "Json.h"
|
|
|
|
|
|
|
|
#include "minecraft/PackProfile.h"
|
|
|
|
|
2022-07-29 07:05:40 +05:30
|
|
|
#include "modplatform/helpers/OverrideUtils.h"
|
|
|
|
|
2022-07-08 05:40:41 +05:30
|
|
|
#include "net/ChecksumValidator.h"
|
|
|
|
|
|
|
|
#include "settings/INISettingsObject.h"
|
|
|
|
|
|
|
|
#include "ui/dialogs/CustomMessageBox.h"
|
|
|
|
|
2022-07-08 21:30:44 +05:30
|
|
|
#include <QAbstractButton>
|
|
|
|
|
|
|
|
bool ModrinthCreationTask::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-08 21:30:44 +05:30
|
|
|
if (m_files_job)
|
2022-08-06 05:55:21 +05:30
|
|
|
m_files_job->abort();
|
2022-08-01 02:51:59 +05:30
|
|
|
return Task::abort();
|
2022-07-08 21:30:44 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
bool ModrinthCreationTask::updateInstance()
|
|
|
|
{
|
|
|
|
auto instance_list = APPLICATION->instances();
|
|
|
|
|
|
|
|
// FIXME: How to handle situations when there's more than one install already for a given modpack?
|
2022-07-15 00:43:23 +05:30
|
|
|
auto inst = instance_list->getInstanceByManagedName(originalName());
|
2022-07-08 21:30:44 +05:30
|
|
|
|
|
|
|
if (!inst) {
|
2022-07-15 00:43:23 +05:30
|
|
|
inst = instance_list->getInstanceById(originalName());
|
2022-07-08 21:30:44 +05:30
|
|
|
|
|
|
|
if (!inst)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString index_path = FS::PathCombine(m_stagingPath, "modrinth.index.json");
|
2022-08-01 04:59:12 +05:30
|
|
|
if (!parseManifest(index_path, m_files, true, false))
|
2022-07-08 21:30:44 +05:30
|
|
|
return false;
|
|
|
|
|
2022-08-01 04:20:09 +05:30
|
|
|
auto version_name = inst->getManagedPackVersionName();
|
|
|
|
auto version_str = !version_name.isEmpty() ? tr(" (version %1)").arg(version_name) : "";
|
2022-07-08 21:30:44 +05:30
|
|
|
|
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);
|
|
|
|
info->setButtonText(QMessageBox::Ok, tr("Create new instance"));
|
|
|
|
info->setButtonText(QMessageBox::Abort, tr("Update existing instance"));
|
|
|
|
info->setButtonText(QMessageBox::Reset, tr("Cancel"));
|
2022-07-08 21:30:44 +05:30
|
|
|
|
2022-08-01 04:59:12 +05:30
|
|
|
info->exec();
|
|
|
|
|
|
|
|
if (info->clickedButton() == info->button(QMessageBox::Ok))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (info->clickedButton() == info->button(QMessageBox::Reset)) {
|
|
|
|
m_abort = true;
|
2022-07-08 21:30:44 +05:30
|
|
|
return false;
|
2022-08-01 04:59:12 +05:30
|
|
|
}
|
2022-07-08 21:30:44 +05:30
|
|
|
|
|
|
|
// Remove repeated files, we don't need to download them!
|
|
|
|
QDir old_inst_dir(inst->instanceRoot());
|
|
|
|
|
2022-07-29 07:05:40 +05:30
|
|
|
QString old_index_folder(FS::PathCombine(old_inst_dir.absolutePath(), "mrpack"));
|
|
|
|
|
|
|
|
QString old_index_path(FS::PathCombine(old_index_folder, "modrinth.index.json"));
|
2022-07-08 21:30:44 +05:30
|
|
|
QFileInfo old_index_file(old_index_path);
|
|
|
|
if (old_index_file.exists()) {
|
|
|
|
std::vector<Modrinth::File> old_files;
|
2022-08-01 04:59:12 +05:30
|
|
|
parseManifest(old_index_path, old_files, false, false);
|
2022-07-08 21:30:44 +05:30
|
|
|
|
|
|
|
// Let's remove all duplicated, identical resources!
|
|
|
|
auto files_iterator = m_files.begin();
|
2022-07-29 07:05:40 +05:30
|
|
|
begin:
|
2022-07-08 21:30:44 +05:30
|
|
|
while (files_iterator != m_files.end()) {
|
|
|
|
auto const& file = *files_iterator;
|
|
|
|
|
|
|
|
auto old_files_iterator = old_files.begin();
|
|
|
|
while (old_files_iterator != old_files.end()) {
|
|
|
|
auto const& old_file = *old_files_iterator;
|
|
|
|
|
|
|
|
if (old_file.hash == file.hash) {
|
|
|
|
qDebug() << "Removed file at" << file.path << "from list of downloads";
|
|
|
|
files_iterator = m_files.erase(files_iterator);
|
|
|
|
old_files_iterator = old_files.erase(old_files_iterator);
|
2022-07-29 07:05:40 +05:30
|
|
|
goto begin; // Sorry :c
|
2022-07-08 21:30:44 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
old_files_iterator++;
|
|
|
|
}
|
|
|
|
|
|
|
|
files_iterator++;
|
|
|
|
}
|
|
|
|
|
2022-07-29 07:05:40 +05:30
|
|
|
QDir old_minecraft_dir(inst->gameRoot());
|
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
|
|
|
|
2022-07-08 21:30:44 +05:30
|
|
|
// Some files were removed from the old version, and some will be downloaded in an updated version,
|
|
|
|
// so we're fine removing them!
|
|
|
|
if (!old_files.empty()) {
|
|
|
|
for (auto const& file : old_files) {
|
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 (file.path.isEmpty())
|
|
|
|
continue;
|
|
|
|
qDebug() << "Scheduling" << file.path << "for removal";
|
|
|
|
m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(file.path));
|
2022-07-08 21:30:44 +05:30
|
|
|
}
|
|
|
|
}
|
2022-07-29 07:05:40 +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);
|
|
|
|
for (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-07-29 07:05:40 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
auto old_client_overrides = Override::readOverrides("client-overrides", old_index_folder);
|
|
|
|
for (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-07-29 07:05:40 +05:30
|
|
|
}
|
2022-07-08 21:30:44 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
setOverride(true);
|
|
|
|
qDebug() << "Will override instance!";
|
|
|
|
|
2022-08-01 04:20:09 +05:30
|
|
|
m_instance = inst;
|
|
|
|
|
2022-07-08 21:30:44 +05:30
|
|
|
// We let it go through the createInstance() stage, just with a couple modifications for updating
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// https://docs.modrinth.com/docs/modpacks/format_definition/
|
2022-07-08 05:40:41 +05:30
|
|
|
bool ModrinthCreationTask::createInstance()
|
|
|
|
{
|
|
|
|
QEventLoop loop;
|
|
|
|
|
2022-07-29 07:05:40 +05:30
|
|
|
QString parent_folder(FS::PathCombine(m_stagingPath, "mrpack"));
|
|
|
|
|
2022-07-08 21:30:44 +05:30
|
|
|
QString index_path = FS::PathCombine(m_stagingPath, "modrinth.index.json");
|
2022-08-01 04:59:12 +05:30
|
|
|
if (m_files.empty() && !parseManifest(index_path, m_files, true, true))
|
2022-07-08 05:40:41 +05:30
|
|
|
return false;
|
|
|
|
|
2022-07-08 21:30:44 +05:30
|
|
|
// Keep index file in case we need it some other time (like when changing versions)
|
2022-07-29 07:05:40 +05:30
|
|
|
QString new_index_place(FS::PathCombine(parent_folder, "modrinth.index.json"));
|
2022-07-08 21:30:44 +05:30
|
|
|
FS::ensureFilePathExists(new_index_place);
|
|
|
|
QFile::rename(index_path, new_index_place);
|
|
|
|
|
2022-07-08 05:40:41 +05:30
|
|
|
auto mcPath = FS::PathCombine(m_stagingPath, ".minecraft");
|
|
|
|
|
|
|
|
auto override_path = FS::PathCombine(m_stagingPath, "overrides");
|
|
|
|
if (QFile::exists(override_path)) {
|
2022-07-29 07:05:40 +05:30
|
|
|
// Create a list of overrides in "overrides.txt" inside mrpack/
|
|
|
|
Override::createOverrides("overrides", parent_folder, override_path);
|
|
|
|
|
|
|
|
// Apply the overrides
|
2022-07-08 05:40:41 +05:30
|
|
|
if (!QFile::rename(override_path, mcPath)) {
|
|
|
|
setError(tr("Could not rename the overrides folder:\n") + "overrides");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Do client overrides
|
|
|
|
auto client_override_path = FS::PathCombine(m_stagingPath, "client-overrides");
|
|
|
|
if (QFile::exists(client_override_path)) {
|
2022-07-29 07:05:40 +05:30
|
|
|
// Create a list of overrides in "client-overrides.txt" inside mrpack/
|
|
|
|
Override::createOverrides("client-overrides", parent_folder, client_override_path);
|
|
|
|
|
|
|
|
// Apply the overrides
|
2022-07-08 05:40:41 +05:30
|
|
|
if (!FS::overrideFolder(mcPath, client_override_path)) {
|
|
|
|
setError(tr("Could not rename the client overrides folder:\n") + "client overrides");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg");
|
|
|
|
auto instanceSettings = std::make_shared<INISettingsObject>(configPath);
|
|
|
|
MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
|
2022-07-08 21:30:44 +05:30
|
|
|
|
2022-07-08 05:40:41 +05:30
|
|
|
auto components = instance.getPackProfile();
|
|
|
|
components->buildingFromScratch();
|
|
|
|
components->setComponentVersion("net.minecraft", minecraftVersion, true);
|
|
|
|
|
|
|
|
if (!fabricVersion.isEmpty())
|
|
|
|
components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
|
|
|
|
if (!quiltVersion.isEmpty())
|
|
|
|
components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion);
|
|
|
|
if (!forgeVersion.isEmpty())
|
|
|
|
components->setComponentVersion("net.minecraftforge", forgeVersion);
|
2022-07-08 21:30:44 +05:30
|
|
|
|
2022-07-08 05:40:41 +05:30
|
|
|
if (m_instIcon != "default") {
|
|
|
|
instance.setIconKey(m_instIcon);
|
|
|
|
} else {
|
|
|
|
instance.setIconKey("modrinth");
|
|
|
|
}
|
2022-07-15 00:43:23 +05:30
|
|
|
|
2022-08-01 04:20:09 +05:30
|
|
|
instance.setManagedPack("modrinth", getManagedPackID(), m_managed_name, m_managed_version_id, version());
|
2022-07-15 00:43:23 +05:30
|
|
|
instance.setName(name());
|
2022-07-08 05:40:41 +05:30
|
|
|
instance.saveNow();
|
|
|
|
|
|
|
|
m_files_job = new NetJob(tr("Mod download"), APPLICATION->network());
|
|
|
|
|
|
|
|
for (auto file : m_files) {
|
|
|
|
auto path = FS::PathCombine(m_stagingPath, ".minecraft", file.path);
|
|
|
|
qDebug() << "Will try to download" << file.downloads.front() << "to" << path;
|
|
|
|
auto dl = Net::Download::makeFile(file.downloads.dequeue(), path);
|
|
|
|
dl->addValidator(new Net::ChecksumValidator(file.hashAlgorithm, file.hash));
|
|
|
|
m_files_job->addNetAction(dl);
|
|
|
|
|
|
|
|
if (file.downloads.size() > 0) {
|
|
|
|
// FIXME: This really needs to be put into a ConcurrentTask of
|
|
|
|
// MultipleOptionsTask's , once those exist :)
|
|
|
|
connect(dl.get(), &NetAction::failed, [this, &file, path, dl] {
|
|
|
|
auto dl = Net::Download::makeFile(file.downloads.dequeue(), path);
|
|
|
|
dl->addValidator(new Net::ChecksumValidator(file.hashAlgorithm, file.hash));
|
|
|
|
m_files_job->addNetAction(dl);
|
|
|
|
dl->succeeded();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ended_well = false;
|
|
|
|
|
|
|
|
connect(m_files_job.get(), &NetJob::succeeded, this, [&]() { ended_well = true; });
|
|
|
|
connect(m_files_job.get(), &NetJob::failed, [&](const QString& reason) {
|
|
|
|
ended_well = false;
|
|
|
|
setError(reason);
|
|
|
|
});
|
|
|
|
connect(m_files_job.get(), &NetJob::finished, &loop, &QEventLoop::quit);
|
|
|
|
connect(m_files_job.get(), &NetJob::progress, [&](qint64 current, qint64 total) { setProgress(current, total); });
|
|
|
|
|
|
|
|
setStatus(tr("Downloading mods..."));
|
|
|
|
m_files_job->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
|
|
|
if (m_instance && ended_well) {
|
|
|
|
setAbortStatus(false);
|
2022-08-01 04:20:09 +05:30
|
|
|
auto inst = m_instance.value();
|
|
|
|
|
|
|
|
inst->copyManagedPack(instance);
|
|
|
|
inst->setName(instance.name());
|
|
|
|
}
|
|
|
|
|
2022-07-08 05:40:41 +05:30
|
|
|
return ended_well;
|
|
|
|
}
|
|
|
|
|
2022-08-01 04:59:12 +05:30
|
|
|
bool ModrinthCreationTask::parseManifest(QString index_path, std::vector<Modrinth::File>& files, bool set_managed_info, bool show_optional_dialog)
|
2022-07-08 05:40:41 +05:30
|
|
|
{
|
|
|
|
try {
|
2022-07-08 21:30:44 +05:30
|
|
|
auto doc = Json::requireDocument(index_path);
|
2022-07-08 05:40:41 +05:30
|
|
|
auto obj = Json::requireObject(doc, "modrinth.index.json");
|
|
|
|
int formatVersion = Json::requireInteger(obj, "formatVersion", "modrinth.index.json");
|
|
|
|
if (formatVersion == 1) {
|
|
|
|
auto game = Json::requireString(obj, "game", "modrinth.index.json");
|
|
|
|
if (game != "minecraft") {
|
|
|
|
throw JSONValidationError("Unknown game: " + game);
|
|
|
|
}
|
|
|
|
|
2022-08-01 04:20:09 +05:30
|
|
|
if (set_managed_info) {
|
|
|
|
m_managed_version_id = Json::ensureString(obj, "versionId", {}, "Managed ID");
|
|
|
|
m_managed_name = Json::ensureString(obj, "name", {}, "Managed Name");
|
|
|
|
}
|
2022-07-08 05:40:41 +05:30
|
|
|
|
|
|
|
auto jsonFiles = Json::requireIsArrayOf<QJsonObject>(obj, "files", "modrinth.index.json");
|
|
|
|
bool had_optional = false;
|
|
|
|
for (auto modInfo : jsonFiles) {
|
|
|
|
Modrinth::File file;
|
|
|
|
file.path = Json::requireString(modInfo, "path");
|
|
|
|
|
|
|
|
auto env = Json::ensureObject(modInfo, "env");
|
|
|
|
// 'env' field is optional
|
|
|
|
if (!env.isEmpty()) {
|
|
|
|
QString support = Json::ensureString(env, "client", "unsupported");
|
|
|
|
if (support == "unsupported") {
|
|
|
|
continue;
|
|
|
|
} else if (support == "optional") {
|
|
|
|
// TODO: Make a review dialog for choosing which ones the user wants!
|
2022-08-01 04:59:12 +05:30
|
|
|
if (!had_optional && show_optional_dialog) {
|
2022-07-08 05:40:41 +05:30
|
|
|
had_optional = true;
|
|
|
|
auto info = CustomMessageBox::selectable(
|
|
|
|
m_parent, tr("Optional mod detected!"),
|
|
|
|
tr("One or more mods from this modpack are optional. They will be downloaded, but disabled by default!"),
|
|
|
|
QMessageBox::Information);
|
|
|
|
info->exec();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (file.path.endsWith(".jar"))
|
|
|
|
file.path += ".disabled";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
QJsonObject hashes = Json::requireObject(modInfo, "hashes");
|
|
|
|
QString hash;
|
|
|
|
QCryptographicHash::Algorithm hashAlgorithm;
|
|
|
|
hash = Json::ensureString(hashes, "sha1");
|
|
|
|
hashAlgorithm = QCryptographicHash::Sha1;
|
|
|
|
if (hash.isEmpty()) {
|
|
|
|
hash = Json::ensureString(hashes, "sha512");
|
|
|
|
hashAlgorithm = QCryptographicHash::Sha512;
|
|
|
|
if (hash.isEmpty()) {
|
|
|
|
hash = Json::ensureString(hashes, "sha256");
|
|
|
|
hashAlgorithm = QCryptographicHash::Sha256;
|
|
|
|
if (hash.isEmpty()) {
|
|
|
|
throw JSONValidationError("No hash found for: " + file.path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
file.hash = QByteArray::fromHex(hash.toLatin1());
|
|
|
|
file.hashAlgorithm = hashAlgorithm;
|
|
|
|
|
|
|
|
// Do not use requireUrl, which uses StrictMode, instead use QUrl's default TolerantMode
|
|
|
|
// (as Modrinth seems to incorrectly handle spaces)
|
|
|
|
|
|
|
|
auto download_arr = Json::ensureArray(modInfo, "downloads");
|
|
|
|
for (auto download : download_arr) {
|
|
|
|
qWarning() << download.toString();
|
|
|
|
bool is_last = download.toString() == download_arr.last().toString();
|
|
|
|
|
|
|
|
auto download_url = QUrl(download.toString());
|
|
|
|
|
|
|
|
if (!download_url.isValid()) {
|
|
|
|
qDebug()
|
|
|
|
<< QString("Download URL (%1) for %2 is not a correctly formatted URL").arg(download_url.toString(), file.path);
|
|
|
|
if (is_last && file.downloads.isEmpty())
|
|
|
|
throw JSONValidationError(tr("Download URL for %1 is not a correctly formatted URL").arg(file.path));
|
|
|
|
} else {
|
|
|
|
file.downloads.push_back(download_url);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-07-08 21:30:44 +05:30
|
|
|
files.push_back(file);
|
2022-07-08 05:40:41 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
auto dependencies = Json::requireObject(obj, "dependencies", "modrinth.index.json");
|
|
|
|
for (auto it = dependencies.begin(), end = dependencies.end(); it != end; ++it) {
|
|
|
|
QString name = it.key();
|
|
|
|
if (name == "minecraft") {
|
|
|
|
minecraftVersion = Json::requireString(*it, "Minecraft version");
|
|
|
|
} else if (name == "fabric-loader") {
|
|
|
|
fabricVersion = Json::requireString(*it, "Fabric Loader version");
|
|
|
|
} else if (name == "quilt-loader") {
|
|
|
|
quiltVersion = Json::requireString(*it, "Quilt Loader version");
|
|
|
|
} else if (name == "forge") {
|
|
|
|
forgeVersion = Json::requireString(*it, "Forge version");
|
|
|
|
} else {
|
|
|
|
throw JSONValidationError("Unknown dependency type: " + name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
throw JSONValidationError(QStringLiteral("Unknown format version: %s").arg(formatVersion));
|
|
|
|
}
|
2022-07-08 21:30:44 +05:30
|
|
|
|
2022-07-08 05:40:41 +05:30
|
|
|
} catch (const JSONValidationError& e) {
|
|
|
|
setError(tr("Could not understand pack index:\n") + e.cause());
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString ModrinthCreationTask::getManagedPackID() const
|
|
|
|
{
|
|
|
|
if (!m_source_url.isEmpty()) {
|
|
|
|
QRegularExpression regex(R"(data\/(.*)\/versions)");
|
2022-08-01 04:20:09 +05:30
|
|
|
return regex.match(m_source_url).captured(1);
|
2022-07-08 05:40:41 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
return {};
|
|
|
|
}
|