From b30b88716e67de93ea1c97d9dfd02a41af5428f3 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Wed, 13 Apr 2022 19:16:36 -0300
Subject: feat: add very early mod.toml packwiz support

Also use it as a on-disk format for storing mod metadata. This will be
used later on to make better mod managment.
---
 launcher/modplatform/ModIndex.h                    | 31 +++++++++++
 launcher/modplatform/flame/FlameModIndex.cpp       |  1 +
 .../modplatform/modrinth/ModrinthPackIndex.cpp     |  1 +
 launcher/modplatform/packwiz/Packwiz.cpp           | 60 ++++++++++++++++++++++
 launcher/modplatform/packwiz/Packwiz.h             | 43 ++++++++++++++++
 5 files changed, 136 insertions(+)
 create mode 100644 launcher/modplatform/packwiz/Packwiz.cpp
 create mode 100644 launcher/modplatform/packwiz/Packwiz.h

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 7e1cf254..9c9ba99f 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -8,6 +8,35 @@
 
 namespace ModPlatform {
 
+enum class Provider{
+    MODRINTH,
+    FLAME
+};
+
+class ProviderCapabilities {
+   public:
+    static QString hashType(Provider p) 
+    {
+        switch(p){
+        case Provider::MODRINTH:
+            return "sha256";
+        case Provider::FLAME:
+            return "murmur2";
+        }
+        return "";
+    }
+    static QString providerName(Provider p) 
+    {
+        switch(p){
+        case Provider::MODRINTH:
+            return "modrinth";
+        case Provider::FLAME:
+            return "curseforge";
+        }
+        return "";
+    }
+};
+
 struct ModpackAuthor {
     QString name;
     QString url;
@@ -26,6 +55,7 @@ struct IndexedVersion {
 
 struct IndexedPack {
     QVariant addonId;
+    Provider provider;
     QString name;
     QString description;
     QList<ModpackAuthor> authors;
@@ -40,3 +70,4 @@ struct IndexedPack {
 }  // namespace ModPlatform
 
 Q_DECLARE_METATYPE(ModPlatform::IndexedPack)
+Q_DECLARE_METATYPE(ModPlatform::Provider)
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index ba0824cf..45f02b71 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -9,6 +9,7 @@
 void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
 {
     pack.addonId = Json::requireInteger(obj, "id");
+    pack.provider = ModPlatform::Provider::FLAME;
     pack.name = Json::requireString(obj, "name");
     pack.websiteUrl = Json::ensureString(Json::ensureObject(obj, "links"), "websiteUrl", "");
     pack.description = Json::ensureString(obj, "summary", "");
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index f7fa9864..6c8659dc 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -28,6 +28,7 @@ static ModrinthAPI api;
 void Modrinth::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
 {
     pack.addonId = Json::requireString(obj, "project_id");
+    pack.provider = ModPlatform::Provider::MODRINTH;
     pack.name = Json::requireString(obj, "title");
     
     QString slug = Json::ensureString(obj, "slug", "");
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
new file mode 100644
index 00000000..ff86a8a9
--- /dev/null
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -0,0 +1,60 @@
+#include "Packwiz.h"
+
+#include "modplatform/ModIndex.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QObject>
+
+auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
+{
+    Mod mod;
+
+    mod.name = mod_pack.name;
+    mod.filename = mod_version.fileName;
+
+    mod.url = mod_version.downloadUrl;
+    mod.hash_format = ModPlatform::ProviderCapabilities::hashType(mod_pack.provider);
+    mod.hash = "";  // FIXME
+
+    mod.provider = mod_pack.provider;
+    mod.file_id = mod_pack.addonId;
+    mod.project_id = mod_version.fileId;
+
+    return mod;
+}
+
+void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
+{
+    // Ensure the corresponding mod's info exists, and create it if not
+    auto index_file_name = QString("%1.toml").arg(mod.name);
+    QFile index_file(index_dir.absoluteFilePath(index_file_name));
+
+    // There's already data on there!
+    if (index_file.exists()) { index_file.remove(); }
+
+    if (!index_file.open(QIODevice::ReadWrite)) {
+        qCritical() << "Could not open file " << index_file_name << "!";
+        return;
+    }
+
+    // Put TOML data into the file
+    QTextStream in_stream(&index_file);
+    auto addToStream = [&in_stream](QString&& key, QString value) { in_stream << QString("%1 = \"%2\"\n").arg(key, value); };
+
+    {
+        addToStream("name", mod.name);
+        addToStream("filename", mod.filename);
+        addToStream("side", mod.side);
+
+        in_stream << QString("\n[download]\n");
+        addToStream("url", mod.url.toString());
+        addToStream("hash-format", mod.hash_format);
+        addToStream("hash", mod.hash);
+
+        in_stream << QString("\n[update]\n");
+        in_stream << QString("[update.%1]\n").arg(ModPlatform::ProviderCapabilities::providerName(mod.provider));
+        addToStream("file-id", mod.file_id.toString());
+        addToStream("project-id", mod.project_id.toString());
+    }
+}
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
new file mode 100644
index 00000000..64b95e7a
--- /dev/null
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <QString>
+#include <QUrl>
+#include <QVariant>
+
+namespace ModPlatform {
+enum class Provider;
+class IndexedPack;
+class IndexedVersion;
+}  // namespace ModPlatform
+
+class QDir;
+
+class Packwiz {
+   public:
+    struct Mod {
+        QString name;
+        QString filename;
+        // FIXME: make side an enum
+        QString side = "both";
+
+        // [download]
+        QUrl url;
+        // FIXME: make hash-format an enum
+        QString hash_format;
+        QString hash;
+
+        // [update]
+        ModPlatform::Provider provider;
+        QVariant file_id;
+        QVariant project_id;
+    };
+
+    /* Generates the object representing the information in a mod.toml file via its common representation in the launcher */
+    static auto createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod;
+
+    /* Updates the mod index for the provided mod.
+     * This creates a new index if one does not exist already
+     * TODO: Ask the user if they want to override, and delete the old mod's files, or keep the old one.
+     * */
+    static void updateModIndex(QDir& index_dir, Mod& mod);
+};
-- 
cgit 


From eaa5ce446765ef4305a1462d68e278b0797966ee Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Wed, 13 Apr 2022 19:23:12 -0300
Subject: feat(ui): adapt SequentialTask to nested SequentialTasks

---
 launcher/modplatform/packwiz/Packwiz.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 64b95e7a..9c90f7de 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -1,13 +1,12 @@
 #pragma once
 
+#include "modplatform/ModIndex.h"
+
 #include <QString>
 #include <QUrl>
 #include <QVariant>
 
 namespace ModPlatform {
-enum class Provider;
-class IndexedPack;
-class IndexedVersion;
 }  // namespace ModPlatform
 
 class QDir;
-- 
cgit 


From 8e4438b375ee904aa8225b569899355372e5987c Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Wed, 13 Apr 2022 21:25:08 -0300
Subject: feat: add parser for current impl of packwiz mod.toml

This reads a local mod.toml file and extract information from it. Using
C libs in C++ is kind of a pain tho :(
---
 launcher/modplatform/ModIndex.h          |  2 +-
 launcher/modplatform/packwiz/Packwiz.cpp | 90 ++++++++++++++++++++++++++++++++
 launcher/modplatform/packwiz/Packwiz.h   |  5 ++
 3 files changed, 96 insertions(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 9c9ba99f..c5329772 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -25,7 +25,7 @@ class ProviderCapabilities {
         }
         return "";
     }
-    static QString providerName(Provider p) 
+    static const char* providerName(Provider p) 
     {
         switch(p){
         case Provider::MODRINTH:
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index ff86a8a9..58bead82 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -1,6 +1,7 @@
 #include "Packwiz.h"
 
 #include "modplatform/ModIndex.h"
+#include "toml.h"
 
 #include <QDebug>
 #include <QDir>
@@ -58,3 +59,92 @@ void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
         addToStream("project-id", mod.project_id.toString());
     }
 }
+
+auto Packwiz::getIndexForMod(QDir& index_dir, QString mod_name) -> Mod
+{
+    Mod mod;
+
+    auto index_file_name = QString("%1.toml").arg(mod_name);
+    QFile index_file(index_dir.absoluteFilePath(index_file_name));
+
+    if (!index_file.exists()) { return mod; }
+    if (!index_file.open(QIODevice::ReadOnly)) { return mod; }
+
+    toml_table_t* table;
+
+    char errbuf[200];
+    table = toml_parse(index_file.readAll().data(), errbuf, sizeof(errbuf));
+
+    index_file.close();
+
+    if (!table) {
+        qCritical() << QString("Could not open file %1").arg(index_file_name);
+        return mod;
+    }
+
+    // Helper function for extracting data from the TOML file
+    auto stringEntry = [&](toml_table_t* parent, const char* entry_name) -> QString {
+        toml_datum_t var = toml_string_in(parent, entry_name);
+        if (!var.ok) {
+            qCritical() << QString("Failed to read property '%1' in mod metadata.").arg(entry_name);
+            return {};
+        }
+
+        QString tmp = var.u.s;
+        free(var.u.s);
+
+        return tmp;
+    };
+
+    { // Basic info
+        mod.name = stringEntry(table, "name");
+        // Basic sanity check
+        if (mod.name != mod_name) {
+            qCritical() << QString("Name mismatch in mod metadata:\nExpected:%1\nGot:%2").arg(mod_name, mod.name);
+            return {};
+        }
+
+        mod.filename = stringEntry(table, "filename");
+        mod.side = stringEntry(table, "side");
+    }
+
+    { // [download] info
+        toml_table_t* download_table = toml_table_in(table, "download");
+        if (!download_table) {
+            qCritical() << QString("No [download] section found on mod metadata!");
+            return {};
+        }
+
+        mod.url = stringEntry(download_table, "url");
+        mod.hash_format = stringEntry(download_table, "hash-format");
+        mod.hash = stringEntry(download_table, "hash");
+    }
+
+    { // [update] info
+        using ProviderCaps = ModPlatform::ProviderCapabilities;
+        using Provider = ModPlatform::Provider;
+
+        toml_table_t* update_table = toml_table_in(table, "update");
+        if (!update_table) {
+            qCritical() << QString("No [update] section found on mod metadata!");
+            return {};
+        }
+
+        toml_table_t* mod_provider_table;
+        if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::FLAME)))) {
+            mod.provider = Provider::FLAME;
+        } else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::MODRINTH)))) {
+            mod.provider = Provider::MODRINTH;
+        } else {
+            qCritical() << "No mod provider on mod metadata!";
+            return {};
+        }
+        
+        mod.file_id = stringEntry(mod_provider_table, "file-id");
+        mod.project_id = stringEntry(mod_provider_table, "project-id");
+    }
+
+    toml_free(table);
+
+    return mod;
+}
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 9c90f7de..08edaab9 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -39,4 +39,9 @@ class Packwiz {
      * TODO: Ask the user if they want to override, and delete the old mod's files, or keep the old one.
      * */
     static void updateModIndex(QDir& index_dir, Mod& mod);
+
+    /* Gets the metadata for a mod with a particular name.
+     * If the mod doesn't have a metadata, it simply returns an empty Mod object.
+     * */
+    static auto getIndexForMod(QDir& index_dir, QString mod_name) -> Mod;
 };
