refactor: generalize mod models and APIs to resources

Firstly, this abstract away behavior in the mod download models that can
also be applied to other types of resources into a superclass, allowing
other resource types to be implemented without so much code duplication.

For that, this also generalizes the APIs used (currently, ModrinthAPI
and FlameAPI) to be able to make requests to other types of resources.

It also does a general cleanup of both of those. In particular, this
makes use of std::optional instead of invalid values for errors and,
well, optional values :p

This is a squash of some commits that were becoming too interlaced
together to be cleanly separated.

Signed-off-by: flow <flowlnlnln@gmail.com>

5 files changed, 104 insertions, 69 deletions

diff --git a/launcher/modplatform/modrinth/ModrinthAPI.cpp b/launcher/modplatform/modrinth/ModrinthAPI.cpp
index 747cf4c3..8e64be09 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.cpp
+++ b/launcher/modplatform/modrinth/ModrinthAPI.cpp
@@ -37,21 +37,24 @@ auto ModrinthAPI::currentVersions(const QStringList& hashes, QString hash_format
 
 auto ModrinthAPI::latestVersion(QString hash,
                                 QString hash_format,
-                                std::list<Version> mcVersions,
-                                ModLoaderTypes loaders,
+                                std::optional<std::list<Version>> mcVersions,
+                                std::optional<ModLoaderTypes> loaders,
                                 QByteArray* response) -> NetJob::Ptr
 {
     auto* netJob = new NetJob(QString("Modrinth::GetLatestVersion"), APPLICATION->network());
 
     QJsonObject body_obj;
 
-    Json::writeStringList(body_obj, "loaders", getModLoaderStrings(loaders));
+    if (loaders.has_value())
+        Json::writeStringList(body_obj, "loaders", getModLoaderStrings(loaders.value()));
 
-    QStringList game_versions;
-    for (auto& ver : mcVersions) {
-        game_versions.append(ver.toString());
+    if (mcVersions.has_value()) {
+        QStringList game_versions;
+        for (auto& ver : mcVersions.value()) {
+            game_versions.append(ver.toString());
+        }
+        Json::writeStringList(body_obj, "game_versions", game_versions);
     }
-    Json::writeStringList(body_obj, "game_versions", game_versions);
 
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
@@ -66,8 +69,8 @@ auto ModrinthAPI::latestVersion(QString hash,
 
 auto ModrinthAPI::latestVersions(const QStringList& hashes,
                                  QString hash_format,
-                                 std::list<Version> mcVersions,
-                                 ModLoaderTypes loaders,
+                                 std::optional<std::list<Version>> mcVersions,
+                                 std::optional<ModLoaderTypes> loaders,
                                  QByteArray* response) -> NetJob::Ptr
 {
     auto* netJob = new NetJob(QString("Modrinth::GetLatestVersions"), APPLICATION->network());
@@ -77,13 +80,16 @@ auto ModrinthAPI::latestVersions(const QStringList& hashes,
     Json::writeStringList(body_obj, "hashes", hashes);
     Json::writeString(body_obj, "algorithm", hash_format);
 
-    Json::writeStringList(body_obj, "loaders", getModLoaderStrings(loaders));
+    if (loaders.has_value())
+        Json::writeStringList(body_obj, "loaders", getModLoaderStrings(loaders.value()));
 
-    QStringList game_versions;
-    for (auto& ver : mcVersions) {
-        game_versions.append(ver.toString());
+    if (mcVersions.has_value()) {
+        QStringList game_versions;
+        for (auto& ver : mcVersions.value()) {
+            game_versions.append(ver.toString());
+        }
+        Json::writeStringList(body_obj, "game_versions", game_versions);
     }
-    Json::writeStringList(body_obj, "game_versions", game_versions);
 
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
@@ -95,7 +101,7 @@ auto ModrinthAPI::latestVersions(const QStringList& hashes,
     return netJob;
 }
 
-auto ModrinthAPI::getProjects(QStringList addonIds, QByteArray* response) const -> NetJob*
+NetJob::Ptr ModrinthAPI::getProjects(QStringList addonIds, QByteArray* response) const
 {
     auto netJob = new NetJob(QString("Modrinth::GetProjects"), APPLICATION->network());
     auto searchUrl = getMultipleModInfoURL(addonIds);
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index e1a18681..bd84fb54 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -19,13 +19,12 @@
 #pragma once
 
 #include "BuildConfig.h"
-#include "modplatform/ModAPI.h"
 #include "modplatform/ModIndex.h"
-#include "modplatform/helpers/NetworkModAPI.h"
+#include "modplatform/helpers/NetworkResourceAPI.h"
 
 #include <QDebug>
 
-class ModrinthAPI : public NetworkModAPI {
+class ModrinthAPI : public NetworkResourceAPI {
    public:
     auto currentVersion(QString hash,
                         QString hash_format,
@@ -37,17 +36,17 @@ class ModrinthAPI : public NetworkModAPI {
 
     auto latestVersion(QString hash,
                        QString hash_format,
-                       std::list<Version> mcVersions,
-                       ModLoaderTypes loaders,
+                       std::optional<std::list<Version>> mcVersions,
+                       std::optional<ModLoaderTypes> loaders,
                        QByteArray* response) -> NetJob::Ptr;
 
     auto latestVersions(const QStringList& hashes,
                         QString hash_format,
-                        std::list<Version> mcVersions,
-                        ModLoaderTypes loaders,
+                       std::optional<std::list<Version>> mcVersions,
+                       std::optional<ModLoaderTypes> loaders,
                         QByteArray* response) -> NetJob::Ptr;
 
-    auto getProjects(QStringList addonIds, QByteArray* response) const -> NetJob* override;
+    NetJob::Ptr getProjects(QStringList addonIds, QByteArray* response) const override;
 
    public:
     inline auto getAuthorURL(const QString& name) const -> QString { return "https://modrinth.com/user/" + name; };
@@ -55,15 +54,13 @@ class ModrinthAPI : public NetworkModAPI {
     static auto getModLoaderStrings(const ModLoaderTypes types) -> const QStringList
     {
         QStringList l;
-        for (auto loader : {Forge, Fabric, Quilt})
-        {
-            if ((types & loader) || types == Unspecified)
-            {
-                l << ModAPI::getModLoaderString(loader);
+        for (auto loader : {Forge, Fabric, Quilt}) {
+            if (types & loader) {
+                l << getModLoaderString(loader);
             }
         }
         if ((types & Quilt) && (~types & Fabric))  // Add Fabric if Quilt is in use, if Fabric isn't already there
-            l << ModAPI::getModLoaderString(Fabric);
+            l << getModLoaderString(Fabric);
         return l;
     }
 
@@ -78,28 +75,54 @@ class ModrinthAPI : public NetworkModAPI {
     }
 
    private:
-    inline auto getModSearchURL(SearchArgs& args) const -> QString override
+    [[nodiscard]] static QString resourceTypeParameter(ModPlatform::ResourceType type)
     {
-        if (!validateModLoaders(args.loaders)) {
-            qWarning() << "Modrinth only have Forge and Fabric-compatible mods!";
-            return "";
+        switch (type) {
+            case ModPlatform::ResourceType::MOD:
+                return "mod";
+            default:
+                qWarning() << "Invalid resource type for Modrinth API!";
+                break;
         }
 
-        return QString(BuildConfig.MODRINTH_PROD_URL +
-                       "/search?"
-                       "offset=%1&"
-                       "limit=25&"
-                       "query=%2&"
-                       "index=%3&"
-                       "facets=[[%4],%5[\"project_type:mod\"]]")
-            .arg(args.offset)
-            .arg(args.search)
-            .arg(args.sorting)
-            .arg(getModLoaderFilters(args.loaders))
-            .arg(getGameVersionsArray(args.versions));
+        return "";
+    }
+    [[nodiscard]] QString createFacets(SearchArgs const& args) const
+    {
+        QStringList facets_list;
+
+        if (args.loaders.has_value())
+            facets_list.append(QString("[%1]").arg(getModLoaderFilters(args.loaders.value())));
+        if (args.versions.has_value())
+            facets_list.append(QString("[%1]").arg(getGameVersionsArray(args.versions.value())));
+        facets_list.append(QString("[\"project_type:%1\"]").arg(resourceTypeParameter(args.type)));
+
+        return QString("[%1]").arg(facets_list.join(','));
+    }
+
+   public:
+    [[nodiscard]] inline auto getSearchURL(SearchArgs const& args) const -> std::optional<QString> override
+    {
+        if (args.loaders.has_value()) {
+            if (!validateModLoaders(args.loaders.value())) {
+                qWarning() << "Modrinth only have Forge and Fabric-compatible mods!";
+                return {};
+            }
+        }
+
+        QStringList get_arguments;
+        get_arguments.append(QString("offset=%1").arg(args.offset));
+        get_arguments.append(QString("limit=25"));
+        if (args.search.has_value())
+            get_arguments.append(QString("query=%1").arg(args.search.value()));
+        if (args.sorting.has_value())
+            get_arguments.append(QString("index=%1").arg(args.sorting.value()));
+        get_arguments.append(QString("facets=%1").arg(createFacets(args)));
+
+        return BuildConfig.MODRINTH_PROD_URL + "/search?" + get_arguments.join('&');
     };
 
-    inline auto getModInfoURL(QString& id) const -> QString override
+    inline auto getInfoURL(QString const& id) const -> std::optional<QString> override
     {
         return BuildConfig.MODRINTH_PROD_URL + "/project/" + id;
     };
@@ -109,15 +132,16 @@ class ModrinthAPI : public NetworkModAPI {
         return BuildConfig.MODRINTH_PROD_URL + QString("/projects?ids=[\"%1\"]").arg(ids.join("\",\""));
     };
 
-    inline auto getVersionsURL(VersionSearchArgs& args) const -> QString override
+    inline auto getVersionsURL(VersionSearchArgs const& args) const -> std::optional<QString> override
     {
-        return QString(BuildConfig.MODRINTH_PROD_URL +
-                       "/project/%1/version?"
-                       "game_versions=[%2]&"
-                       "loaders=[\"%3\"]")
-            .arg(args.addonId,
-             getGameVersionsString(args.mcVersions),
-             getModLoaderStrings(args.loaders).join("\",\""));
+        QStringList get_arguments;
+        if (args.mcVersions.has_value())
+            get_arguments.append(QString("game_versions=[%1]").arg(getGameVersionsString(args.mcVersions.value())));
+        if (args.loaders.has_value())
+            get_arguments.append(QString("loaders=[\"%1\"]").arg(getModLoaderStrings(args.loaders.value()).join("\",\"")));
+
+        return QString("%1/project/%2/version%3%4")
+            .arg(BuildConfig.MODRINTH_PROD_URL, args.addonId, get_arguments.isEmpty() ? "" : "?", get_arguments.join('&'));
     };
 
     auto getGameVersionsArray(std::list<Version> mcVersions) const -> QString
@@ -127,12 +151,12 @@ class ModrinthAPI : public NetworkModAPI {
             s += QString("\"versions:%1\",").arg(ver.toString());
         }
         s.remove(s.length() - 1, 1); //remove last comma
-        return s.isEmpty() ? QString() : QString("[%1],").arg(s);
+        return s.isEmpty() ? QString() : s;
     }
 
     inline auto validateModLoaders(ModLoaderTypes loaders) const -> bool
     {
-        return (loaders == Unspecified) || (loaders & (Forge | Fabric | Quilt));
+        return loaders & (Forge | Fabric | Quilt);
     }
 
 };
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
index e2d27547..7826b33d 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
@@ -4,12 +4,15 @@
 
 #include "Json.h"
 
-#include "ModDownloadTask.h"
+#include "ResourceDownloadTask.h"
 
 #include "modplatform/helpers/HashUtils.h"
 
 #include "tasks/ConcurrentTask.h"
 
+#include "minecraft/mod/ModFolderModel.h"
+#include "minecraft/mod/ResourceFolderModel.h"
+
 static ModrinthAPI api;
 static ModPlatform::ProviderCapabilities ProviderCaps;
 
@@ -34,7 +37,7 @@ void ModrinthCheckUpdate::executeTask()
 
     // Create all hashes
     QStringList hashes;
-    auto best_hash_type = ProviderCaps.hashType(ModPlatform::Provider::MODRINTH).first();
+    auto best_hash_type = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH).first();
 
     ConcurrentTask hashing_task(this, "MakeModrinthHashesTask", 10);
     for (auto* mod : m_mods) {
@@ -108,11 +111,13 @@ void ModrinthCheckUpdate::executeTask()
                 // Sometimes a version may have multiple files, one with "forge" and one with "fabric",
                 // so we may want to filter it
                 QString loader_filter;
-                static auto flags = { ModAPI::ModLoaderType::Forge, ModAPI::ModLoaderType::Fabric, ModAPI::ModLoaderType::Quilt };
-                for (auto flag : flags) {
-                    if (m_loaders.testFlag(flag)) {
-                        loader_filter = api.getModLoaderString(flag);
-                        break;
+                if (m_loaders.has_value()) {
+                    static auto flags = { ResourceAPI::ModLoaderType::Forge, ResourceAPI::ModLoaderType::Fabric, ResourceAPI::ModLoaderType::Quilt };
+                    for (auto flag : flags) {
+                        if (m_loaders.value().testFlag(flag)) {
+                            loader_filter = api.getModLoaderString(flag);
+                            break;
+                        }
                     }
                 }
 
@@ -152,12 +157,12 @@ void ModrinthCheckUpdate::executeTask()
                     for (auto& author : mod->authors())
                         pack.authors.append({ author });
                     pack.description = mod->description();
-                    pack.provider = ModPlatform::Provider::MODRINTH;
+                    pack.provider = ModPlatform::ResourceProvider::MODRINTH;
 
-                    auto download_task = new ModDownloadTask(pack, project_ver, m_mods_folder);
+                    auto download_task = new ResourceDownloadTask(pack, project_ver, m_mods_folder);
 
                     m_updatable.emplace_back(pack.name, hash, mod->version(), project_ver.version_number, project_ver.changelog,
-                                             ModPlatform::Provider::MODRINTH, download_task);
+                                             ModPlatform::ResourceProvider::MODRINTH, download_task);
                 }
             }
         } catch (Json::JsonException& e) {
diff --git a/launcher/modplatform/modrinth/ModrinthCheckUpdate.h b/launcher/modplatform/modrinth/ModrinthCheckUpdate.h
index abf8ada1..177ce516 100644
--- a/launcher/modplatform/modrinth/ModrinthCheckUpdate.h
+++ b/launcher/modplatform/modrinth/ModrinthCheckUpdate.h
@@ -8,7 +8,7 @@ class ModrinthCheckUpdate : public CheckUpdateTask {
     Q_OBJECT
 
    public:
-    ModrinthCheckUpdate(QList<Mod*>& mods, std::list<Version>& mcVersions, ModAPI::ModLoaderTypes loaders, std::shared_ptr<ModFolderModel> mods_folder)
+    ModrinthCheckUpdate(QList<Mod*>& mods, std::list<Version>& mcVersions, std::optional<ResourceAPI::ModLoaderTypes> loaders, std::shared_ptr<ModFolderModel> mods_folder)
         : CheckUpdateTask(mods, mcVersions, loaders, mods_folder)
     {}
 
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index aec45a73..a0161089 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -33,7 +33,7 @@ void Modrinth::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
     if (pack.addonId.toString().isEmpty())
         pack.addonId = Json::requireString(obj, "id");
 
-    pack.provider = ModPlatform::Provider::MODRINTH;
+    pack.provider = ModPlatform::ResourceProvider::MODRINTH;
     pack.name = Json::requireString(obj, "title");
 
     pack.slug = Json::ensureString(obj, "slug", "");
@@ -179,7 +179,7 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_t
             file.hash = Json::requireString(hash_list, preferred_hash_type);
             file.hash_type = preferred_hash_type;
         } else {
-            auto hash_types = ProviderCaps.hashType(ModPlatform::Provider::MODRINTH);
+            auto hash_types = ProviderCaps.hashType(ModPlatform::ResourceProvider::MODRINTH);
             for (auto& hash_type : hash_types) {
                 if (hash_list.contains(hash_type)) {
                     file.hash = Json::requireString(hash_list, hash_type);