Merge pull request #3691 from phit/feature/fixcurse

NOISSUE Curseforge makeover

3 files changed, 137 insertions, 0 deletions

diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt
index 3193d813..beaa0c00 100644
--- a/api/logic/CMakeLists.txt
+++ b/api/logic/CMakeLists.txt
@@ -466,6 +466,8 @@ set(FTB_SOURCES
 
 set(FLAME_SOURCES
     # Flame
+    modplatform/flame/FlamePackIndex.cpp
+    modplatform/flame/FlamePackIndex.h
     modplatform/flame/PackManifest.h
     modplatform/flame/PackManifest.cpp
     modplatform/flame/FileResolvingTask.h
diff --git a/api/logic/modplatform/flame/FlamePackIndex.cpp b/api/logic/modplatform/flame/FlamePackIndex.cpp
new file mode 100644
index 00000000..3d8ea22a
--- /dev/null
+++ b/api/logic/modplatform/flame/FlamePackIndex.cpp
@@ -0,0 +1,92 @@
+#include "FlamePackIndex.h"
+
+#include "Json.h"
+
+void Flame::loadIndexedPack(Flame::IndexedPack & pack, QJsonObject & obj)
+{
+    pack.addonId = Json::requireInteger(obj, "id");
+    pack.name = Json::requireString(obj, "name");
+    pack.websiteUrl = Json::ensureString(obj, "websiteUrl", "");
+    pack.description = Json::ensureString(obj, "summary", "");
+
+    bool thumbnailFound = false;
+    auto attachments = Json::requireArray(obj, "attachments");
+    for(auto attachmentRaw: attachments) {
+        auto attachmentObj = Json::requireObject(attachmentRaw);
+        bool isDefault = attachmentObj.value("isDefault").toBool(false);
+        if(isDefault) {
+            thumbnailFound = true;
+            pack.logoName = Json::requireString(attachmentObj, "title");
+            pack.logoUrl = Json::requireString(attachmentObj, "thumbnailUrl");
+            break;
+        }
+    }
+
+    if(!thumbnailFound) {
+        throw JSONValidationError(QString("Pack without an icon, skipping: %1").arg(pack.name));
+    }
+
+    auto authors = Json::requireArray(obj, "authors");
+    for(auto authorIter: authors) {
+        auto author = Json::requireObject(authorIter);
+        Flame::ModpackAuthor packAuthor;
+        packAuthor.name = Json::requireString(author, "name");
+        packAuthor.url = Json::requireString(author, "url");
+        pack.authors.append(packAuthor);
+    }
+    int defaultFileId = Json::requireInteger(obj, "defaultFileId");
+
+    bool found = false;
+    // check if there are some files before adding the pack
+    auto files = Json::requireArray(obj, "latestFiles");
+    for(auto fileIter: files) {
+        auto file = Json::requireObject(fileIter);
+        int id = Json::requireInteger(file, "id");
+
+        // NOTE: for now, ignore everything that's not the default...
+        if(id != defaultFileId) {
+            continue;
+        }
+
+        auto versionArray = Json::requireArray(file, "gameVersion");
+        if(versionArray.size() < 1) {
+            continue;
+        }
+
+        found = true;
+        break;
+    }
+    if(!found) {
+        throw JSONValidationError(QString("Pack with no good file, skipping: %1").arg(pack.name));
+    }
+}
+
+void Flame::loadIndexedPackVersions(Flame::IndexedPack & pack, QJsonArray & arr)
+{
+    QVector<Flame::IndexedVersion> unsortedVersions;
+    for(auto versionIter: arr) {
+        auto version = Json::requireObject(versionIter);
+        Flame::IndexedVersion file; 
+
+        file.addonId = pack.addonId;
+        file.fileId = Json::requireInteger(version, "id");
+        auto versionArray = Json::requireArray(version, "gameVersion");
+        if(versionArray.size() < 1) {
+            continue;
+        }
+
+        // pick the latest version supported
+        file.mcVersion = versionArray[0].toString();
+        file.version = Json::requireString(version, "displayName");
+        file.downloadUrl = Json::requireString(version, "downloadUrl");
+        unsortedVersions.append(file);
+    }
+
+    auto orderSortPredicate = [](const IndexedVersion & a, const IndexedVersion & b) -> bool
+    {
+        return a.fileId > b.fileId;
+    };
+    std::sort(unsortedVersions.begin(), unsortedVersions.end(), orderSortPredicate);
+    pack.versions = unsortedVersions;
+    pack.versionsLoaded = true;
+}
diff --git a/api/logic/modplatform/flame/FlamePackIndex.h b/api/logic/modplatform/flame/FlamePackIndex.h
new file mode 100644
index 00000000..cdeb2c13
--- /dev/null
+++ b/api/logic/modplatform/flame/FlamePackIndex.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <QList>
+#include <QMetaType>
+#include <QString>
+#include <QVector>
+
+#include "multimc_logic_export.h"
+
+namespace Flame {
+
+struct ModpackAuthor {
+    QString name;
+    QString url;
+};
+
+struct IndexedVersion {
+    int addonId;
+    int fileId;
+    QString version;
+    QString mcVersion;
+    QString downloadUrl;
+};
+
+struct IndexedPack
+{
+    int addonId;
+    QString name;
+    QString description;
+    QList<ModpackAuthor> authors;
+    QString logoName;
+    QString logoUrl;
+    QString websiteUrl;
+
+    bool versionsLoaded = false;
+    QVector<IndexedVersion> versions;
+};
+
+MULTIMC_LOGIC_EXPORT void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
+MULTIMC_LOGIC_EXPORT void loadIndexedPackVersions(IndexedPack & m, QJsonArray & arr);
+}
+
+Q_DECLARE_METATYPE(Flame::IndexedPack)