-- 
cgit 


From e93b9560b5137a5ee7acdc34c0f74992aa02aad6 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Thu, 14 Apr 2022 22:02:41 -0300
Subject: feat: add method to delete mod metadata

Also moves indexDir setting from LocalModUpdateTask -> ModFolderModel
---
 launcher/modplatform/packwiz/Packwiz.cpp | 44 ++++++++++++++++++++++++--------
 launcher/modplatform/packwiz/Packwiz.h   |  5 +++-
 2 files changed, 38 insertions(+), 11 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 58bead82..bfadf7cb 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -7,6 +7,12 @@
 #include <QDir>
 #include <QObject>
 
+// Helpers
+static inline QString indexFileName(QString const& mod_name)
+{
+    return QString("%1.toml").arg(mod_name);
+}
+
 auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
 {
     Mod mod;
@@ -28,14 +34,13 @@ auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pac
 void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
 {
     // Ensure the corresponding mod's info exists, and create it if not
-    auto index_file_name = QString("%1.toml").arg(mod.name);
-    QFile index_file(index_dir.absoluteFilePath(index_file_name));
+    QFile index_file(index_dir.absoluteFilePath(indexFileName(mod.name)));
 
     // There's already data on there!
     if (index_file.exists()) { index_file.remove(); }
 
     if (!index_file.open(QIODevice::ReadWrite)) {
-        qCritical() << "Could not open file " << index_file_name << "!";
+        qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
         return;
     }
 
@@ -60,15 +65,34 @@ void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
     }
 }
 
-auto Packwiz::getIndexForMod(QDir& index_dir, QString mod_name) -> Mod
+void Packwiz::deleteModIndex(QDir& index_dir, QString& mod_name)
+{
+    QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
+
+    if(!index_file.exists()){
+        qWarning() << QString("Tried to delete non-existent mod metadata for %1!").arg(mod_name);
+        return;
+    }
+
+    if(!index_file.remove()){
+        qWarning() << QString("Failed to remove metadata for mod %1!").arg(mod_name);
+    }
+}
+
+auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
 {
     Mod mod;
 
-    auto index_file_name = QString("%1.toml").arg(mod_name);
-    QFile index_file(index_dir.absoluteFilePath(index_file_name));
+    QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
 
-    if (!index_file.exists()) { return mod; }
-    if (!index_file.open(QIODevice::ReadOnly)) { return mod; }
+    if (!index_file.exists()) {
+        qWarning() << QString("Tried to get a non-existent mod metadata for %1").arg(mod_name);
+        return mod;
+    }
+    if (!index_file.open(QIODevice::ReadOnly)) {
+        qWarning() << QString("Failed to open mod metadata for %1").arg(mod_name);
+        return mod;
+    }
 
     toml_table_t* table;
 
@@ -78,7 +102,7 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString mod_name) -> Mod
     index_file.close();
 
     if (!table) {
-        qCritical() << QString("Could not open file %1").arg(index_file_name);
+        qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
         return mod;
     }
 
