refactor: Use a single indexed pack for mods

Since there's little difference between them, let's remove duplication
and merge them.

launcher/modplatform/ModIndex.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <QList>
+#include <QMetaType>
+#include <QString>
+#include <QVariant>
+#include <QVector>
+
+namespace ModPlatform {
+
+struct ModpackAuthor {
+    QString name;
+    QString url;
+};
+
+struct IndexedVersion {
+    QVariant addonId;
+    QVariant fileId;
+    QString version;
+    QVector<QString> mcVersion;
+    QString downloadUrl;
+    QString date;
+    QString fileName;
+    QVector<QString> loaders = {};
+};
+
+struct IndexedPack {
+    QVariant addonId;
+    QString name;
+    QString description;
+    QList<ModpackAuthor> authors;
+    QString logoName;
+    QString logoUrl;
+    QString websiteUrl;
+
+    bool versionsLoaded = false;
+    QVector<IndexedVersion> versions;
+};
+
+}  // namespace ModPlatform
+
+Q_DECLARE_METATYPE(ModPlatform::IndexedPack)

launcher/modplatform/flame/FlameModIndex.cpp

@@ -1,13 +1,11 @@
-#include <QObject>
 #include "FlameModIndex.h"
+
 #include "Json.h"
-#include "net/NetJob.h"
-#include "BaseInstance.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
+#include "net/NetJob.h"
 
