From 8ace5fa91d7abaadc00758e1f6eeb692f424a8ab Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sat, 22 Apr 2017 18:51:04 +0200 Subject: NOISSUE Add flame. --- api/logic/minecraft/curse/FileResolvingTask.cpp | 66 ------------------------ api/logic/minecraft/curse/FileResolvingTask.h | 32 ------------ api/logic/minecraft/curse/PackManifest.cpp | 67 ------------------------- api/logic/minecraft/curse/PackManifest.h | 46 ----------------- api/logic/minecraft/flame/FileResolvingTask.cpp | 66 ++++++++++++++++++++++++ api/logic/minecraft/flame/FileResolvingTask.h | 32 ++++++++++++ api/logic/minecraft/flame/PackManifest.cpp | 67 +++++++++++++++++++++++++ api/logic/minecraft/flame/PackManifest.h | 46 +++++++++++++++++ 8 files changed, 211 insertions(+), 211 deletions(-) delete mode 100644 api/logic/minecraft/curse/FileResolvingTask.cpp delete mode 100644 api/logic/minecraft/curse/FileResolvingTask.h delete mode 100644 api/logic/minecraft/curse/PackManifest.cpp delete mode 100644 api/logic/minecraft/curse/PackManifest.h create mode 100644 api/logic/minecraft/flame/FileResolvingTask.cpp create mode 100644 api/logic/minecraft/flame/FileResolvingTask.h create mode 100644 api/logic/minecraft/flame/PackManifest.cpp create mode 100644 api/logic/minecraft/flame/PackManifest.h (limited to 'api/logic/minecraft') diff --git a/api/logic/minecraft/curse/FileResolvingTask.cpp b/api/logic/minecraft/curse/FileResolvingTask.cpp deleted file mode 100644 index aaac404b..00000000 --- a/api/logic/minecraft/curse/FileResolvingTask.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include "FileResolvingTask.h" -#include "Json.h" - -const char * metabase = "https://cursemeta.dries007.net"; - -Curse::FileResolvingTask::FileResolvingTask(Curse::Manifest& toProcess) - : m_toProcess(toProcess) -{ -} - -void Curse::FileResolvingTask::executeTask() -{ - setStatus(tr("Resolving curse mod IDs...")); - setProgress(0, m_toProcess.files.size()); - m_dljob.reset(new NetJob("Curse file 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, &Curse::FileResolvingTask::netJobFinished); - m_dljob->start(); -} - -void Curse::FileResolvingTask::netJobFinished() -{ - bool failed = false; - int index = 0; - for(auto & bytes: results) - { - try - { - auto doc = Json::requireDocument(bytes); - auto obj = Json::requireObject(doc); - // result code signifies true failure. - if(obj.contains("code")) - { - failed = true; - continue; - } - auto & out = m_toProcess.files[index]; - out.fileName = Json::requireString(obj, "FileNameOnDisk"); - out.url = Json::requireString(obj, "DownloadURL"); - out.resolved = true; - } - catch(JSONValidationError & e) - { - failed = true; - } - index++; - } - if(!failed) - { - emitSucceeded(); - } - else - { - emitFailed(tr("Some curse ID resolving tasks failed.")); - } -} diff --git a/api/logic/minecraft/curse/FileResolvingTask.h b/api/logic/minecraft/curse/FileResolvingTask.h deleted file mode 100644 index a9357bfb..00000000 --- a/api/logic/minecraft/curse/FileResolvingTask.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "tasks/Task.h" -#include "net/NetJob.h" -#include "PackManifest.h" - -#include "multimc_logic_export.h" - -namespace Curse -{ -class MULTIMC_LOGIC_EXPORT FileResolvingTask : public Task -{ - Q_OBJECT -public: - explicit FileResolvingTask(Curse::Manifest &toProcess); - const Curse::Manifest &getResults() const - { - return m_toProcess; - } - -protected: - virtual void executeTask() override; - -protected slots: - void netJobFinished(); - -private: /* data */ - Curse::Manifest m_toProcess; - QVector results; - NetJobPtr m_dljob; -}; -} diff --git a/api/logic/minecraft/curse/PackManifest.cpp b/api/logic/minecraft/curse/PackManifest.cpp deleted file mode 100644 index 7d9c2f89..00000000 --- a/api/logic/minecraft/curse/PackManifest.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "PackManifest.h" -#include "Json.h" - -static void loadFileV1(Curse::File & f, QJsonObject & file) -{ - f.projectId = Json::requireInteger(file, "projectID"); - f.fileId = Json::requireInteger(file, "fileID"); - // FIXME: what does this mean? - f.required = Json::ensureBoolean(file, QString("required"), true); -} - -static void loadModloaderV1(Curse::Modloader & m, QJsonObject & modLoader) -{ - m.id = Json::requireString(modLoader, "id"); - m.primary = Json::ensureBoolean(modLoader, QString("primary"), false); -} - -static void loadMinecraftV1(Curse::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 Curse 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); - Curse::Modloader loader; - loadModloaderV1(loader, obj); - m.modLoaders.append(loader); - } -} - -static void loadManifestV1(Curse::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); - Curse::File file; - loadFileV1(file, obj); - m.files.append(file); - } - m.overrides = Json::ensureString(manifest, "overrides", "overrides"); -} - -void Curse::loadManifest(Curse::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 Curse 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/minecraft/curse/PackManifest.h b/api/logic/minecraft/curse/PackManifest.h deleted file mode 100644 index 36e05cc2..00000000 --- a/api/logic/minecraft/curse/PackManifest.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include -#include - -namespace Curse -{ -struct File -{ - int projectId = 0; - int fileId = 0; - bool required = true; - - // our - bool resolved = false; - QString fileName; - QString url; -}; - -struct Modloader -{ - QString id; - bool primary = false; -}; - -struct Minecraft -{ - QString version; - QString libraries; - QVector modLoaders; -}; - -struct Manifest -{ - QString manifestType; - int manifestVersion = 0; - Curse::Minecraft minecraft; - QString name; - QString version; - QString author; - QVector files; - QString overrides; -}; - -void loadManifest(Curse::Manifest & m, const QString &filepath); -} diff --git a/api/logic/minecraft/flame/FileResolvingTask.cpp b/api/logic/minecraft/flame/FileResolvingTask.cpp new file mode 100644 index 00000000..582e4a07 --- /dev/null +++ b/api/logic/minecraft/flame/FileResolvingTask.cpp @@ -0,0 +1,66 @@ +#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); + // result code signifies true failure. + if(obj.contains("code")) + { + failed = true; + continue; + } + auto & out = m_toProcess.files[index]; + out.fileName = Json::requireString(obj, "FileNameOnDisk"); + out.url = Json::requireString(obj, "DownloadURL"); + out.resolved = true; + } + catch(JSONValidationError & e) + { + failed = true; + } + index++; + } + if(!failed) + { + emitSucceeded(); + } + else + { + emitFailed(tr("Some mod ID resolving tasks failed.")); + } +} diff --git a/api/logic/minecraft/flame/FileResolvingTask.h b/api/logic/minecraft/flame/FileResolvingTask.h new file mode 100644 index 00000000..00658452 --- /dev/null +++ b/api/logic/minecraft/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 results; + NetJobPtr m_dljob; +}; +} diff --git a/api/logic/minecraft/flame/PackManifest.cpp b/api/logic/minecraft/flame/PackManifest.cpp new file mode 100644 index 00000000..62921493 --- /dev/null +++ b/api/logic/minecraft/flame/PackManifest.cpp @@ -0,0 +1,67 @@ +#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"); + // FIXME: what does this mean? + 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/minecraft/flame/PackManifest.h b/api/logic/minecraft/flame/PackManifest.h new file mode 100644 index 00000000..ae91bffb --- /dev/null +++ b/api/logic/minecraft/flame/PackManifest.h @@ -0,0 +1,46 @@ +#pragma once + +#include +#include + +namespace Flame +{ +struct File +{ + int projectId = 0; + int fileId = 0; + bool required = true; + + // our + bool resolved = false; + QString fileName; + QString url; +}; + +struct Modloader +{ + QString id; + bool primary = false; +}; + +struct Minecraft +{ + QString version; + QString libraries; + QVector modLoaders; +}; + +struct Manifest +{ + QString manifestType; + int manifestVersion = 0; + Flame::Minecraft minecraft; + QString name; + QString version; + QString author; + QVector files; + QString overrides; +}; + +void loadManifest(Flame::Manifest & m, const QString &filepath); +} -- cgit