@@ -136,7 +160,7 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString mod_name) -> Mod
         } else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::MODRINTH)))) {
             mod.provider = Provider::MODRINTH;
         } else {
-            qCritical() << "No mod provider on mod metadata!";
+            qCritical() << QString("No mod provider on mod metadata!");
             return {};
         }
         
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 08edaab9..541059d0 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -40,8 +40,11 @@ class Packwiz {
      * */
     static void updateModIndex(QDir& index_dir, Mod& mod);
 
+    /* Deletes the metadata for the mod with the given name. If the metadata doesn't exist, it does nothing. */
+    static void deleteModIndex(QDir& index_dir, QString& mod_name);
+
     /* Gets the metadata for a mod with a particular name.
      * If the mod doesn't have a metadata, it simply returns an empty Mod object.
      * */
-    static auto getIndexForMod(QDir& index_dir, QString mod_name) -> Mod;
+    static auto getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod;
 };
-- 
cgit 


From 092d2f8917271264871d69239ecb8836b34d0994 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Fri, 15 Apr 2022 22:37:10 -0300
Subject: feat: add support for converting builtin -> packwiz mod formats

Also adds more documentation.
---
 launcher/modplatform/packwiz/Packwiz.cpp | 41 +++++++++++++++++++++++++++-----
 launcher/modplatform/packwiz/Packwiz.h   | 36 ++++++++++++++++++----------
 2 files changed, 58 insertions(+), 19 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index bfadf7cb..445d64fb 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -1,12 +1,14 @@
 #include "Packwiz.h"
 
-#include "modplatform/ModIndex.h"
-#include "toml.h"
-
 #include <QDebug>
 #include <QDir>
 #include <QObject>
 
+#include "toml.h"
+
+#include "modplatform/ModIndex.h"
+#include "minecraft/mod/Mod.h"
+
 // Helpers
 static inline QString indexFileName(QString const& mod_name)
 {
@@ -31,12 +33,39 @@ auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pac
     return mod;
 }
 
+auto Packwiz::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
+{
+    auto mod_name = internal_mod.name();
+
+    // Try getting metadata if it exists
+    Mod mod { getIndexForMod(index_dir, mod_name) };
+    if(mod.isValid())
+        return mod;
+
+    // Manually construct packwiz mod
+    mod.name = internal_mod.name();
+    mod.filename = internal_mod.filename().fileName();
+
+    // TODO: Have a mechanism for telling the UI subsystem that we want to gather user information
+    // (i.e. which mod provider we want to use). Maybe an object parameter with a signal for that?
+
+    return mod;
+}
+
 void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
 {
+    if(!mod.isValid()){
+        qCritical() << QString("Tried to update metadata of an invalid mod!");
+        return;
+    }
+
     // Ensure the corresponding mod's info exists, and create it if not
     QFile index_file(index_dir.absoluteFilePath(indexFileName(mod.name)));
 
     // There's already data on there!
+    // TODO: We should do more stuff here, as the user is likely trying to
+    // override a file. In this case, check versions and ask the user what
+    // they want to do!
     if (index_file.exists()) { index_file.remove(); }
 
     if (!index_file.open(QIODevice::ReadWrite)) {
@@ -87,11 +116,11 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
 
     if (!index_file.exists()) {
         qWarning() << QString("Tried to get a non-existent mod metadata for %1").arg(mod_name);
-        return mod;
+        return {};
     }
     if (!index_file.open(QIODevice::ReadOnly)) {
         qWarning() << QString("Failed to open mod metadata for %1").arg(mod_name);
-        return mod;
+        return {};
     }
 
     toml_table_t* table;
@@ -103,7 +132,7 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
 
     if (!table) {
         qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
-        return mod;
+        return {};
     }
 
     // Helper function for extracting data from the TOML file
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 541059d0..457d268a 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -6,33 +6,43 @@
 #include <QUrl>
 #include <QVariant>
 
-namespace ModPlatform {
-}  // namespace ModPlatform
-
 class QDir;
 
+// Mod from launcher/minecraft/mod/Mod.h
+class Mod;
+
 class Packwiz {
    public:
     struct Mod {
-        QString name;
-        QString filename;
+        QString name {};
+        QString filename {};
         // FIXME: make side an enum
-        QString side = "both";
+        QString side {"both"};
 
         // [download]
-        QUrl url;
+        QUrl url {};
         // FIXME: make hash-format an enum
-        QString hash_format;
-        QString hash;
+        QString hash_format {};
+        QString hash {};
 
         // [update]
-        ModPlatform::Provider provider;
-        QVariant file_id;
-        QVariant project_id;
+        ModPlatform::Provider provider {};
+        QVariant file_id {};
+        QVariant project_id {};
+
+       public:
+        // This is a heuristic, but should work for now.
+        auto isValid() const -> bool { return !name.isEmpty(); }
     };
 
-    /* Generates the object representing the information in a mod.toml file via its common representation in the launcher */
+    /* Generates the object representing the information in a mod.toml file via
+     * its common representation in the launcher, when downloading mods.
+     * */
     static auto createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod;
+    /* Generates the object representing the information in a mod.toml file via
+     * its common representation in the launcher.
+     * */
+    static auto createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod;
 
     /* Updates the mod index for the provided mod.
      * This creates a new index if one does not exist already
-- 
cgit 


From fab4a7a6029beb60bade312ee89e649202d178de Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sat, 16 Apr 2022 13:27:29 -0300
Subject: refactor: abstract metadata handling and clarify names

---
 launcher/modplatform/packwiz/Packwiz.cpp | 16 ++++++++++------
 launcher/modplatform/packwiz/Packwiz.h   |  6 +++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 445d64fb..27339c2d 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -9,13 +9,15 @@
 #include "modplatform/ModIndex.h"
 #include "minecraft/mod/Mod.h"
 
+namespace Packwiz {
+
 // Helpers
 static inline QString indexFileName(QString const& mod_name)
 {
     return QString("%1.toml").arg(mod_name);
 }
 
-auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
+auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
 {
     Mod mod;
 
@@ -33,7 +35,7 @@ auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pac
     return mod;
 }
 
-auto Packwiz::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
+auto V1::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
 {
     auto mod_name = internal_mod.name();
 
@@ -44,7 +46,7 @@ auto Packwiz::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
 
     // Manually construct packwiz mod
     mod.name = internal_mod.name();
-    mod.filename = internal_mod.filename().fileName();
+    mod.filename = internal_mod.fileinfo().fileName();
 
     // TODO: Have a mechanism for telling the UI subsystem that we want to gather user information
     // (i.e. which mod provider we want to use). Maybe an object parameter with a signal for that?
@@ -52,7 +54,7 @@ auto Packwiz::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
     return mod;
 }
 
-void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
+void V1::updateModIndex(QDir& index_dir, Mod& mod)
 {
     if(!mod.isValid()){
         qCritical() << QString("Tried to update metadata of an invalid mod!");
@@ -94,7 +96,7 @@ void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
     }
 }
 
-void Packwiz::deleteModIndex(QDir& index_dir, QString& mod_name)
+void V1::deleteModIndex(QDir& index_dir, QString& mod_name)
 {
     QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
 
@@ -108,7 +110,7 @@ void Packwiz::deleteModIndex(QDir& index_dir, QString& mod_name)
     }
 }
 
-auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
+auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
 {
     Mod mod;
 
@@ -201,3 +203,5 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
 
     return mod;
 }
+
+} // namespace Packwiz
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 457d268a..777a365f 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -11,7 +11,9 @@ class QDir;
 // Mod from launcher/minecraft/mod/Mod.h
 class Mod;
 
-class Packwiz {
+namespace Packwiz {
+
+class V1 {
    public:
     struct Mod {
         QString name {};
@@ -58,3 +60,5 @@ class Packwiz {
      * */
     static auto getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod;
 };
+
+} // namespace Packwiz
-- 
cgit 


From d7f6b3699074b268fd554bd1eb9da68f1e533355 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sun, 17 Apr 2022 11:40:41 -0300
Subject: test+fix: add basic tests and fix issues with it

---
 launcher/modplatform/ModIndex.h                    |  2 +-
 launcher/modplatform/packwiz/Packwiz.cpp           | 76 +++++++++++++---------
 launcher/modplatform/packwiz/Packwiz.h             | 11 +++-
 launcher/modplatform/packwiz/Packwiz_test.cpp      | 68 +++++++++++++++++++
 .../packwiz/testdata/borderless-mining.toml        | 13 ++++
 .../testdata/screenshot-to-clipboard-fabric.toml   | 13 ++++
 6 files changed, 150 insertions(+), 33 deletions(-)
 create mode 100644 launcher/modplatform/packwiz/Packwiz_test.cpp
 create mode 100644 launcher/modplatform/packwiz/testdata/borderless-mining.toml
 create mode 100644 launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index c5329772..ee623b78 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -19,7 +19,7 @@ class ProviderCapabilities {
     {
         switch(p){
         case Provider::MODRINTH:
-            return "sha256";
+            return "sha512";
         case Provider::FLAME:
             return "murmur2";
         }
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 27339c2d..8fd74a3e 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -14,6 +14,8 @@ namespace Packwiz {
 // Helpers
 static inline QString indexFileName(QString const& mod_name)
 {
+    if(mod_name.endsWith(".toml"))
+        return mod_name;
     return QString("%1.toml").arg(mod_name);
 }
 
@@ -91,8 +93,16 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
 
         in_stream << QString("\n[update]\n");
         in_stream << QString("[update.%1]\n").arg(ModPlatform::ProviderCapabilities::providerName(mod.provider));
-        addToStream("file-id", mod.file_id.toString());
-        addToStream("project-id", mod.project_id.toString());
+        switch(mod.provider){
+        case(ModPlatform::Provider::FLAME):
+            in_stream << QString("file-id = %1\n").arg(mod.file_id.toString());
+            in_stream << QString("project-id = %1\n").arg(mod.project_id.toString());
+            break;
+        case(ModPlatform::Provider::MODRINTH):
+            addToStream("mod-id", mod.mod_id().toString());
+            addToStream("version", mod.version().toString());
+            break;
+        }
     }
 }
 
@@ -110,18 +120,44 @@ void V1::deleteModIndex(QDir& index_dir, QString& mod_name)
     }
 }
 
-auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
+// Helper functions for extracting data from the TOML file
+static auto stringEntry(toml_table_t* parent, const char* entry_name) -> QString
+{
+    toml_datum_t var = toml_string_in(parent, entry_name);
+    if (!var.ok) {
+        qCritical() << QString("Failed to read str property '%1' in mod metadata.").arg(entry_name);
+        return {};
+    }
+
+    QString tmp = var.u.s;
+    free(var.u.s);
+
+    return tmp;
+}
+
+static auto intEntry(toml_table_t* parent, const char* entry_name) -> int
+{
+    toml_datum_t var = toml_int_in(parent, entry_name);
+    if (!var.ok) {
+        qCritical() << QString("Failed to read int property '%1' in mod metadata.").arg(entry_name);
+        return {};
+    }
+
+    return var.u.i;
+}
+
+auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
 {
     Mod mod;
 
-    QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
+    QFile index_file(index_dir.absoluteFilePath(indexFileName(index_file_name)));
 
     if (!index_file.exists()) {
-        qWarning() << QString("Tried to get a non-existent mod metadata for %1").arg(mod_name);
+        qWarning() << QString("Tried to get a non-existent mod metadata for %1").arg(index_file_name);
         return {};
     }
     if (!index_file.open(QIODevice::ReadOnly)) {
-        qWarning() << QString("Failed to open mod metadata for %1").arg(mod_name);
+        qWarning() << QString("Failed to open mod metadata for %1").arg(index_file_name);
         return {};
     }
 
@@ -136,29 +172,9 @@ auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
         qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
         return {};
     }
-
-    // Helper function for extracting data from the TOML file
-    auto stringEntry = [&](toml_table_t* parent, const char* entry_name) -> QString {
-        toml_datum_t var = toml_string_in(parent, entry_name);
-        if (!var.ok) {
-            qCritical() << QString("Failed to read property '%1' in mod metadata.").arg(entry_name);
-            return {};
-        }
-
-        QString tmp = var.u.s;
-        free(var.u.s);
-
-        return tmp;
-    };
-
+    
     { // Basic info
         mod.name = stringEntry(table, "name");
-        // Basic sanity check
-        if (mod.name != mod_name) {
-            qCritical() << QString("Name mismatch in mod metadata:\nExpected:%1\nGot:%2").arg(mod_name, mod.name);
-            return {};
-        }
-
         mod.filename = stringEntry(table, "filename");
         mod.side = stringEntry(table, "side");
     }
@@ -188,15 +204,17 @@ auto V1::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
         toml_table_t* mod_provider_table;
         if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::FLAME)))) {
             mod.provider = Provider::FLAME;
+            mod.file_id = intEntry(mod_provider_table, "file-id");
+            mod.project_id = intEntry(mod_provider_table, "project-id");
         } else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::MODRINTH)))) {
             mod.provider = Provider::MODRINTH;
+            mod.mod_id() = stringEntry(mod_provider_table, "mod-id");
+            mod.version() = stringEntry(mod_provider_table, "version");
         } else {
             qCritical() << QString("No mod provider on mod metadata!");
             return {};
         }
         