-
+void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
-void FlameMod::loadIndexedPack(FlameMod::IndexedPack & pack, QJsonObject & obj)
 {
     pack.addonId = Json::requireInteger(obj, "id");
     pack.name = Json::requireString(obj, "name");
@@ -16,10 +14,10 @@ void FlameMod::loadIndexedPack(FlameMod::IndexedPack & pack, QJsonObject & obj)
 
     bool thumbnailFound = false;
     auto attachments = Json::requireArray(obj, "attachments");
-    for(auto attachmentRaw: attachments) {
+    for (auto attachmentRaw : attachments) {
         auto attachmentObj = Json::requireObject(attachmentRaw);
         bool isDefault = attachmentObj.value("isDefault").toBool(false);
-        if(isDefault) {
+        if (isDefault) {
             thumbnailFound = true;
             pack.logoName = Json::requireString(attachmentObj, "title");
             pack.logoUrl = Json::requireString(attachmentObj, "thumbnailUrl");
@@ -27,37 +25,35 @@ void FlameMod::loadIndexedPack(FlameMod::IndexedPack & pack, QJsonObject & obj)
         }
     }
 
-    if(!thumbnailFound) {
+    if (!thumbnailFound) { throw JSONValidationError(QString("Pack without an icon, skipping: %1").arg(pack.name)); }
-        throw JSONValidationError(QString("Pack without an icon, skipping: %1").arg(pack.name));
-    }
-
 
     auto authors = Json::requireArray(obj, "authors");
-    for(auto authorIter: authors) {
+    for (auto authorIter : authors) {
         auto author = Json::requireObject(authorIter);
-        FlameMod::ModpackAuthor packAuthor;
+        ModPlatform::ModpackAuthor packAuthor;
         packAuthor.name = Json::requireString(author, "name");
         packAuthor.url = Json::requireString(author, "url");
         pack.authors.append(packAuthor);
     }
 }
 
-void FlameMod::loadIndexedPackVersions(FlameMod::IndexedPack & pack, QJsonArray & arr, const shared_qobject_ptr<QNetworkAccessManager>& network, BaseInstance * inst)
+void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
+                                       QJsonArray& arr,
+                                       const shared_qobject_ptr<QNetworkAccessManager>& network,
+                                       BaseInstance* inst)
 {
-    QVector<FlameMod::IndexedVersion> unsortedVersions;
+    QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    bool hasFabric = !((MinecraftInstance *)inst)->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
+    bool hasFabric = !((MinecraftInstance*)inst)->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
-    QString mcVersion = ((MinecraftInstance *)inst)->getPackProfile()->getComponentVersion("net.minecraft");
+    QString mcVersion = ((MinecraftInstance*)inst)->getPackProfile()->getComponentVersion("net.minecraft");
 
-    for(auto versionIter: arr) {
+    for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
 
         auto versionArray = Json::requireArray(obj, "gameVersion");
-        if (versionArray.isEmpty()) {
+        if (versionArray.isEmpty()) { continue; }
-            continue;
-        }
 
-        FlameMod::IndexedVersion file;
+        ModPlatform::IndexedVersion file;
-        for(auto mcVer : versionArray){
+        for (auto mcVer : versionArray) {
             file.mcVersion.append(mcVer.toString());
         }
 
@@ -70,29 +66,27 @@ void FlameMod::loadIndexedPackVersions(FlameMod::IndexedPack & pack, QJsonArray
 
         auto modules = Json::requireArray(obj, "modules");
         bool is_valid_fabric_version = false;
-        for(auto m : modules){
+        for (auto m : modules) {
-            auto fname = Json::requireString(m.toObject(),"foldername");
+            auto fname = Json::requireString(m.toObject(), "foldername");
             // FIXME: This does not work properly when a mod supports more than one mod loader, since
             // they bundle the meta files for all of them in the same arquive, even when that version
             // doesn't support the given mod loader.
-            if(hasFabric){
+            if (hasFabric) {
-                if(fname == "fabric.mod.json"){
+                if (fname == "fabric.mod.json") {
                     is_valid_fabric_version = true;
                     break;
                 }
-            }
+            } else
-            else break;
+                break;
             // NOTE: Since we're not validating forge versions, we can just skip this loop.
         }
 
-        if(hasFabric && !is_valid_fabric_version)
+        if (hasFabric && !is_valid_fabric_version) continue;
-            continue;
 
         unsortedVersions.append(file);
     }
-    auto orderSortPredicate = [](const IndexedVersion & a, const IndexedVersion & b) -> bool
+    auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-    {
+        // dates are in RFC 3339 format
-        //dates are in RFC 3339 format
         return a.date > b.date;
     };
     std::sort(unsortedVersions.begin(), unsortedVersions.end(), orderSortPredicate);

launcher/modplatform/flame/FlameModIndex.h

@@ -3,48 +3,18 @@
 //
 
 #pragma once
-#include <QList>
+
-#include <QMetaType>
+#include "modplatform/ModIndex.h"
-#include <QString>
+
-#include <QVector>
 #include <QNetworkAccessManager>
-#include <QObjectPtr.h>
-#include "net/NetJob.h"
 #include "BaseInstance.h"
 
 namespace FlameMod {
-    struct ModpackAuthor {
-        QString name;
-        QString url;
-    };
 
-    struct IndexedVersion {
+void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj);
-        int addonId;
+void loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
-        int fileId;
+                             QJsonArray& arr,
-        QString version;
+                             const shared_qobject_ptr<QNetworkAccessManager>& network,
-        QVector<QString> mcVersion;
+                             BaseInstance* inst);
-        QString downloadUrl;
-        QString date;
-        QString fileName;
-    };
 
-    struct IndexedPack
+}  // namespace FlameMod
-    {
-        int addonId;
-        QString name;
-        QString description;
-        QList<ModpackAuthor> authors;
-        QString logoName;
-        QString logoUrl;
-        QString websiteUrl;
-
-        bool versionsLoaded = false;
-        QVector<IndexedVersion> versions;
-    };
-
-    void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
-    void loadIndexedPackVersions(IndexedPack &pack, QJsonArray &arr, const shared_qobject_ptr<QNetworkAccessManager> &network, BaseInstance *inst);
-
-}
-
-Q_DECLARE_METATYPE(FlameMod::IndexedPack)

launcher/modplatform/modrinth/ModrinthPackIndex.cpp

@@ -1,14 +1,11 @@
-#include <QObject>
 #include "ModrinthPackIndex.h"
 
 #include "Json.h"
-#include "net/NetJob.h"
-#include "BaseInstance.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
+#include "net/NetJob.h"
 
-
+void Modrinth::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
-void Modrinth::loadIndexedPack(Modrinth::IndexedPack & pack, QJsonObject & obj)
 {
     pack.addonId = Json::requireString(obj, "project_id");
     pack.name = Json::requireString(obj, "title");
@@ -16,59 +13,60 @@ void Modrinth::loadIndexedPack(Modrinth::IndexedPack & pack, QJsonObject & obj)
     pack.description = Json::ensureString(obj, "description", "");
 
     pack.logoUrl = Json::requireString(obj, "icon_url");
-    pack.logoName = pack.addonId;
+    pack.logoName = pack.addonId.toString();
 
-    Modrinth::ModpackAuthor modAuthor;
+    ModPlatform::ModpackAuthor modAuthor;
     modAuthor.name = Json::requireString(obj, "author");
-    modAuthor.url = "https://modrinth.com/user/"+modAuthor.name;
+    modAuthor.url = "https://modrinth.com/user/" + modAuthor.name;
-    pack.author = modAuthor;
+    pack.authors.append(modAuthor);
 }
 
-void Modrinth::loadIndexedPackVersions(Modrinth::IndexedPack & pack, QJsonArray & arr, const shared_qobject_ptr<QNetworkAccessManager>& network, BaseInstance * inst)
+void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
+                                       QJsonArray& arr,
+                                       const shared_qobject_ptr<QNetworkAccessManager>& network,
+                                       BaseInstance* inst)
 {
-    QVector<Modrinth::IndexedVersion> unsortedVersions;
+    QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    bool hasFabric = !((MinecraftInstance *)inst)->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
+    bool hasFabric = !((MinecraftInstance*)inst)->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
-    QString mcVersion = ((MinecraftInstance *)inst)->getPackProfile()->getComponentVersion("net.minecraft");
+    QString mcVersion = ((MinecraftInstance*)inst)->getPackProfile()->getComponentVersion("net.minecraft");
 
-    for(auto versionIter: arr) {
+    for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
-        Modrinth::IndexedVersion file;
+        ModPlatform::IndexedVersion file;
-        file.addonId = Json::requireString(obj,"project_id") ;
+        file.addonId = Json::requireString(obj, "project_id");
         file.fileId = Json::requireString(obj, "id");
         file.date = Json::requireString(obj, "date_published");
         auto versionArray = Json::requireArray(obj, "game_versions");
-        if (versionArray.empty()) {
+        if (versionArray.empty()) { continue; }
-            continue;
+        for (auto mcVer : versionArray) {
-        }
-        for(auto mcVer : versionArray){
             file.mcVersion.append(mcVer.toString());
         }
-        auto loaders = Json::requireArray(obj,"loaders");
+        auto loaders = Json::requireArray(obj, "loaders");
-        for(auto loader : loaders){
+        for (auto loader : loaders) {
             file.loaders.append(loader.toString());
         }
         file.version = Json::requireString(obj, "name");
 
         auto files = Json::requireArray(obj, "files");
         int i = 0;
-        while (files.count() > 1 && i < files.count()){
+        while (files.count() > 1 && i < files.count()) {
-            //try to resolve the correct file
+            // try to resolve the correct file
             auto parent = files[i].toObject();
             auto fileName = Json::requireString(parent, "filename");
-            //avoid grabbing "dev" files
+            // avoid grabbing "dev" files
-            if(fileName.contains("javadocs",Qt::CaseInsensitive) || fileName.contains("sources",Qt::CaseInsensitive)){
+            if (fileName.contains("javadocs", Qt::CaseInsensitive) || fileName.contains("sources", Qt::CaseInsensitive)) {
                 i++;
                 continue;
             }
-            //grab the correct mod loader
+            // grab the correct mod loader
-            if(fileName.contains("forge",Qt::CaseInsensitive) || fileName.contains("fabric",Qt::CaseInsensitive)  ){
+            if (fileName.contains("forge", Qt::CaseInsensitive) || fileName.contains("fabric", Qt::CaseInsensitive)) {
-                if(hasFabric){
+                if (hasFabric) {
-                    if(fileName.contains("forge",Qt::CaseInsensitive)){
+                    if (fileName.contains("forge", Qt::CaseInsensitive)) {
                         i++;
                         continue;
                     }
-                }else{
+                } else {
-                    if(fileName.contains("fabric",Qt::CaseInsensitive)){
+                    if (fileName.contains("fabric", Qt::CaseInsensitive)) {
                         i++;
                         continue;
                     }
@@ -77,16 +75,15 @@ void Modrinth::loadIndexedPackVersions(Modrinth::IndexedPack & pack, QJsonArray
             break;
         }
         auto parent = files[i].toObject();
-        if(parent.contains("url")) {
+        if (parent.contains("url")) {
             file.downloadUrl = Json::requireString(parent, "url");
             file.fileName = Json::requireString(parent, "filename");
 
             unsortedVersions.append(file);
         }
     }
-    auto orderSortPredicate = [](const IndexedVersion & a, const IndexedVersion & b) -> bool
+    auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
-    {
+        // dates are in RFC 3339 format
-        //dates are in RFC 3339 format
         return a.date > b.date;
     };
     std::sort(unsortedVersions.begin(), unsortedVersions.end(), orderSortPredicate);

launcher/modplatform/modrinth/ModrinthPackIndex.h

@@ -1,48 +1,16 @@
 #pragma once
 
-#include <QList>
+#include "modplatform/ModIndex.h"
-#include <QMetaType>
+
-#include <QString>
-#include <QVector>
 #include <QNetworkAccessManager>
-#include <QObjectPtr.h>
-#include "net/NetJob.h"
 #include "BaseInstance.h"
 
 namespace Modrinth {
 
-struct ModpackAuthor {
+void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj);
-    QString name;
+void loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
-    QString url;
+                             QJsonArray& arr,
-};
+                             const shared_qobject_ptr<QNetworkAccessManager>& network,
+                             BaseInstance* inst);
 
-struct IndexedVersion {
+}  // namespace Modrinth
-    QString addonId;
-    QString fileId;
-    QString version;
-    QVector<QString> mcVersion;
-    QString downloadUrl;
-    QString date;
-    QString fileName;
-    QVector<QString> loaders;
-};
-
-struct IndexedPack
-{
-    QString addonId;
-    QString name;
-    QString description;
-    ModpackAuthor author;
-    QString logoName;
-    QString logoUrl;
-    QString websiteUrl;
-
-    bool versionsLoaded = false;
-    QVector<IndexedVersion> versions;
-};
-
-void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
-void loadIndexedPackVersions(IndexedPack &pack, QJsonArray &arr, const shared_qobject_ptr<QNetworkAccessManager> &network, BaseInstance *inst);
-}
-
-Q_DECLARE_METATYPE(Modrinth::IndexedPack)

launcher/ui/pages/modplatform/flame/FlameModModel.cpp

@@ -39,7 +39,7 @@ QVariant ListModel::data(const QModelIndex &index, int role) const
         return QString("INVALID INDEX %1").arg(pos);
     }
 
-    IndexedPack pack = modpacks.at(pos);
+    ModPlatform::IndexedPack pack = modpacks.at(pos);
     if(role == Qt::DisplayRole)
     {
         return pack.name;
@@ -225,12 +225,12 @@ void ListModel::searchRequestFinished()
         return;
     }
 
-    QList<FlameMod::IndexedPack> newList;
+    QList<ModPlatform::IndexedPack> newList;
     auto packs = doc.array();
     for(auto packRaw : packs) {
         auto packObj = packRaw.toObject();
 
-        FlameMod::IndexedPack pack;
+        ModPlatform::IndexedPack pack;
         try
         {
             FlameMod::loadIndexedPack(pack, packObj);

launcher/ui/pages/modplatform/flame/FlameModModel.h

@@ -57,7 +57,7 @@ private:
     void requestLogo(QString file, QString url);
 
 private:
-    QList<IndexedPack> modpacks;
+    QList<ModPlatform::IndexedPack> modpacks;
     QStringList m_failedLogos;
     QStringList m_loadingLogos;
     LogoMap m_logoMap;

launcher/ui/pages/modplatform/flame/FlameModPage.cpp

@@ -77,7 +77,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
     return;
   }
 
-  current = listModel->data(first, Qt::UserRole).value<FlameMod::IndexedPack>();
+  current = listModel->data(first, Qt::UserRole).value<ModPlatform::IndexedPack>();
   QString text = "";
   QString name = current.name;
 
@@ -86,7 +86,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
   else
     text = "<a href=\"" + current.websiteUrl + "\">" + name + "</a>";
   if (!current.authors.empty()) {
-    auto authorToStr = [](FlameMod::ModpackAuthor &author) {
+    auto authorToStr = [](ModPlatform::ModpackAuthor &author) {
       if (author.url.isEmpty()) {
         return author.name;
       }
@@ -112,7 +112,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
         new NetJob(QString("Flame::ModVersions(%1)").arg(current.name),
                    APPLICATION->network());
     auto response = new QByteArray();
-    int addonId = current.addonId;
+    int addonId = current.addonId.toInt();
     netJob->addNetAction(Net::Download::makeByteArray(
         QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files")
             .arg(addonId),

launcher/ui/pages/modplatform/flame/FlameModPage.h

@@ -62,7 +62,7 @@ private:
     Ui::FlameModPage *ui = nullptr;
     ModDownloadDialog* dialog = nullptr;
     FlameMod::ListModel* listModel = nullptr;
-    FlameMod::IndexedPack current;
+    ModPlatform::IndexedPack current;
 
     int selectedVersion = -1;
 };

launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp

@@ -41,7 +41,7 @@ QVariant ListModel::data(const QModelIndex &index, int role) const
         return QString("INVALID INDEX %1").arg(pos);
     }
 
-    IndexedPack pack = modpacks.at(pos);
+    ModPlatform::IndexedPack pack = modpacks.at(pos);
     if(role == Qt::DisplayRole)
     {
         return pack.name;
@@ -222,12 +222,12 @@ void Modrinth::ListModel::searchRequestFinished()
         return;
     }
 
-    QList<Modrinth::IndexedPack> newList;
+    QList<ModPlatform::IndexedPack> newList;
     auto packs = doc.object().value("hits").toArray();
     for(auto packRaw : packs) {
         auto packObj = packRaw.toObject();
 
-        Modrinth::IndexedPack pack;
+        ModPlatform::IndexedPack pack;
         try
         {
             Modrinth::loadIndexedPack(pack, packObj);

launcher/ui/pages/modplatform/modrinth/ModrinthModel.h

@@ -57,7 +57,7 @@ private:
     void requestLogo(QString file, QString url);
 
 private:
-    QList<IndexedPack> modpacks;
+    QList<ModPlatform::IndexedPack> modpacks;
     QStringList m_failedLogos;
     QStringList m_loadingLogos;
     LogoMap m_logoMap;

launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp

@@ -76,7 +76,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
     return;
   }
 
-  current = listModel->data(first, Qt::UserRole).value<Modrinth::IndexedPack>();
+  current = listModel->data(first, Qt::UserRole).value<ModPlatform::IndexedPack>();
   QString text = "";
   QString name = current.name;
 
@@ -84,8 +84,8 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
     text = name;
   else
     text = "<a href=\"" + current.websiteUrl + "\">" + name + "</a>";
-  text += "<br>" + tr(" by ") + "<a href=\"" + current.author.url + "\">" +
+  text += "<br>" + tr(" by ") + "<a href=\"" + current.authors[0].url + "\">" +
-          current.author.name + "</a><br><br>";
+          current.authors[0].name + "</a><br><br>";
   ui->packDescription->setHtml(text + current.description);
 
   if (!current.versionsLoaded) {
@@ -98,7 +98,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
         new NetJob(QString("Modrinth::ModVersions(%1)").arg(current.name),
                    APPLICATION->network());
     auto response = new QByteArray();
-    QString addonId = current.addonId;
+    QString addonId = current.addonId.toString();
     netJob->addNetAction(Net::Download::makeByteArray(
         QString("https://api.modrinth.com/v2/project/%1/version").arg(addonId),
         response));

launcher/ui/pages/modplatform/modrinth/ModrinthPage.h

@@ -62,7 +62,7 @@ private:
     Ui::ModrinthPage *ui = nullptr;
     ModDownloadDialog* dialog = nullptr;
     Modrinth::ListModel* listModel = nullptr;
-    Modrinth::IndexedPack current;
+    ModPlatform::IndexedPack current;
 
     int selectedVersion = -1;
 };