NOISSUE move modpack platform related files to 'modplatform' subfolders

11 files changed, 275 insertions, 1 deletions

diff --git a/api/logic/modplatform/flame/FileResolvingTask.cpp b/api/logic/modplatform/flame/FileResolvingTask.cpp
new file mode 100644
index 00000000..efc73621
--- /dev/null
+++ b/api/logic/modplatform/flame/FileResolvingTask.cpp
@@ -0,0 +1,117 @@
+#include "FileResolvingTask.h"
+#include "Json.h"
+
+const char * metabase = "https://cursemeta.dries007.net";
+
+Flame::FileResolvingTask::FileResolvingTask(Flame::Manifest& toProcess)
+	: m_toProcess(toProcess)
+{
+}
+
+void Flame::FileResolvingTask::executeTask()
+{
+	setStatus(tr("Resolving mod IDs..."));
+	setProgress(0, m_toProcess.files.size());
+	m_dljob.reset(new NetJob("Mod id resolver"));
+	results.resize(m_toProcess.files.size());
+	int index = 0;
+	for(auto & file: m_toProcess.files)
+	{
+		auto projectIdStr = QString::number(file.projectId);
+		auto fileIdStr = QString::number(file.fileId);
+		QString metaurl = QString("%1/%2/%3.json").arg(metabase, projectIdStr, fileIdStr);
+		auto dl = Net::Download::makeByteArray(QUrl(metaurl), &results[index]);
+		m_dljob->addNetAction(dl);
+		index ++;
+	}
+	connect(m_dljob.get(), &NetJob::finished, this, &Flame::FileResolvingTask::netJobFinished);
+	m_dljob->start();
+}
+
+void Flame::FileResolvingTask::netJobFinished()
+{
+	bool failed = false;
+	int index = 0;
+	for(auto & bytes: results)
+	{
+		try
+		{
+			auto doc = Json::requireDocument(bytes);
+			auto obj = Json::requireObject(doc);
+			auto & out = m_toProcess.files[index];
+			// result code signifies true failure.
+			if(obj.contains("code"))
+			{
+				qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a negative result:";
+				qCritical() << bytes;
+				failed = true;
+				continue;
+			}
+			out.fileName = Json::requireString(obj, "FileNameOnDisk");
+			QString rawUrl = Json::requireString(obj, "DownloadURL");
+			out.url = QUrl(rawUrl, QUrl::TolerantMode);
+			if(!out.url.isValid())
+			{
+				throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
+			}
+			// This is a piece of a Flame project JSON pulled out into the file metadata (here) for convenience
+			// It is also optional
+			QJsonObject projObj = Json::ensureObject(obj, "_Project", {});
+			if(!projObj.isEmpty())
+			{
+				QString strType = Json::ensureString(projObj, "PackageType", "mod").toLower();
+				if(strType == "singlefile")
+				{
+					out.type = File::Type::SingleFile;
+				}
+				else if(strType == "ctoc")
+				{
+					out.type = File::Type::Ctoc;
+				}
+				else if(strType == "cmod2")
+				{
+					out.type = File::Type::Cmod2;
+				}
+				else if(strType == "mod")
+				{
+					out.type = File::Type::Mod;
+				}
+				else if(strType == "folder")
+				{
+					out.type = File::Type::Folder;
+				}
+				else if(strType == "modpack")
+				{
+					out.type = File::Type::Modpack;
+				}
+				else
+				{
+					qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of unknown file type:" << strType;
+					out.type = File::Type::Unknown;
+					failed = true;
+					continue;
+				}
+				out.targetFolder = Json::ensureString(projObj, "Path", "mods");
+			}
+			out.resolved = true;
+		}
+		catch(JSONValidationError & e)
+		{
+			auto & out = m_toProcess.files[index];
+			qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a parsing error:";
+			qCritical() << e.cause();
+			qCritical() << "JSON:";
+			qCritical() << bytes;
+			failed = true;
+		}
+		index++;
+	}
+	if(!failed)
+	{
+		emitSucceeded();
+	}
+	else
+	{
+		emitFailed(tr("Some mod ID resolving tasks failed."));
+	}
+}
diff --git a/api/logic/modplatform/flame/FileResolvingTask.h b/api/logic/modplatform/flame/FileResolvingTask.h
new file mode 100644
index 00000000..00658452
--- /dev/null
+++ b/api/logic/modplatform/flame/FileResolvingTask.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "tasks/Task.h"
+#include "net/NetJob.h"
+#include "PackManifest.h"
+
+#include "multimc_logic_export.h"
+
+namespace Flame
+{
+class MULTIMC_LOGIC_EXPORT FileResolvingTask : public Task
+{
+	Q_OBJECT
+public:
+	explicit FileResolvingTask(Flame::Manifest &toProcess);
+	const Flame::Manifest &getResults() const
+	{
+		return m_toProcess;
+	}
+
+protected:
+	virtual void executeTask() override;
+
+protected slots:
+	void netJobFinished();
+
+private: /* data */
+	Flame::Manifest m_toProcess;
+	QVector<QByteArray> results;
+	NetJobPtr m_dljob;
+};
+}
diff --git a/api/logic/modplatform/flame/PackManifest.cpp b/api/logic/modplatform/flame/PackManifest.cpp
new file mode 100644
index 00000000..6a9324fe
--- /dev/null
+++ b/api/logic/modplatform/flame/PackManifest.cpp
@@ -0,0 +1,66 @@
+#include "PackManifest.h"
+#include "Json.h"
+
+static void loadFileV1(Flame::File & f, QJsonObject & file)
+{
+	f.projectId = Json::requireInteger(file, "projectID");
+	f.fileId = Json::requireInteger(file, "fileID");
+	f.required = Json::ensureBoolean(file, QString("required"), true);
+}
+
+static void loadModloaderV1(Flame::Modloader & m, QJsonObject & modLoader)
+{
+	m.id = Json::requireString(modLoader, "id");
+	m.primary = Json::ensureBoolean(modLoader, QString("primary"), false);
+}
+
+static void loadMinecraftV1(Flame::Minecraft & m, QJsonObject & minecraft)
+{
+	m.version = Json::requireString(minecraft, "version");
+	// extra libraries... apparently only used for a custom Minecraft launcher in the 1.2.5 FTB retro pack
+	// intended use is likely hardcoded in the 'Flame' client, the manifest says nothing
+	m.libraries = Json::ensureString(minecraft, QString("libraries"), QString());
+	auto arr = Json::ensureArray(minecraft, "modLoaders", QJsonArray());
+	for (const auto & item : arr)
+	{
+		auto obj = Json::requireObject(item);
+		Flame::Modloader loader;
+		loadModloaderV1(loader, obj);
+		m.modLoaders.append(loader);
+	}
+}
+
+static void loadManifestV1(Flame::Manifest & m, QJsonObject & manifest)
+{
+	auto mc = Json::requireObject(manifest, "minecraft");
+	loadMinecraftV1(m.minecraft, mc);
+	m.name = Json::ensureString(manifest, QString("name"), "Unnamed");
+	m.version = Json::ensureString(manifest, QString("version"), QString());
+	m.author = Json::ensureString(manifest, QString("author"), "Anonymous Coward");
+	auto arr = Json::ensureArray(manifest, "files", QJsonArray());
+	for (const auto & item : arr)
+	{
+		auto obj = Json::requireObject(item);
+		Flame::File file;
+		loadFileV1(file, obj);
+		m.files.append(file);
+	}
+	m.overrides = Json::ensureString(manifest, "overrides", "overrides");
+}
+
+void Flame::loadManifest(Flame::Manifest & m, const QString &filepath)
+{
+	auto doc = Json::requireDocument(filepath);
+	auto obj = Json::requireObject(doc);
+	m.manifestType = Json::requireString(obj, "manifestType");
+	if(m.manifestType != "minecraftModpack")
+	{
+		throw JSONValidationError("Not a modpack manifest!");
+	}
+	m.manifestVersion = Json::requireInteger(obj, "manifestVersion");
+	if(m.manifestVersion != 1)
+	{
+		throw JSONValidationError(QString("Unknown manifest version (%1)").arg(m.manifestVersion));
+	}
+	loadManifestV1(m, obj);
+}
diff --git a/api/logic/modplatform/flame/PackManifest.h b/api/logic/modplatform/flame/PackManifest.h
new file mode 100644
index 00000000..1a5254a8
--- /dev/null
+++ b/api/logic/modplatform/flame/PackManifest.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <QString>
+#include <QVector>
+#include <QUrl>
+
+namespace Flame
+{
+struct File
+{
+	int projectId = 0;
+	int fileId = 0;
+	// NOTE: the opposite to 'optional'. This is at the time of writing unused.
+	bool required = true;
+
+	// our
+	bool resolved = false;
+	QString fileName;
+	QUrl url;
+	QString targetFolder = QLatin1Literal("mods");
+	enum class Type
+	{
+		Unknown,
+		Folder,
+		Ctoc,
+		SingleFile,
+		Cmod2,
+		Modpack,
+		Mod
+	} type = Type::Mod;
+};
+
+struct Modloader
+{
+	QString id;
+	bool primary = false;
+};
+
+struct Minecraft
+{
+	QString version;
+	QString libraries;
+	QVector<Flame::Modloader> modLoaders;
+};
+
+struct Manifest
+{
+	QString manifestType;
+	int manifestVersion = 0;
+	Flame::Minecraft minecraft;
+	QString name;
+	QString version;
+	QString author;
+	QVector<Flame::File> files;
+	QString overrides;
+};
+
+void loadManifest(Flame::Manifest & m, const QString &filepath);
+}
diff --git a/api/logic/modplatform/FtbPackDownloader.cpp b/api/logic/modplatform/ftb/FtbPackDownloader.cpp
index caadd4ae..caadd4ae 100644
--- a/api/logic/modplatform/FtbPackDownloader.cpp
+++ b/api/logic/modplatform/ftb/FtbPackDownloader.cpp
diff --git a/api/logic/modplatform/FtbPackDownloader.h b/api/logic/modplatform/ftb/FtbPackDownloader.h
index c5cc9bd2..c5cc9bd2 100644
--- a/api/logic/modplatform/FtbPackDownloader.h
+++ b/api/logic/modplatform/ftb/FtbPackDownloader.h
diff --git a/api/logic/modplatform/FtbPackFetchTask.cpp b/api/logic/modplatform/ftb/FtbPackFetchTask.cpp
index 9e151186..9e151186 100644
--- a/api/logic/modplatform/FtbPackFetchTask.cpp
+++ b/api/logic/modplatform/ftb/FtbPackFetchTask.cpp
diff --git a/api/logic/modplatform/FtbPackFetchTask.h b/api/logic/modplatform/ftb/FtbPackFetchTask.h
index 3cfac4ed..3cfac4ed 100644
--- a/api/logic/modplatform/FtbPackFetchTask.h
+++ b/api/logic/modplatform/ftb/FtbPackFetchTask.h
diff --git a/api/logic/modplatform/FtbPackInstallTask.cpp b/api/logic/modplatform/ftb/FtbPackInstallTask.cpp
index 530f72ca..530f72ca 100644
--- a/api/logic/modplatform/FtbPackInstallTask.cpp
+++ b/api/logic/modplatform/ftb/FtbPackInstallTask.cpp
diff --git a/api/logic/modplatform/FtbPackInstallTask.h b/api/logic/modplatform/ftb/FtbPackInstallTask.h
index cf477ae2..7d6e5276 100644
--- a/api/logic/modplatform/FtbPackInstallTask.h
+++ b/api/logic/modplatform/ftb/FtbPackInstallTask.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "tasks/Task.h"
-#include "modplatform/FtbPackDownloader.h"
+#include "modplatform/ftb/FtbPackDownloader.h"
 #include "BaseInstanceProvider.h"
 #include "net/NetJob.h"
 #include "quazip.h"
diff --git a/api/logic/modplatform/PackHelpers.h b/api/logic/modplatform/ftb/PackHelpers.h
index f761ed6b..f761ed6b 100644
--- a/api/logic/modplatform/PackHelpers.h
+++ b/api/logic/modplatform/ftb/PackHelpers.h