-        mod.file_id = stringEntry(mod_provider_table, "file-id");
-        mod.project_id = stringEntry(mod_provider_table, "project-id");
     }
 
     toml_free(table);
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 777a365f..69125dbc 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -33,8 +33,13 @@ class V1 {
         QVariant project_id {};
 
        public:
-        // This is a heuristic, but should work for now.
-        auto isValid() const -> bool { return !name.isEmpty(); }
+        // This is a totally heuristic, but should work for now.
+        auto isValid() const -> bool { return !name.isEmpty() && !project_id.isNull(); }
+
+        // Different providers can use different names for the same thing
+        // Modrinth-specific
+        auto mod_id() -> QVariant& { return project_id; }
+        auto version() -> QVariant& { return file_id; }
     };
 
     /* Generates the object representing the information in a mod.toml file via
@@ -58,7 +63,7 @@ class V1 {
     /* Gets the metadata for a mod with a particular name.
      * If the mod doesn't have a metadata, it simply returns an empty Mod object.
      * */
-    static auto getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod;
+    static auto getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod;
 };
 
 } // namespace Packwiz
diff --git a/launcher/modplatform/packwiz/Packwiz_test.cpp b/launcher/modplatform/packwiz/Packwiz_test.cpp
new file mode 100644
index 00000000..2e61c167
--- /dev/null
+++ b/launcher/modplatform/packwiz/Packwiz_test.cpp
@@ -0,0 +1,68 @@
+#include <QTemporaryDir>
+#include <QTest>
+
+#include "TestUtil.h"
+#include "Packwiz.h"
+
+class PackwizTest : public QObject {
+    Q_OBJECT
+
+   private slots:
+   // Files taken from https://github.com/packwiz/packwiz-example-pack
+   void loadFromFile_Modrinth()
+   {
+        QString source = QFINDTESTDATA("testdata");
+
+        QDir index_dir(source);
+        QString name_mod("borderless-mining.toml");
+        QVERIFY(index_dir.entryList().contains(name_mod));
+
+        auto metadata = Packwiz::V1::getIndexForMod(index_dir, name_mod);
+
+        QVERIFY(metadata.isValid());
+
+        QCOMPARE(metadata.name, "Borderless Mining");
+        QCOMPARE(metadata.filename, "borderless-mining-1.1.1+1.18.jar");
+        QCOMPARE(metadata.side, "client");
+        
+        QCOMPARE(metadata.url, QUrl("https://cdn.modrinth.com/data/kYq5qkSL/versions/1.1.1+1.18/borderless-mining-1.1.1+1.18.jar"));
+        QCOMPARE(metadata.hash_format, "sha512");
+        QCOMPARE(metadata.hash, "c8fe6e15ddea32668822dddb26e1851e5f03834be4bcb2eff9c0da7fdc086a9b6cead78e31a44d3bc66335cba11144ee0337c6d5346f1ba63623064499b3188d");
+
+        QCOMPARE(metadata.provider, ModPlatform::Provider::MODRINTH);
+        QCOMPARE(metadata.version(), "ug2qKTPR");
+        QCOMPARE(metadata.mod_id(), "kYq5qkSL");
+   }
+
+    void loadFromFile_Curseforge()
+    {
+        QString source = QFINDTESTDATA("testdata");
+
+        QDir index_dir(source);
+        QString name_mod("screenshot-to-clipboard-fabric.toml");
+        QVERIFY(index_dir.entryList().contains(name_mod));
+
+        // Try without the .toml at the end
+        name_mod.chop(5);
+
+        auto metadata = Packwiz::V1::getIndexForMod(index_dir, name_mod);
+
+        QVERIFY(metadata.isValid());
+
+        QCOMPARE(metadata.name, "Screenshot to Clipboard (Fabric)");
+        QCOMPARE(metadata.filename, "screenshot-to-clipboard-1.0.7-fabric.jar");
+        QCOMPARE(metadata.side, "both");
+        
+        QCOMPARE(metadata.url, QUrl("https://edge.forgecdn.net/files/3509/43/screenshot-to-clipboard-1.0.7-fabric.jar"));
+        QCOMPARE(metadata.hash_format, "murmur2");
+        QCOMPARE(metadata.hash, "1781245820");
+
+        QCOMPARE(metadata.provider, ModPlatform::Provider::FLAME);
+        QCOMPARE(metadata.file_id, 3509043);
+        QCOMPARE(metadata.project_id, 327154);
+    }
+};
+
+QTEST_GUILESS_MAIN(PackwizTest)
+
+#include "Packwiz_test.moc"
diff --git a/launcher/modplatform/packwiz/testdata/borderless-mining.toml b/launcher/modplatform/packwiz/testdata/borderless-mining.toml
new file mode 100644
index 00000000..16545fd4
--- /dev/null
+++ b/launcher/modplatform/packwiz/testdata/borderless-mining.toml
@@ -0,0 +1,13 @@
+name = "Borderless Mining"
+filename = "borderless-mining-1.1.1+1.18.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/kYq5qkSL/versions/1.1.1+1.18/borderless-mining-1.1.1+1.18.jar"
+hash-format = "sha512"
+hash = "c8fe6e15ddea32668822dddb26e1851e5f03834be4bcb2eff9c0da7fdc086a9b6cead78e31a44d3bc66335cba11144ee0337c6d5346f1ba63623064499b3188d"
+
+[update]
+[update.modrinth]
+mod-id = "kYq5qkSL"
+version = "ug2qKTPR"
diff --git a/launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml b/launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml
new file mode 100644
index 00000000..87d70ada
--- /dev/null
+++ b/launcher/modplatform/packwiz/testdata/screenshot-to-clipboard-fabric.toml
@@ -0,0 +1,13 @@
+name = "Screenshot to Clipboard (Fabric)"
+filename = "screenshot-to-clipboard-1.0.7-fabric.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3509/43/screenshot-to-clipboard-1.0.7-fabric.jar"
+hash-format = "murmur2"
+hash = "1781245820"
+
+[update]
+[update.curseforge]
+file-id = 3509043
+project-id = 327154
-- 
cgit 


From ba50765c306d2907e411bc0ed9a10d990cf42fd3 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Tue, 19 Apr 2022 20:19:51 -0300
Subject: tidy: apply clang-tidy to some files

Mostly the ones created in this PR + Mod.h / Mod.cpp / ModDetails.h
---
 launcher/modplatform/packwiz/Packwiz.cpp      | 9 +++++----
 launcher/modplatform/packwiz/Packwiz_test.cpp | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 8fd74a3e..978be462 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -6,13 +6,13 @@
 
 #include "toml.h"
 
-#include "modplatform/ModIndex.h"
 #include "minecraft/mod/Mod.h"
+#include "modplatform/ModIndex.h"
 
 namespace Packwiz {
 
 // Helpers
-static inline QString indexFileName(QString const& mod_name)
+static inline auto indexFileName(QString const& mod_name) -> QString
 {
     if(mod_name.endsWith(".toml"))
         return mod_name;
@@ -161,8 +161,9 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
         return {};
     }
 
-    toml_table_t* table;
+    toml_table_t* table = nullptr;
 
+    // NOLINTNEXTLINE(modernize-avoid-c-arrays)
     char errbuf[200];
     table = toml_parse(index_file.readAll().data(), errbuf, sizeof(errbuf));
 
@@ -201,7 +202,7 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
             return {};
         }
 
-        toml_table_t* mod_provider_table;
+        toml_table_t* mod_provider_table = nullptr;
         if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::FLAME)))) {
             mod.provider = Provider::FLAME;
             mod.file_id = intEntry(mod_provider_table, "file-id");
diff --git a/launcher/modplatform/packwiz/Packwiz_test.cpp b/launcher/modplatform/packwiz/Packwiz_test.cpp
index 2e61c167..08de332d 100644
--- a/launcher/modplatform/packwiz/Packwiz_test.cpp
+++ b/launcher/modplatform/packwiz/Packwiz_test.cpp
@@ -1,8 +1,8 @@
 #include <QTemporaryDir>
 #include <QTest>
 
-#include "TestUtil.h"
 #include "Packwiz.h"
+#include "TestUtil.h"
 
 class PackwizTest : public QObject {
     Q_OBJECT
-- 
cgit 


From a99858c64d275303a9f91912a2732746ef6a3c8a Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Tue, 19 Apr 2022 21:10:12 -0300
Subject: refactor: move code out of ModIndex.h

Now it's in ModIndex.cpp
---
 launcher/modplatform/ModIndex.cpp           | 24 ++++++++++++++++++++++++
 launcher/modplatform/ModIndex.h             | 22 ++--------------------
 launcher/modplatform/flame/FlameAPI.h       |  1 +
 launcher/modplatform/modrinth/ModrinthAPI.h |  1 +
 launcher/modplatform/packwiz/Packwiz.cpp    | 11 ++++++-----
 5 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 launcher/modplatform/ModIndex.cpp

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
new file mode 100644
index 00000000..eb8be992
--- /dev/null
+++ b/launcher/modplatform/ModIndex.cpp
@@ -0,0 +1,24 @@
+#include "modplatform/ModIndex.h"
+
+namespace ModPlatform{
+
+auto ProviderCapabilities::name(Provider p) -> const char*
+{
+    switch(p){
+    case Provider::MODRINTH:
+        return "modrinth";
+    case Provider::FLAME:
+        return "curseforge";
+    }
+}
+auto ProviderCapabilities::hashType(Provider p) -> QString
+{
+    switch(p){
+    case Provider::MODRINTH:
+        return "sha512";
+    case Provider::FLAME:
+        return "murmur2";
+    }
+}
+
+} // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index ee623b78..bb5c7c9d 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -15,26 +15,8 @@ enum class Provider{
 
 class ProviderCapabilities {
    public:
-    static QString hashType(Provider p) 
-    {
-        switch(p){
-        case Provider::MODRINTH:
-            return "sha512";
-        case Provider::FLAME:
-            return "murmur2";
-        }
-        return "";
-    }
-    static const char* providerName(Provider p) 
-    {
-        switch(p){
-        case Provider::MODRINTH:
-            return "modrinth";
-        case Provider::FLAME:
-            return "curseforge";
-        }
-        return "";
-    }
+    auto name(Provider) -> const char*;
+    auto hashType(Provider) -> QString;
 };
 
 struct ModpackAuthor {
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 8bb33d47..e31cf0a1 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "modplatform/ModIndex.h"
 #include "modplatform/helpers/NetworkModAPI.h"
 
 class FlameAPI : public NetworkModAPI {
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index 79bc5175..f9d35fcd 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -20,6 +20,7 @@
 
 #include "BuildConfig.h"
 #include "modplatform/ModAPI.h"
+#include "modplatform/ModIndex.h"
 #include "modplatform/helpers/NetworkModAPI.h"
 
 #include <QDebug>
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 978be462..872da9b1 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -19,6 +19,8 @@ static inline auto indexFileName(QString const& mod_name) -> QString
     return QString("%1.toml").arg(mod_name);
 }
 
+static ModPlatform::ProviderCapabilities ProviderCaps;
+
 auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
 {
     Mod mod;
@@ -27,7 +29,7 @@ auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, Mo
     mod.filename = mod_version.fileName;
 
     mod.url = mod_version.downloadUrl;
-    mod.hash_format = ModPlatform::ProviderCapabilities::hashType(mod_pack.provider);
+    mod.hash_format = ProviderCaps.hashType(mod_pack.provider);
     mod.hash = "";  // FIXME
 
     mod.provider = mod_pack.provider;
@@ -92,7 +94,7 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
         addToStream("hash", mod.hash);
 
         in_stream << QString("\n[update]\n");
-        in_stream << QString("[update.%1]\n").arg(ModPlatform::ProviderCapabilities::providerName(mod.provider));
+        in_stream << QString("[update.%1]\n").arg(ProviderCaps.name(mod.provider));
         switch(mod.provider){
         case(ModPlatform::Provider::FLAME):
             in_stream << QString("file-id = %1\n").arg(mod.file_id.toString());
@@ -193,7 +195,6 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
     }
 
     { // [update] info
-        using ProviderCaps = ModPlatform::ProviderCapabilities;
         using Provider = ModPlatform::Provider;
 
         toml_table_t* update_table = toml_table_in(table, "update");
@@ -203,11 +204,11 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
         }
 
         toml_table_t* mod_provider_table = nullptr;
-        if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::FLAME)))) {
+        if ((mod_provider_table = toml_table_in(update_table, ProviderCaps.name(Provider::FLAME)))) {
             mod.provider = Provider::FLAME;
             mod.file_id = intEntry(mod_provider_table, "file-id");
             mod.project_id = intEntry(mod_provider_table, "project-id");
-        } else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::MODRINTH)))) {
+        } else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps.name(Provider::MODRINTH)))) {
             mod.provider = Provider::MODRINTH;
             mod.mod_id() = stringEntry(mod_provider_table, "mod-id");
             mod.version() = stringEntry(mod_provider_table, "version");
-- 
cgit 


From 96e36f060443cbfa6d58df2adca3c8605851b4a3 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Wed, 20 Apr 2022 18:45:39 -0300
Subject: refactor: make mod metadata presence (or lack of) easier to find out

---
 launcher/modplatform/ModIndex.cpp        | 2 ++
 launcher/modplatform/packwiz/Packwiz.cpp | 9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index eb8be992..b3c057fb 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -10,6 +10,7 @@ auto ProviderCapabilities::name(Provider p) -> const char*
     case Provider::FLAME:
         return "curseforge";
     }
+    return {};
 }
 auto ProviderCapabilities::hashType(Provider p) -> QString
 {
@@ -19,6 +20,7 @@ auto ProviderCapabilities::hashType(Provider p) -> QString
     case Provider::FLAME:
         return "murmur2";
     }
+    return {};
 }
 
 } // namespace ModPlatform
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 872da9b1..50f87c24 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -48,14 +48,9 @@ auto V1::createModFormat(QDir& index_dir, ::Mod& internal_mod) -> Mod
     if(mod.isValid())
         return mod;
 
-    // Manually construct packwiz mod
-    mod.name = internal_mod.name();
-    mod.filename = internal_mod.fileinfo().fileName();
+    qWarning() << QString("Tried to create mod metadata with a Mod without metadata!");
 
-    // TODO: Have a mechanism for telling the UI subsystem that we want to gather user information
-    // (i.e. which mod provider we want to use). Maybe an object parameter with a signal for that?
-
-    return mod;
+    return {};
 }
 
 void V1::updateModIndex(QDir& index_dir, Mod& mod)
-- 
cgit 


From e17b6804a7424dd5161662c4ef92972f3311675c Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Thu, 21 Apr 2022 15:45:20 -0300
Subject: fix: implement PR suggestions

Some stylistic changes, and get hashes from the mod providers when
building the metadata.
---
 launcher/modplatform/ModIndex.h                     | 3 ++-
 launcher/modplatform/flame/FlameModIndex.cpp        | 8 ++++++++
 launcher/modplatform/modrinth/ModrinthPackIndex.cpp | 4 ++++
 launcher/modplatform/packwiz/Packwiz.cpp            | 2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index bb5c7c9d..2137f616 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -8,7 +8,7 @@
 
 namespace ModPlatform {
 
-enum class Provider{
+enum class Provider {
     MODRINTH,
     FLAME
 };
@@ -33,6 +33,7 @@ struct IndexedVersion {
     QString date;
     QString fileName;
     QVector<QString> loaders = {};
+    QString hash;
 };
 
 struct IndexedPack {
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 45f02b71..4b172c13 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -6,6 +6,8 @@
 #include "modplatform/flame/FlameAPI.h"
 #include "net/NetJob.h"
 
+static ModPlatform::ProviderCapabilities ProviderCaps;
+
 void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
 {
     pack.addonId = Json::requireInteger(obj, "id");
@@ -60,6 +62,12 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
         file.downloadUrl = Json::requireString(obj, "downloadUrl");
         file.fileName = Json::requireString(obj, "fileName");
 
+        auto hash_list = Json::ensureArray(obj, "hashes");
+        if(!hash_list.isEmpty()){
+            if(hash_list.contains(ProviderCaps.hashType(ModPlatform::Provider::FLAME)))
+                file.hash = Json::requireString(hash_list, "value");
+        }
+
         unsortedVersions.append(file);
     }
 
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 6c8659dc..8b750740 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -24,6 +24,7 @@
 #include "net/NetJob.h"
 
 static ModrinthAPI api;
+static ModPlatform::ProviderCapabilities ProviderCaps;
 
 void Modrinth::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
 {
@@ -95,6 +96,9 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
         if (parent.contains("url")) {
             file.downloadUrl = Json::requireString(parent, "url");
             file.fileName = Json::requireString(parent, "filename");
+            auto hash_list = Json::requireObject(parent, "hashes");
+            if(hash_list.contains(ProviderCaps.hashType(ModPlatform::Provider::MODRINTH)))
+                file.hash = Json::requireString(hash_list, ProviderCaps.hashType(ModPlatform::Provider::MODRINTH));
 
             unsortedVersions.append(file);
         }
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 50f87c24..70efc6bd 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -30,7 +30,7 @@ auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, Mo
 
     mod.url = mod_version.downloadUrl;
     mod.hash_format = ProviderCaps.hashType(mod_pack.provider);
-    mod.hash = "";  // FIXME
+    mod.hash = mod_version.hash;
 
     mod.provider = mod_pack.provider;
     mod.file_id = mod_pack.addonId;
-- 
cgit 


From 67e0214fa5c1ff36d3718c3fb68107bf0dfe7e5d Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Thu, 21 Apr 2022 15:47:46 -0300
Subject: fix: don't try to delete mods multiple times

Shows a more helpful message if there's a parsing error when reading the
index file.

Also fixes a clazy warning with using the `.data()` method in a
temporary QByteArray object.
---
 launcher/modplatform/packwiz/Packwiz.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 70efc6bd..4fe4398a 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -162,12 +162,14 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
 
     // NOLINTNEXTLINE(modernize-avoid-c-arrays)
     char errbuf[200];
-    table = toml_parse(index_file.readAll().data(), errbuf, sizeof(errbuf));
+    auto file_bytearray = index_file.readAll();
+    table = toml_parse(file_bytearray.data(), errbuf, sizeof(errbuf));
 
     index_file.close();
 
     if (!table) {
-        qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
+        qWarning() << QString("Could not open file %1!").arg(indexFileName(index_file_name));
+        qWarning() << "Reason: " << QString(errbuf);
         return {};
     }
     
-- 
cgit 


From 5c5699bba5ed2a5befb7c3f8d9fbcd679a8698ab Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Fri, 22 Apr 2022 13:23:47 -0300
Subject: refactor: move individual pack version parsing to its own function

---
 .../modplatform/modrinth/ModrinthPackIndex.cpp     | 95 ++++++++++++----------
 launcher/modplatform/modrinth/ModrinthPackIndex.h  |  1 +
 2 files changed, 55 insertions(+), 41 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 8b750740..aa798381 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -59,49 +59,10 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
 
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
-        ModPlatform::IndexedVersion file;
-        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()) { continue; }
-        for (auto mcVer : versionArray) {
-            file.mcVersion.append(mcVer.toString());
-        }
-        auto loaders = Json::requireArray(obj, "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;
-        
-        // Find correct file (needed in cases where one version may have multiple files)
-        // Will default to the last one if there's no primary (though I think Modrinth requires that
-        // at least one file is primary, idk)
-        // NOTE: files.count() is 1-indexed, so we need to subtract 1 to become 0-indexed
-        while (i < files.count() - 1){ 
-            auto parent = files[i].toObject();
-            auto fileName = Json::requireString(parent, "filename");
-
-            // Grab the primary file, if available
-            if(Json::requireBoolean(parent, "primary"))
-                break;
-
-            i++;
-        }
-
-        auto parent = files[i].toObject();
-        if (parent.contains("url")) {
-            file.downloadUrl = Json::requireString(parent, "url");
-            file.fileName = Json::requireString(parent, "filename");
-            auto hash_list = Json::requireObject(parent, "hashes");
-            if(hash_list.contains(ProviderCaps.hashType(ModPlatform::Provider::MODRINTH)))
-                file.hash = Json::requireString(hash_list, ProviderCaps.hashType(ModPlatform::Provider::MODRINTH));
+        auto file = loadIndexedPackVersion(obj);
 
+        if(file.fileId.isValid()) // Heuristic to check if the returned value is valid
             unsortedVersions.append(file);
-        }
     }
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
         // dates are in RFC 3339 format
@@ -111,3 +72,55 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
     pack.versions = unsortedVersions;
     pack.versionsLoaded = true;
 }
+
+auto Modrinth::loadIndexedPackVersion(QJsonObject &obj) -> ModPlatform::IndexedVersion
+{
+    ModPlatform::IndexedVersion file;
+
+    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()) {
+        return {};
+    }
+    for (auto mcVer : versionArray) {
+        file.mcVersion.append(mcVer.toString());
+    }
+    auto loaders = Json::requireArray(obj, "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;
+
+    // Find correct file (needed in cases where one version may have multiple files)
+    // Will default to the last one if there's no primary (though I think Modrinth requires that
+    // at least one file is primary, idk)
+    // NOTE: files.count() is 1-indexed, so we need to subtract 1 to become 0-indexed
+    while (i < files.count() - 1) {
+        auto parent = files[i].toObject();
+        auto fileName = Json::requireString(parent, "filename");
+
+        // Grab the primary file, if available
+        if (Json::requireBoolean(parent, "primary"))
+            break;
+
+        i++;
+    }
+
+    auto parent = files[i].toObject();
+    if (parent.contains("url")) {
+        file.downloadUrl = Json::requireString(parent, "url");
+        file.fileName = Json::requireString(parent, "filename");
+        auto hash_list = Json::requireObject(parent, "hashes");
+        if (hash_list.contains(ProviderCaps.hashType(ModPlatform::Provider::MODRINTH)))
+            file.hash = Json::requireString(hash_list, ProviderCaps.hashType(ModPlatform::Provider::MODRINTH));
+
+        return file;
+    }
+
+    return {};
+}
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.h b/launcher/modplatform/modrinth/ModrinthPackIndex.h
index 7f306f25..df70278f 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.h
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.h
@@ -29,5 +29,6 @@ void loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                              QJsonArray& arr,
                              const shared_qobject_ptr<QNetworkAccessManager>& network,
                              BaseInstance* inst);
+auto loadIndexedPackVersion(QJsonObject& obj) -> ModPlatform::IndexedVersion;
 
 }  // namespace Modrinth
-- 
cgit 


From 59d628208b403bfb2442291cbca139cbdfcd325f Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Fri, 6 May 2022 12:42:01 -0300
Subject: feat: allow trying to use multiple hash types

---
 launcher/modplatform/ModIndex.cpp                  | 60 +++++++++++++++++-----
 launcher/modplatform/ModIndex.h                    |  5 +-
 launcher/modplatform/flame/FlameModIndex.cpp       | 10 +++-
 .../modplatform/modrinth/ModrinthPackIndex.cpp     | 10 +++-
 launcher/modplatform/packwiz/Packwiz.cpp           |  2 +-
 5 files changed, 68 insertions(+), 19 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index b3c057fb..f6e134e0 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -1,26 +1,60 @@
 #include "modplatform/ModIndex.h"
 
-namespace ModPlatform{
+#include <QCryptographicHash>
+
+namespace ModPlatform {
 
 auto ProviderCapabilities::name(Provider p) -> const char*
 {
-    switch(p){
-    case Provider::MODRINTH:
-        return "modrinth";
-    case Provider::FLAME:
-        return "curseforge";
+    switch (p) {
+        case Provider::MODRINTH:
+            return "modrinth";
+        case Provider::FLAME:
+            return "curseforge";
+    }
+    return {};
+}
+auto ProviderCapabilities::readableName(Provider p) -> QString
+{
+    switch (p) {
+        case Provider::MODRINTH:
+            return "Modrinth";
+        case Provider::FLAME:
+            return "CurseForge";
     }
     return {};
 }
-auto ProviderCapabilities::hashType(Provider p) -> QString
+auto ProviderCapabilities::hashType(Provider p) -> QStringList
 {
-    switch(p){
-    case Provider::MODRINTH:
-        return "sha512";
-    case Provider::FLAME:
-        return "murmur2";
+    switch (p) {
+        case Provider::MODRINTH:
+            return { "sha512", "sha1" };
+        case Provider::FLAME:
+            return { "murmur2" };
+    }
+    return {};
+}
+auto ProviderCapabilities::hash(Provider p, QByteArray& data, QString type) -> QByteArray
+{
+    switch (p) {
+        case Provider::MODRINTH: {
+            // NOTE: Data is the result of reading the entire JAR file!
+
+            // If 'type' was specified, we use that
+            if (!type.isEmpty() && hashType(p).contains(type)) {
+                if (type == "sha512")
+                    return QCryptographicHash::hash(data, QCryptographicHash::Sha512);
+                else if (type == "sha1")
+                    return QCryptographicHash::hash(data, QCryptographicHash::Sha1);
+            }
+
+            return QCryptographicHash::hash(data, QCryptographicHash::Sha512);
+        }
+        case Provider::FLAME:
+            // TODO
+            break;
     }
     return {};
 }
 
-} // namespace ModPlatform
+}  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 2137f616..8ada1fc6 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -16,7 +16,9 @@ enum class Provider {
 class ProviderCapabilities {
    public:
     auto name(Provider) -> const char*;
-    auto hashType(Provider) -> QString;
+    auto readableName(Provider) -> QString;
+    auto hashType(Provider) -> QStringList;
+    auto hash(Provider, QByteArray&, QString type = "") -> QByteArray;
 };
 
 struct ModpackAuthor {
@@ -33,6 +35,7 @@ struct IndexedVersion {
     QString date;
     QString fileName;
     QVector<QString> loaders = {};
+    QString hash_type;
     QString hash;
 };
 
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 4b172c13..63411275 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -64,8 +64,14 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
 
         auto hash_list = Json::ensureArray(obj, "hashes");
         if(!hash_list.isEmpty()){
-            if(hash_list.contains(ProviderCaps.hashType(ModPlatform::Provider::FLAME)))
-                file.hash = Json::requireString(hash_list, "value");
+            auto hash_types = ProviderCaps.hashType(ModPlatform::Provider::FLAME);
+            for(auto& hash_type : hash_types) {
+                if(hash_list.contains(hash_type)) {
+                    file.hash = Json::requireString(hash_list, "value");
+                    file.hash_type = hash_type;
+                    break;
+                }
+            }
         }
 
         unsortedVersions.append(file);
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index aa798381..30693a82 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -116,8 +116,14 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject &obj) -> ModPlatform::IndexedV
         file.downloadUrl = Json::requireString(parent, "url");
         file.fileName = Json::requireString(parent, "filename");
         auto hash_list = Json::requireObject(parent, "hashes");
-        if (hash_list.contains(ProviderCaps.hashType(ModPlatform::Provider::MODRINTH)))
-            file.hash = Json::requireString(hash_list, ProviderCaps.hashType(ModPlatform::Provider::MODRINTH));
+        auto hash_types = ProviderCaps.hashType(ModPlatform::Provider::MODRINTH);
+        for (auto& hash_ty