From 8422e3ac01c861125fd6aea441714a2fb38e5ff9 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sat, 24 Dec 2022 20:38:29 -0700
Subject: feat: zip resource validation check for flame

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 .../flame/FlameInstanceCreationTask.cpp            | 147 ++++++++++++++++-----
 .../modplatform/flame/FlameInstanceCreationTask.h  |   3 +
 2 files changed, 118 insertions(+), 32 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 1d441f09..2b1bc8d0 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -53,6 +53,13 @@
 #include "ui/dialogs/BlockedModsDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
 
+#include <minecraft/mod/tasks/LocalResourcePackParseTask.h>
+#include <minecraft/mod/tasks/LocalTexturePackParseTask.h>
+#include <minecraft/mod/tasks/LocalDataPackParseTask.h>
+#include <minecraft/mod/tasks/LocalModParseTask.h>
+#include <qdebug.h>
+#include <qfileinfo.h>
+
 const static QMap<QString, QString> forgemap = { { "1.2.5", "3.4.9.171" },
                                                  { "1.4.2", "6.0.1.355" },
                                                  { "1.4.7", "6.6.2.534" },
@@ -401,6 +408,11 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
     QList<BlockedMod> blocked_mods;
     auto anyBlocked = false;
     for (const auto& result : results.files.values()) {
+
+        if(result.fileName.endsWith(".zip")) {
+            m_ZIP_resources.append(std::make_pair(result.fileName, result.targetFolder));
+        }
+
         if (!result.resolved || result.url.isEmpty()) {
             BlockedMod blocked_mod;
             blocked_mod.name = result.fileName;
@@ -439,37 +451,6 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
     }
 }
 
-/// @brief copy the matched blocked mods to the instance staging area
-/// @param blocked_mods list of the blocked mods and their matched paths
-void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
-{
-    setStatus(tr("Copying Blocked Mods..."));
-    setAbortable(false);
-    int i = 0;
-    int total = blocked_mods.length();
-    setProgress(i, total);
-    for (auto const& mod : blocked_mods) {
-        if (!mod.matched) {
-            qDebug() << mod.name << "was not matched to a local file, skipping copy";
-            continue;
-        }
-
-        auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", mod.targetFolder, mod.name);
-
-        setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));
-
-        qDebug() << "Will try to copy" << mod.localPath << "to" << dest_path;
-
-        if (!FS::copy(mod.localPath, dest_path)()) {
-            qDebug() << "Copy of" << mod.localPath << "to" << dest_path << "Failed";
-        }
-
-        i++;
-        setProgress(i, total);
-    }
-
-    setAbortable(true);
-}
 
 void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
 {
@@ -509,7 +490,10 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
     }
 
     m_mod_id_resolver.reset();
-    connect(m_files_job.get(), &NetJob::succeeded, this, [&]() { m_files_job.reset(); });
+    connect(m_files_job.get(), &NetJob::succeeded, this, [&]() { 
+        m_files_job.reset(); 
+        validateZIPResouces();
+    });
     connect(m_files_job.get(), &NetJob::failed, [&](QString reason) {
         m_files_job.reset();
         setError(reason);
@@ -520,3 +504,102 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
     setStatus(tr("Downloading mods..."));
     m_files_job->start();
 }
+
+/// @brief copy the matched blocked mods to the instance staging area
+/// @param blocked_mods list of the blocked mods and their matched paths
+void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
+{
+    setStatus(tr("Copying Blocked Mods..."));
+    setAbortable(false);
+    int i = 0;
+    int total = blocked_mods.length();
+    setProgress(i, total);
+    for (auto const& mod : blocked_mods) {
+        if (!mod.matched) {
+            qDebug() << mod.name << "was not matched to a local file, skipping copy";
+            continue;
+        }
+
+        auto destPath = FS::PathCombine(m_stagingPath, "minecraft", mod.targetFolder, mod.name);
+
+        setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));
+
+        qDebug() << "Will try to copy" << mod.localPath << "to" << destPath;
+
+        if (!FS::copy(mod.localPath, destPath)()) {
+            qDebug() << "Copy of" << mod.localPath << "to" << destPath << "Failed";
+        }
+
+        i++;
+        setProgress(i, total);
+    }
+
+    setAbortable(true);
+}
+
+static bool moveFile(QString src, QString dst)
+{
+    if (!FS::copy(src, dst)()) {  // copy
+        qDebug() << "Copy of" << src << "to" << dst << "Failed!";
+        return false;
+    } else {
+        if (!FS::deletePath(src)) {  // remove origonal
+            qDebug() << "Deleation of" << src << "Failed!";
+            return false;
+        };
+    }
+    return true;
+}
+
+void FlameCreationTask::validateZIPResouces()
+{
+    qDebug() << "Validating resoucres stored as .zip are in the right place";
+    for (auto [fileName, targetFolder] : m_ZIP_resources) {
+        qDebug() << "Checking" << fileName << "...";
+        auto localPath = FS::PathCombine(m_stagingPath, "minecraft", targetFolder, fileName);
+        QFileInfo localFileInfo(localPath);
+        if (localFileInfo.exists() && localFileInfo.isFile()) {
+            if (ResourcePackUtils::validate(localFileInfo)) {
+                if (targetFolder != "resourcepacks") {
+                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a resource pack.";
+                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "resourcepacks", fileName);
+                    qDebug() << "Moveing" << localPath << "to" << destPath;
+                    moveFile(localPath, destPath);
+                } else {
+                    qDebug() << fileName << "is in the right place :" << targetFolder;
+                }
+            } else if (TexturePackUtils::validate(localFileInfo)) {
+                if (targetFolder != "texturepacks") {
+                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a pre 1.6 texture pack.";
+                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "texturepacks", fileName);
+                    qDebug() << "Moveing" << localPath << "to" << destPath;
+                    moveFile(localPath, destPath);
+                } else {
+                    qDebug() << fileName << "is in the right place :" << targetFolder;
+                }
+            } else if (DataPackUtils::validate(localFileInfo)) {
+                if (targetFolder != "datapacks") {
+                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a data pack.";
+                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "datapacks", fileName);
+                    qDebug() << "Moveing" << localPath << "to" << destPath;
+                    moveFile(localPath, destPath);
+                } else {
+                    qDebug() << fileName << "is in the right place :" << targetFolder;
+                }
+            } else if (ModUtils::validate(localFileInfo)) {
+                if (targetFolder != "mods") {
+                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a mod.";
+                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "mods", fileName);
+                    qDebug() << "Moveing" << localPath << "to" << destPath;
+                    moveFile(localPath, destPath);
+                } else {
+                    qDebug() << fileName << "is in the right place :" << targetFolder;
+                }
+            } else {
+                qDebug() << "Can't Identify" << fileName << "at" << localPath << ", leaving it where it is.";
+            }
+        } else {
+            qDebug() << "Can't find" << localPath << "to validate it, ignoreing";
+        }
+    }
+}
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.h b/launcher/modplatform/flame/FlameInstanceCreationTask.h
index 3a1c729f..498e1d6e 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.h
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.h
@@ -77,6 +77,7 @@ class FlameCreationTask final : public InstanceCreationTask {
     void idResolverSucceeded(QEventLoop&);
     void setupDownloadJob(QEventLoop&);
     void copyBlockedMods(QList<BlockedMod> const& blocked_mods);
+    void validateZIPResouces();
 
    private:
     QWidget* m_parent = nullptr;
@@ -90,5 +91,7 @@ class FlameCreationTask final : public InstanceCreationTask {
 
     QString m_managed_id, m_managed_version_id;
 
+    QList<std::pair<QString, QString>> m_ZIP_resources;
+
     std::optional<InstancePtr> m_instance;
 };
-- 
cgit 


From 78984eea3aa398451dc511712ccb7ec55f93194c Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 25 Dec 2022 16:49:56 -0700
Subject: feat: support installing worlds during flame pack import.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 .../flame/FlameInstanceCreationTask.cpp            | 72 ++++++++++++----------
 1 file changed, 39 insertions(+), 33 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 2b1bc8d0..204d5c1f 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -57,6 +57,9 @@
 #include <minecraft/mod/tasks/LocalTexturePackParseTask.h>
 #include <minecraft/mod/tasks/LocalDataPackParseTask.h>
 #include <minecraft/mod/tasks/LocalModParseTask.h>
+#include <minecraft/mod/tasks/LocalWorldSaveParseTask.h>
+#include <minecraft/mod/tasks/LocalShaderPackParseTask.h>
+#include <minecraft/World.h>
 #include <qdebug.h>
 #include <qfileinfo.h>
 
@@ -537,13 +540,13 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
     setAbortable(true);
 }
 
-static bool moveFile(QString src, QString dst)
+bool moveFile(QString src, QString dst)
 {
     if (!FS::copy(src, dst)()) {  // copy
         qDebug() << "Copy of" << src << "to" << dst << "Failed!";
         return false;
     } else {
-        if (!FS::deletePath(src)) {  // remove origonal
+        if (!FS::deletePath(src)) {  // remove original
             qDebug() << "Deleation of" << src << "Failed!";
             return false;
         };
@@ -551,50 +554,53 @@ static bool moveFile(QString src, QString dst)
     return true;
 }
 
+
 void FlameCreationTask::validateZIPResouces()
 {
     qDebug() << "Validating resoucres stored as .zip are in the right place";
     for (auto [fileName, targetFolder] : m_ZIP_resources) {
+
         qDebug() << "Checking" << fileName << "...";
         auto localPath = FS::PathCombine(m_stagingPath, "minecraft", targetFolder, fileName);
+
+        auto validatePath = [&localPath, this](QString fileName, QString targetFolder, QString realTarget) {
+            if (targetFolder != "resourcepacks") {
+                qDebug() << "Target folder of" << fileName << "is incorrect, it's a resource pack.";
+                auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "resourcepacks", fileName);
+                qDebug() << "Moving" << localPath << "to" << destPath;
+                if (moveFile(localPath, destPath)) {
+                    return destPath;
+                }
+            } else {
+                qDebug() << fileName << "is in the right place :" << targetFolder;
+            }
+            return localPath;
+        };
+
         QFileInfo localFileInfo(localPath);
         if (localFileInfo.exists() && localFileInfo.isFile()) {
             if (ResourcePackUtils::validate(localFileInfo)) {
-                if (targetFolder != "resourcepacks") {
-                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a resource pack.";
-                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "resourcepacks", fileName);
-                    qDebug() << "Moveing" << localPath << "to" << destPath;
-                    moveFile(localPath, destPath);
-                } else {
-                    qDebug() << fileName << "is in the right place :" << targetFolder;
-                }
+                validatePath(fileName, targetFolder, "resourcepacks");
             } else if (TexturePackUtils::validate(localFileInfo)) {
-                if (targetFolder != "texturepacks") {
-                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a pre 1.6 texture pack.";
-                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "texturepacks", fileName);
-                    qDebug() << "Moveing" << localPath << "to" << destPath;
-                    moveFile(localPath, destPath);
-                } else {
-                    qDebug() << fileName << "is in the right place :" << targetFolder;
-                }
+                validatePath(fileName, targetFolder, "texturepacks");
             } else if (DataPackUtils::validate(localFileInfo)) {
-                if (targetFolder != "datapacks") {
-                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a data pack.";
-                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "datapacks", fileName);
-                    qDebug() << "Moveing" << localPath << "to" << destPath;
-                    moveFile(localPath, destPath);
-                } else {
-                    qDebug() << fileName << "is in the right place :" << targetFolder;
-                }
+                validatePath(fileName, targetFolder, "datapacks");
             } else if (ModUtils::validate(localFileInfo)) {
-                if (targetFolder != "mods") {
-                    qDebug() << "Target folder of" << fileName << "is incorrect, it's a mod.";
-                    auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "mods", fileName);
-                    qDebug() << "Moveing" << localPath << "to" << destPath;
-                    moveFile(localPath, destPath);
+                validatePath(fileName, targetFolder, "mods");
+            } else  if (WorldSaveUtils::validate(localFileInfo)) {
+                QString worldPath = validatePath(fileName, targetFolder, "saves");
+
+                qDebug() << "Installing World from" << worldPath;
+                World w(worldPath);
+                if (!w.isValid()) {
+                    qDebug() << "World at" << worldPath << "is not valid, skipping install.";
                 } else {
-                    qDebug() << fileName << "is in the right place :" << targetFolder;
-                }
+                    w.install(FS::PathCombine(m_stagingPath, "minecraft", "saves"));
+                } 
+            } else if (ShaderPackUtils::validate(localFileInfo)) {
+                // in theroy flame API can't do this but who knows, that *may* change ?
+                // better to handle it if it *does* occure in the future
+                validatePath(fileName, targetFolder, "shaderpacks");
             } else {
                 qDebug() << "Can't Identify" << fileName << "at" << localPath << ", leaving it where it is.";
             }
-- 
cgit 


From b2082bfde7149a5596fe8a467659699ad569f932 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 25 Dec 2022 17:16:26 -0700
Subject: fix: explicit QFileInfo converison for qt6 fix: validatePath in
 validateZIPResouces

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 .../modplatform/flame/FlameInstanceCreationTask.cpp     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 204d5c1f..b62d05ab 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -564,15 +564,13 @@ void FlameCreationTask::validateZIPResouces()
         auto localPath = FS::PathCombine(m_stagingPath, "minecraft", targetFolder, fileName);
 
         auto validatePath = [&localPath, this](QString fileName, QString targetFolder, QString realTarget) {
-            if (targetFolder != "resourcepacks") {
-                qDebug() << "Target folder of" << fileName << "is incorrect, it's a resource pack.";
-                auto destPath = FS::PathCombine(m_stagingPath, "minecraft", "resourcepacks", fileName);
+            if (targetFolder != realTarget) {
+                qDebug() << "Target folder of" << fileName << "is incorrect, it belongs in" << realTarget;
+                auto destPath = FS::PathCombine(m_stagingPath, "minecraft", realTarget, fileName);
                 qDebug() << "Moving" << localPath << "to" << destPath;
                 if (moveFile(localPath, destPath)) {
                     return destPath;
                 }
-            } else {
-                qDebug() << fileName << "is in the right place :" << targetFolder;
             }
             return localPath;
         };
@@ -580,18 +578,24 @@ void FlameCreationTask::validateZIPResouces()
         QFileInfo localFileInfo(localPath);
         if (localFileInfo.exists() && localFileInfo.isFile()) {
             if (ResourcePackUtils::validate(localFileInfo)) {
+                qDebug() << fileName << "is a resource pack";
                 validatePath(fileName, targetFolder, "resourcepacks");
             } else if (TexturePackUtils::validate(localFileInfo)) {
+                qDebug() << fileName << "is a pre 1.6 texture pack";
                 validatePath(fileName, targetFolder, "texturepacks");
             } else if (DataPackUtils::validate(localFileInfo)) {
+                qDebug() << fileName << "is a data pack";
                 validatePath(fileName, targetFolder, "datapacks");
             } else if (ModUtils::validate(localFileInfo)) {
+                qDebug() << fileName << "is a mod";
                 validatePath(fileName, targetFolder, "mods");
             } else  if (WorldSaveUtils::validate(localFileInfo)) {
+                qDebug() << fileName << "is a world save";
                 QString worldPath = validatePath(fileName, targetFolder, "saves");
 
                 qDebug() << "Installing World from" << worldPath;
-                World w(worldPath);
+                QFileInfo worldFileInfo(worldPath);
+                World w(worldFileInfo);
                 if (!w.isValid()) {
                     qDebug() << "World at" << worldPath << "is not valid, skipping install.";
                 } else {
@@ -600,6 +604,7 @@ void FlameCreationTask::validateZIPResouces()
             } else if (ShaderPackUtils::validate(localFileInfo)) {
                 // in theroy flame API can't do this but who knows, that *may* change ?
                 // better to handle it if it *does* occure in the future
+                qDebug() << fileName << "is a shader pack";
                 validatePath(fileName, targetFolder, "shaderpacks");
             } else {
                 qDebug() << "Can't Identify" << fileName << "at" << localPath << ", leaving it where it is.";
-- 
cgit 


From 3691f3a2963c77dbd7b469b4b90ca79b61014d43 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon, 26 Dec 2022 14:29:13 -0700
Subject: fix: cleanup and suggested changes

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 .../flame/FlameInstanceCreationTask.cpp            | 43 +++++++++++-----------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index b62d05ab..79104e17 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -53,15 +53,16 @@
 #include "ui/dialogs/BlockedModsDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
 
-#include <minecraft/mod/tasks/LocalResourcePackParseTask.h>
-#include <minecraft/mod/tasks/LocalTexturePackParseTask.h>
-#include <minecraft/mod/tasks/LocalDataPackParseTask.h>
-#include <minecraft/mod/tasks/LocalModParseTask.h>
-#include <minecraft/mod/tasks/LocalWorldSaveParseTask.h>
-#include <minecraft/mod/tasks/LocalShaderPackParseTask.h>
-#include <minecraft/World.h>
-#include <qdebug.h>
-#include <qfileinfo.h>
+#include <QDebug>
+#include <QFileInfo>
+
+#include "minecraft/World.h"
+#include "minecraft/mod/tasks/LocalDataPackParseTask.h"
+#include "minecraft/mod/tasks/LocalModParseTask.h"
+#include "minecraft/mod/tasks/LocalResourcePackParseTask.h"
+#include "minecraft/mod/tasks/LocalShaderPackParseTask.h"
+#include "minecraft/mod/tasks/LocalTexturePackParseTask.h"
+#include "minecraft/mod/tasks/LocalWorldSaveParseTask.h"
 
 const static QMap<QString, QString> forgemap = { { "1.2.5", "3.4.9.171" },
                                                  { "1.4.2", "6.0.1.355" },
@@ -411,8 +412,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
     QList<BlockedMod> blocked_mods;
     auto anyBlocked = false;
     for (const auto& result : results.files.values()) {
-
-        if(result.fileName.endsWith(".zip")) {
+        if (result.fileName.endsWith(".zip")) {
             m_ZIP_resources.append(std::make_pair(result.fileName, result.targetFolder));
         }
 
@@ -454,7 +454,6 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
     }
 }
 
-
 void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
 {
     m_files_job = new NetJob(tr("Mod download"), APPLICATION->network());
@@ -493,8 +492,8 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
     }
 
     m_mod_id_resolver.reset();
-    connect(m_files_job.get(), &NetJob::succeeded, this, [&]() { 
-        m_files_job.reset(); 
+    connect(m_files_job.get(), &NetJob::succeeded, this, [&]() {
+        m_files_job.reset();
         validateZIPResouces();
     });
     connect(m_files_job.get(), &NetJob::failed, [&](QString reason) {
@@ -543,26 +542,26 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
 bool moveFile(QString src, QString dst)
 {
     if (!FS::copy(src, dst)()) {  // copy
-        qDebug() << "Copy of" << src << "to" << dst << "Failed!";
+        qDebug() << "Copy of" << src << "to" << dst << "failed!";
         return false;
     } else {
         if (!FS::deletePath(src)) {  // remove original
-            qDebug() << "Deleation of" << src << "Failed!";
+            qDebug() << "Deletion of" << src << "failed!";
             return false;
         };
     }
     return true;
 }
 
-
 void FlameCreationTask::validateZIPResouces()
 {
-    qDebug() << "Validating resoucres stored as .zip are in the right place";
+    qDebug() << "Validating whether resources stored as .zip are in the right place";
     for (auto [fileName, targetFolder] : m_ZIP_resources) {
-
         qDebug() << "Checking" << fileName << "...";
         auto localPath = FS::PathCombine(m_stagingPath, "minecraft", targetFolder, fileName);
 
+        /// @brief check the target and move the the file
+        /// @return path where file can now be found
         auto validatePath = [&localPath, this](QString fileName, QString targetFolder, QString realTarget) {
             if (targetFolder != realTarget) {
                 qDebug() << "Target folder of" << fileName << "is incorrect, it belongs in" << realTarget;
@@ -589,7 +588,7 @@ void FlameCreationTask::validateZIPResouces()
             } else if (ModUtils::validate(localFileInfo)) {
                 qDebug() << fileName << "is a mod";
                 validatePath(fileName, targetFolder, "mods");
-            } else  if (WorldSaveUtils::validate(localFileInfo)) {
+            } else if (WorldSaveUtils::validate(localFileInfo)) {
                 qDebug() << fileName << "is a world save";
                 QString worldPath = validatePath(fileName, targetFolder, "saves");
 
@@ -600,7 +599,7 @@ void FlameCreationTask::validateZIPResouces()
                     qDebug() << "World at" << worldPath << "is not valid, skipping install.";
                 } else {
                     w.install(FS::PathCombine(m_stagingPath, "minecraft", "saves"));
-                } 
+                }
             } else if (ShaderPackUtils::validate(localFileInfo)) {
                 // in theroy flame API can't do this but who knows, that *may* change ?
                 // better to handle it if it *does* occure in the future
@@ -610,7 +609,7 @@ void FlameCreationTask::validateZIPResouces()
                 qDebug() << "Can't Identify" << fileName << "at" << localPath << ", leaving it where it is.";
             }
         } else {
-            qDebug() << "Can't find" << localPath << "to validate it, ignoreing";
+            qDebug() << "Can't find" << localPath << "to validate it, ignoring";
         }
     }
 }
-- 
cgit 


From c470f05abf090232b27faac6014f9e1cbe9dab9b Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu, 29 Dec 2022 17:21:54 -0700
Subject: refactor: use std::filesystem::rename insted of copy and then moving.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 79104e17..0a91879d 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -539,19 +539,6 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
     setAbortable(true);
 }
 
-bool moveFile(QString src, QString dst)
-{
-    if (!FS::copy(src, dst)()) {  // copy
-        qDebug() << "Copy of" << src << "to" << dst << "failed!";
-        return false;
-    } else {
-        if (!FS::deletePath(src)) {  // remove original
-            qDebug() << "Deletion of" << src << "failed!";
-            return false;
-        };
-    }
-    return true;
-}
 
 void FlameCreationTask::validateZIPResouces()
 {
@@ -567,7 +554,7 @@ void FlameCreationTask::validateZIPResouces()
                 qDebug() << "Target folder of" << fileName << "is incorrect, it belongs in" << realTarget;
                 auto destPath = FS::PathCombine(m_stagingPath, "minecraft", realTarget, fileName);
                 qDebug() << "Moving" << localPath << "to" << destPath;
-                if (moveFile(localPath, destPath)) {
+                if (FS::move(localPath, destPath)) {
                     return destPath;
                 }
             }
-- 
cgit 


From 7f438425aa84db51211123b47622a828be0aeb96 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu, 29 Dec 2022 19:47:19 -0700
Subject: refactor: add an `identify` function to make easy to reuse

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 .../flame/FlameInstanceCreationTask.cpp            | 68 +++++++++++-----------
 1 file changed, 35 insertions(+), 33 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 0a91879d..dc69769a 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -57,12 +57,8 @@
 #include <QFileInfo>
 
 #include "minecraft/World.h"
-#include "minecraft/mod/tasks/LocalDataPackParseTask.h"
-#include "minecraft/mod/tasks/LocalModParseTask.h"
-#include "minecraft/mod/tasks/LocalResourcePackParseTask.h"
-#include "minecraft/mod/tasks/LocalShaderPackParseTask.h"
-#include "minecraft/mod/tasks/LocalTexturePackParseTask.h"
-#include "minecraft/mod/tasks/LocalWorldSaveParseTask.h"
+#include "minecraft/mod/tasks/LocalResourceParse.h"
+
 
 const static QMap<QString, QString> forgemap = { { "1.2.5", "3.4.9.171" },
                                                  { "1.4.2", "6.0.1.355" },
@@ -561,42 +557,48 @@ void FlameCreationTask::validateZIPResouces()
             return localPath;
         };
 
+        auto installWorld = [this](QString worldPath){
+            qDebug() << "Installing World from" << worldPath;
+            QFileInfo worldFileInfo(worldPath);
+            World w(worldFileInfo);
+            if (!w.isValid()) {
+                qDebug() << "World at" << worldPath << "is not valid, skipping install.";
+            } else {
+                w.install(FS::PathCombine(m_stagingPath, "minecraft", "saves"));
+            }
+        };
+
         QFileInfo localFileInfo(localPath);
-        if (localFileInfo.exists() && localFileInfo.isFile()) {
-            if (ResourcePackUtils::validate(localFileInfo)) {
-                qDebug() << fileName << "is a resource pack";
+        auto type = ResourceUtils::identify(localFileInfo);
+
+        QString worldPath;
+
+        switch (type) {
+            case PackedResourceType::ResourcePack :
                 validatePath(fileName, targetFolder, "resourcepacks");
-            } else if (TexturePackUtils::validate(localFileInfo)) {
-                qDebug() << fileName << "is a pre 1.6 texture pack";
+                break;
+            case PackedResourceType::TexturePack :
                 validatePath(fileName, targetFolder, "texturepacks");
-            } else if (DataPackUtils::validate(localFileInfo)) {
-                qDebug() << fileName << "is a data pack";
+                break;
+            case PackedResourceType::DataPack :
                 validatePath(fileName, targetFolder, "datapacks");
-            } else if (ModUtils::validate(localFileInfo)) {
-                qDebug() << fileName << "is a mod";
+                break;
+            case PackedResourceType::Mod :
                 validatePath(fileName, targetFolder, "mods");
-            } else if (WorldSaveUtils::validate(localFileInfo)) {
-                qDebug() << fileName << "is a world save";
-                QString worldPath = validatePath(fileName, targetFolder, "saves");
-
-                qDebug() << "Installing World from" << worldPath;
-                QFileInfo worldFileInfo(worldPath);
-                World w(worldFileInfo);
-                if (!w.isValid()) {
-                    qDebug() << "World at" << worldPath << "is not valid, skipping install.";
-                } else {
-                    w.install(FS::PathCombine(m_stagingPath, "minecraft", "saves"));
-                }
-            } else if (ShaderPackUtils::validate(localFileInfo)) {
+                break;
+            case PackedResourceType::ShaderPack :
                 // in theroy flame API can't do this but who knows, that *may* change ?
                 // better to handle it if it *does* occure in the future
-                qDebug() << fileName << "is a shader pack";
                 validatePath(fileName, targetFolder, "shaderpacks");
-            } else {
+                break;
+            case PackedResourceType::WorldSave :
+                worldPath = validatePath(fileName, targetFolder, "saves");
+                installWorld(worldPath);
+                break;
+            case PackedResourceType::UNKNOWN :
+            default :
                 qDebug() << "Can't Identify" << fileName << "at" << localPath << ", leaving it where it is.";
-            }
-        } else {
-            qDebug() << "Can't find" << localPath << "to validate it, ignoring";
+                break;
         }
     }
 }
-- 
cgit 


From 6a1807995390b2a2cbe074ee1f47d3791e0e3f10 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Fri, 25 Nov 2022 09:23:46 -0300
Subject: 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>
---
 launcher/modplatform/flame/FlameAPI.cpp            | 16 ++--
 launcher/modplatform/flame/FlameAPI.h              | 99 ++++++++++++----------
 launcher/modplatform/flame/FlameCheckUpdate.cpp    | 11 ++-
 launcher/modplatform/flame/FlameCheckUpdate.h      |  2 +-
 .../flame/FlameInstanceCreationTask.cpp            |  4 +-
 .../modplatform/flame/FlameInstanceCreationTask.h  |  2 +-
 launcher/modplatform/flame/FlameModIndex.cpp       |  4 +-
 7 files changed, 77 insertions(+), 61 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 4d71da21..ae401399 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -106,13 +106,19 @@ auto FlameAPI::getModDescription(int modId) -> QString
 
 auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::IndexedVersion
 {
+    auto versions_url_optional = getVersionsURL(args);
+    if (!versions_url_optional.has_value())
+        return {};
+
+    auto versions_url = versions_url_optional.value();
+
     QEventLoop loop;
 
     auto netJob = new NetJob(QString("Flame::GetLatestVersion(%1)").arg(args.addonId), APPLICATION->network());
     auto response = new QByteArray();
     ModPlatform::IndexedVersion ver;
 
-    netJob->addNetAction(Net::Download::makeByteArray(getVersionsURL(args), response));
+    netJob->addNetAction(Net::Download::makeByteArray(versions_url, response));
 
     QObject::connect(netJob, &NetJob::succeeded, [response, args, &ver] {
         QJsonParseError parse_error{};
@@ -161,7 +167,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
     return ver;
 }
 
-auto FlameAPI::getProjects(QStringList addonIds, QByteArray* response) const -> NetJob*
+NetJob::Ptr FlameAPI::getProjects(QStringList addonIds, QByteArray* response) const
 {
     auto* netJob = new NetJob(QString("Flame::GetProjects"), APPLICATION->network());
 
@@ -178,13 +184,13 @@ auto FlameAPI::getProjects(QStringList addonIds, QByteArray* response) const ->
 
     netJob->addNetAction(Net::Upload::makeByteArray(QString("https://api.curseforge.com/v1/mods"), response, body_raw));
 
-    QObject::connect(netJob, &NetJob::finished, [response, netJob] { delete response; netJob->deleteLater(); });
+    QObject::connect(netJob, &NetJob::finished, [response] { delete response; });
     QObject::connect(netJob, &NetJob::failed, [body_raw] { qDebug() << body_raw; });
 
     return netJob;
 }
 
-auto FlameAPI::getFiles(const QStringList& fileIds, QByteArray* response) const -> NetJob*
+NetJob::Ptr FlameAPI::getFiles(const QStringList& fileIds, QByteArray* response) const
 {
     auto* netJob = new NetJob(QString("Flame::GetFiles"), APPLICATION->network());
 
@@ -201,7 +207,7 @@ auto FlameAPI::getFiles(const QStringList& fileIds, QByteArray* response) const
 
     netJob->addNetAction(Net::Upload::makeByteArray(QString("https://api.curseforge.com/v1/mods/files"), response, body_raw));
 
-    QObject::connect(netJob, &NetJob::finished, [response, netJob] { delete response; netJob->deleteLater(); });
+    QObject::connect(netJob, &NetJob::finished, [response] { delete response; });
     QObject::connect(netJob, &NetJob::failed, [body_raw] { qDebug() << body_raw; });
 
     return netJob;
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 4c6ca64c..114a2716 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -1,21 +1,21 @@
 #pragma once
 
 #include "modplatform/ModIndex.h"
-#include "modplatform/helpers/NetworkModAPI.h"
+#include "modplatform/helpers/NetworkResourceAPI.h"
 
-class FlameAPI : public NetworkModAPI {
+class FlameAPI : public NetworkResourceAPI {
    public:
-    auto matchFingerprints(const QList<uint>& fingerprints, QByteArray* response) -> NetJob::Ptr;
     auto getModFileChangelog(int modId, int fileId) -> QString;
     auto getModDescription(int modId) -> QString;
 
     auto getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::IndexedVersion;
 
-    auto getProjects(QStringList addonIds, QByteArray* response) const -> NetJob* override;
-    auto getFiles(const QStringList& fileIds, QByteArray* response) const -> NetJob*;
+    NetJob::Ptr getProjects(QStringList addonIds, QByteArray* response) const override;
+    NetJob::Ptr matchFingerprints(const QList<uint>& fingerprints, QByteArray* response);
+    NetJob::Ptr getFiles(const QStringList& fileIds, QByteArray* response) const;
 
    private:
-    inline auto getSortFieldInt(QString sortString) const -> int
+    static int getSortFieldInt(QString const& sortString)
     {
         return sortString == "Featured"         ? 1
                : sortString == "Popularity"     ? 2
@@ -28,48 +28,16 @@ class FlameAPI : public NetworkModAPI {
                                                 : 1;
     }
 
-   private:
-    inline auto getModSearchURL(SearchArgs& args) const -> QString override
-    {
-        auto gameVersionStr = args.versions.size() != 0 ? QString("gameVersion=%1").arg(args.versions.front().toString()) : QString();
-
-        return QString(
-                   "https://api.curseforge.com/v1/mods/search?"
-                   "gameId=432&"
-                   "classId=6&"
-
-                   "index=%1&"
-                   "pageSize=25&"
-                   "searchFilter=%2&"
-                   "sortField=%3&"
-                   "sortOrder=desc&"
-                   "modLoaderType=%4&"
-                   "%5")
-            .arg(args.offset)
-            .arg(args.search)
-            .arg(getSortFieldInt(args.sorting))
-            .arg(getMappedModLoader(args.loaders))
-            .arg(gameVersionStr);
-    };
-
-    inline auto getModInfoURL(QString& id) const -> QString override
+    static int getClassId(ModPlatform::ResourceType type)
     {
-        return QString("https://api.curseforge.com/v1/mods/%1").arg(id);
-    };
-
-    inline auto getVersionsURL(VersionSearchArgs& args) const -> QString override
-    {
-        QString gameVersionQuery = args.mcVersions.size() == 1 ? QString("gameVersion=%1&").arg(args.mcVersions.front().toString()) : "";
-        QString modLoaderQuery = QString("modLoaderType=%1&").arg(getMappedModLoader(args.loaders));
-
-        return QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&%2%3")
-            .arg(args.addonId)
-            .arg(gameVersionQuery)
-            .arg(modLoaderQuery);
-    };
+        switch (type) {
+            default:
+            case ModPlatform::ResourceType::MOD:
+                return 6;
+        }
+    }
 
-   public:
-    static auto getMappedModLoader(const ModLoaderTypes loaders) -> int
+    static int getMappedModLoader(ModLoaderTypes loaders)
     {
         // https://docs.curseforge.com/?http#tocS_ModLoaderType
         if (loaders & Forge)
@@ -81,4 +49,43 @@ class FlameAPI : public NetworkModAPI {
             return 4;  // Quilt would probably be 5
         return 0;
     }
+
+   private:
+    [[nodiscard]] std::optional<QString> getSearchURL(SearchArgs const& args) const override
+    {
+        auto gameVersionStr = args.versions.has_value() ? QString("gameVersion=%1").arg(args.versions.value().front().toString()) : QString();
+
+        QStringList get_arguments;
+        get_arguments.append(QString("classId=%1").arg(getClassId(args.type)));
+        get_arguments.append(QString("index=%1").arg(args.offset));
+        get_arguments.append("pageSize=25");
+        if (args.search.has_value())
+            get_arguments.append(QString("searchFilter=%1").arg(args.search.value()));
+        if (args.sorting.has_value())
+            get_arguments.append(QString("sortField=%1").arg(getSortFieldInt(args.sorting.value())));
+        get_arguments.append("sortOrder=desc");
+        if (args.loaders.has_value())
+            get_arguments.append(QString("modLoaderType=%1").arg(getMappedModLoader(args.loaders.value())));
+        get_arguments.append(gameVersionStr);
+
+        return "https://api.curseforge.com/v1/mods/search?gameId=432&" + get_arguments.join('&');
+    };
+
+    [[nodiscard]] std::optional<QString> getInfoURL(QString const& id) const override
+    {
+        return QString("https://api.curseforge.com/v1/mods/%1").arg(id);
+    };
+
+    [[nodiscard]] std::optional<QString> getVersionsURL(VersionSearchArgs const& args) const override
+    {
+        QString url{QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&").arg(args.addonId)};
+
+        QStringList get_parameters;
+        if (args.mcVersions.has_value())
+            get_parameters.append(QString("gameVersion=%1").arg(args.mcVersions.value().front().toString()));
+        if (args.loaders.has_value())
+            get_parameters.append(QString("modLoaderType=%1").arg(getMappedModLoader(args.loaders.value())));
+
+        return url + get_parameters.join('&');
+    };
 };
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.cpp b/launcher/modplatform/flame/FlameCheckUpdate.cpp
index 8dd3a846..285fa49f 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.cpp
+++ b/launcher/modplatform/flame/FlameCheckUpdate.cpp
@@ -7,7 +7,10 @@
 #include "FileSystem.h"
 #include "Json.h"
 
-#include "ModDownloadTask.h"
+#include "ResourceDownloadTask.h"
+
+#include "minecraft/mod/ModFolderModel.h"
+#include "minecraft/mod/ResourceFolderModel.h"
 
 static FlameAPI api;
 
@@ -160,7 +163,7 @@ void FlameCheckUpdate::executeTask()
             for (auto& author : mod->authors())
                 pack.authors.append({ author });
             pack.description = mod->description();
-            pack.provider = ModPlatform::Provider::FLAME;
+            pack.provider = ModPlatform::ResourceProvider::FLAME;
 
             auto old_version = mod->version();
             if (old_version.isEmpty() && mod->status() != ModStatus::NotInstalled) {
@@ -168,10 +171,10 @@ void FlameCheckUpdate::executeTask()
                 old_version = current_ver.version;
             }
 
-            auto download_task = new ModDownloadTask(pack, latest_ver, m_mods_folder);
+            auto download_task = new ResourceDownloadTask(pack, latest_ver, m_mods_folder);
             m_updatable.emplace_back(pack.name, mod->metadata()->hash, old_version, latest_ver.version,
                                      api.getModFileChangelog(latest_ver.addonId.toInt(), latest_ver.fileId.toInt()),
-                                     ModPlatform::Provider::FLAME, download_task);
+                                     ModPlatform::ResourceProvider::FLAME, download_task);
         }
     }
 
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.h b/launcher/modplatform/flame/FlameCheckUpdate.h
index 163c706c..4a98d684 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.h
+++ b/launcher/modplatform/flame/FlameCheckUpdate.h
@@ -8,7 +8,7 @@ class FlameCheckUpdate : public CheckUpdateTask {
     Q_OBJECT
 
    public:
-    FlameCheckUpdate(QList<Mod*>& mods, std::list<Version>& mcVersions, ModAPI::ModLoaderTypes loaders, std::shared_ptr<ModFolderModel> mods_folder)
+    FlameCheckUpdate(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/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index dc69769a..fb6f78e8 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -183,7 +183,7 @@ bool FlameCreationTask::updateInstance()
 
         QEventLoop loop;
 
-        connect(job, &NetJob::succeeded, this, [this, raw_response, fileIds, old_inst_dir, &old_files, old_minecraft_dir] {
+        connect(job.get(), &NetJob::succeeded, this, [this, raw_response, fileIds, old_inst_dir, &old_files, old_minecraft_dir] {
             // Parse the API response
             QJsonParseError parse_error{};
             auto doc = QJsonDocument::fromJson(*raw_response, &parse_error);
@@ -225,7 +225,7 @@ bool FlameCreationTask::updateInstance()
                 m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(relative_path));
             }
         });
-        connect(job, &NetJob::finished, &loop, &QEventLoop::quit);
+        connect(job.get(), &NetJob::finished, &loop, &QEventLoop::quit);
 
         m_process_update_file_info_job = job;
         job->start();
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.h b/launcher/modplatform/flame/FlameInstanceCreationTask.h
index 498e1d6e..36b62e3e 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.h
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.h
@@ -86,7 +86,7 @@ class FlameCreationTask final : public InstanceCreationTask {
     Flame::Manifest m_pack;
 
     // Handle to allow aborting
-    NetJob* m_process_update_file_info_job = nullptr;
+    NetJob::Ptr m_process_update_file_info_job = nullptr;
     NetJob::Ptr m_files_job = nullptr;
 
     QString m_managed_id, m_managed_version_id;
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 32aa4bdb..617b98ce 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -11,7 +11,7 @@ static ModPlatform::ProviderCapabilities ProviderCaps;
 void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
 {
     pack.addonId = Json::requireInteger(obj, "id");
-    pack.provider = ModPlatform::Provider::FLAME;
+    pack.provider = ModPlatform::ResourceProvider::FLAME;
     pack.name = Json::requireString(obj, "name");
     pack.slug = Json::requireString(obj, "slug");
     pack.websiteUrl = Json::ensureString(Json::ensureObject(obj, "links"), "websiteUrl", "");
@@ -127,7 +127,7 @@ auto FlameMod::loadIndexedPackVersion(QJsonObject& obj, bool load_changelog) ->
     auto hash_list = Json::ensureArray(obj, "hashes");
     for (auto h : hash_list) {
         auto hash_entry = Json::ensureObject(h);
-        auto hash_types = ProviderCaps.hashType(ModPlatform::Provider::FLAME);
+        auto hash_types = ProviderCaps.hashType(ModPlatform::ResourceProvider::FLAME);
         auto hash_algo = enumToString(Json::ensureInteger(hash_entry, "algo", 1, "algorithm"));
         if (hash_types.contains(hash_algo)) {
             file.hash = Json::requireString(hash_entry, "value");
-- 
cgit 


From 45d1319891ce87cc1546a316ad550f892d411633 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sun, 18 Dec 2022 15:41:46 -0300
Subject: refactor(RD): decouple ResourceModels from ResourcePages

This makes it so that we don't need a reference to the parent page in
the model. It will be useful once we change the page from a widget-based
one to a QML page.

It also makes tasks be created in the dialog instead of the page, so
that the dialog can also have the necessary information to mark versions
as selected / deselected easily. It also makes the task pointers into
smart pointers.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FlameAPI.cpp         | 2 +-
 launcher/modplatform/flame/FlameAPI.h           | 2 +-
 launcher/modplatform/flame/FlameCheckUpdate.cpp | 3 ++-
 launcher/modplatform/flame/FlameModIndex.cpp    | 4 ++--
 launcher/modplatform/flame/FlameModIndex.h      | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index ae401399..89249c41 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -114,7 +114,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
 
     QEventLoop loop;
 
-    auto netJob = new NetJob(QString("Flame::GetLatestVersion(%1)").arg(args.addonId), APPLICATION->network());
+    auto netJob = new NetJob(QString("Flame::GetLatestVersion(%1)").arg(args.pack.name), APPLICATION->network());
     auto response = new QByteArray();
     ModPlatform::IndexedVersion ver;
 
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 114a2716..f3cc0bbf 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -78,7 +78,7 @@ class FlameAPI : public NetworkResourceAPI {
 
     [[nodiscard]] std::optional<QString> getVersionsURL(VersionSearchArgs const& args) const override
     {
-        QString url{QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&").arg(args.addonId)};
+        QString url{QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&").arg(args.pack.addonId.toString())};
 
         QStringList get_parameters;
         if (args.mcVersions.has_value())
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.cpp b/launcher/modplatform/flame/FlameCheckUpdate.cpp
index 285fa49f..7aee4f4c 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.cpp
+++ b/launcher/modplatform/flame/FlameCheckUpdate.cpp
@@ -129,7 +129,8 @@ void FlameCheckUpdate::executeTask()
         setStatus(tr("Getting API response from CurseForge for '%1'...").arg(mod->name()));
         setProgress(i++, m_mods.size());
 
-        auto latest_ver = api.getLatestVersion({ mod->metadata()->project_id.toString(), m_game_versions, m_loaders });
+        ModPlatform::IndexedPack pack{ mod->metadata()->project_id.toString() };
+        auto latest_ver = api.getLatestVersion({ pack, m_game_versions, m_loaders });
 
         // Check if we were aborted while getting the latest version
         if (m_was_aborted) {
diff --git a/launcher/modplatform/flame/FlameModIndex.cpp b/launcher/modplatform/flame/FlameModIndex.cpp
index 617b98ce..7498e830 100644
--- a/launcher/modplatform/flame/FlameModIndex.cpp
+++ b/launcher/modplatform/flame/FlameModIndex.cpp
@@ -76,10 +76,10 @@ static QString enumToString(int hash_algorithm)
 void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                                        QJsonArray& arr,
                                        const shared_qobject_ptr<QNetworkAccessManager>& network,
-                                       BaseInstance* inst)
+                                       const BaseInstance* inst)
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    auto profile = (dynamic_cast<MinecraftInstance*>(inst))->getPackProfile();
+    auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
     QString mcVersion = profile->getComponentVersion("net.minecraft");
 
     for (auto versionIter : arr) {
diff --git a/launcher/modplatform/flame/FlameModIndex.h b/launcher/modplatform/flame/FlameModIndex.h
index db63cdbb..33c4a529 100644
--- a/launcher/modplatform/flame/FlameModIndex.h
+++ b/launcher/modplatform/flame/FlameModIndex.h
@@ -17,7 +17,7 @@ void loadBody(ModPlatform::IndexedPack& m, QJsonObject& obj);
 void loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                              QJsonArray& arr,
                              const shared_qobject_ptr<QNetworkAccessManager>& network,
-                             BaseInstance* inst);
+                             const BaseInstance* inst);
 auto loadIndexedPackVersion(QJsonObject& obj, bool load_changelog = false) -> ModPlatform::IndexedVersion;
 
 }  // namespace FlameMod
-- 
cgit 


From 36571c5e2237c98e194cff326480ebe3e661c586 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 20 Dec 2022 12:15:17 -0300
Subject: refactor(RD): clear up sorting methods

This refactors the sorting methods to join every bit of it into a single
list, easing maintanance. It also removes the weird index contraint on
the list of methods by adding an index field to the DS that holds the
method.

Lastly, it puts the available methods on their respective API, so other
resources on the same API can re-use them later on.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FlameAPI.cpp | 15 +++++++++++++++
 launcher/modplatform/flame/FlameAPI.h   | 17 +++--------------
 2 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 89249c41..32729a14 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -212,3 +212,18 @@ NetJob::Ptr FlameAPI::getFiles(const QStringList& fileIds, QByteArray* response)
 
     return netJob;
 }
+
+// https://docs.curseforge.com/?python#tocS_ModsSearchSortField
+static QList<ResourceAPI::SortingMethod> s_sorts = { { 1, "Featured", QObject::tr("Sort by Featured") },
+                                                     { 2, "Popularity", QObject::tr("Sort by Popularity") },
+                                                     { 3, "LastUpdated", QObject::tr("Sort by Last Updated") },
+                                                     { 4, "Name", QObject::tr("Sort by Name") },
+                                                     { 5, "Author", QObject::tr("Sort by Author") },
+                                                     { 6, "TotalDownloads", QObject::tr("Sort by Downloads") },
+                                                     { 7, "Category", QObject::tr("Sort by Category") },
+                                                     { 8, "GameVersion", QObject::tr("Sort by Game Version") } };
+
+QList<ResourceAPI::SortingMethod> FlameAPI::getSortingMethods() const
+{
+    return s_sorts;
+}
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index f3cc0bbf..2b288564 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -14,20 +14,9 @@ class FlameAPI : public NetworkResourceAPI {
     NetJob::Ptr matchFingerprints(const QList<uint>& fingerprints, QByteArray* response);
     NetJob::Ptr getFiles(const QStringList& fileIds, QByteArray* response) const;
 
-   private:
-    static int getSortFieldInt(QString const& sortString)
-    {
-        return sortString == "Featured"         ? 1
-               : sortString == "Popularity"     ? 2
-               : sortString == "LastUpdated"    ? 3
-               : sortString == "Name"           ? 4
-               : sortString == "Author"         ? 5
-               : sortString == "TotalDownloads" ? 6
-               : sortString == "Category"       ? 7
-               : sortString == "GameVersion"    ? 8
-                                                : 1;
-    }
+    [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
 
+   private:
     static int getClassId(ModPlatform::ResourceType type)
     {
         switch (type) {
@@ -62,7 +51,7 @@ class FlameAPI : public NetworkResourceAPI {
         if (args.search.has_value())
             get_arguments.append(QString("searchFilter=%1").arg(args.search.value()));
         if (args.sorting.has_value())
-            get_arguments.append(QString("sortField=%1").arg(getSortFieldInt(args.sorting.value())));
+            get_arguments.append(QString("sortField=%1").arg(args.sorting.value().index));
         get_arguments.append("sortOrder=desc");
         if (args.loaders.has_value())
             get_arguments.append(QString("modLoaderType=%1").arg(getMappedModLoader(args.loaders.value())));
-- 
cgit 


From ba677a8cb76dd6cde4a08ff4b6f142f7be1bdb29 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 3 Jan 2023 13:58:27 -0300
Subject: refactor: change some ResourceAPI from NetJob to Task

This makes it easier to create resource apis that aren't network-based.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FlameAPI.cpp                  | 6 +++---
 launcher/modplatform/flame/FlameAPI.h                    | 6 +++---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 4 ++--
 launcher/modplatform/flame/FlameInstanceCreationTask.h   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 32729a14..c8981585 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -7,7 +7,7 @@
 
 #include "net/Upload.h"
 
-auto FlameAPI::matchFingerprints(const QList<uint>& fingerprints, QByteArray* response) -> NetJob::Ptr
+Task::Ptr FlameAPI::matchFingerprints(const QList<uint>& fingerprints, QByteArray* response)
 {
     auto* netJob = new NetJob(QString("Flame::MatchFingerprints"), APPLICATION->network());
 
@@ -167,7 +167,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
     return ver;
 }
 
-NetJob::Ptr FlameAPI::getProjects(QStringList addonIds, QByteArray* response) const
+Task::Ptr FlameAPI::getProjects(QStringList addonIds, QByteArray* response) const
 {
     auto* netJob = new NetJob(QString("Flame::GetProjects"), APPLICATION->network());
 
@@ -190,7 +190,7 @@ NetJob::Ptr FlameAPI::getProjects(QStringList addonIds, QByteArray* response) co
     return netJob;
 }
 
-NetJob::Ptr FlameAPI::getFiles(const QStringList& fileIds, QByteArray* response) const
+Task::Ptr FlameAPI::getFiles(const QStringList& fileIds, QByteArray* response) const
 {
     auto* netJob = new NetJob(QString("Flame::GetFiles"), APPLICATION->network());
 
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 2b288564..8e7ed727 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -10,9 +10,9 @@ class FlameAPI : public NetworkResourceAPI {
 
     auto getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::IndexedVersion;
 
-    NetJob::Ptr getProjects(QStringList addonIds, QByteArray* response) const override;
-    NetJob::Ptr matchFingerprints(const QList<uint>& fingerprints, QByteArray* response);
-    NetJob::Ptr getFiles(const QStringList& fileIds, QByteArray* response) const;
+    Task::Ptr getProjects(QStringList addonIds, QByteArray* response) const override;
+    Task::Ptr matchFingerprints(const QList<uint>& fingerprints, QByteArray* response);
+    Task::Ptr getFiles(const QStringList& fileIds, QByteArray* response) const;
 
     [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
 
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index fb6f78e8..890bff48 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -183,7 +183,7 @@ bool FlameCreationTask::updateInstance()
 
         QEventLoop loop;
 
-        connect(job.get(), &NetJob::succeeded, this, [this, raw_response, fileIds, old_inst_dir, &old_files, old_minecraft_dir] {
+        connect(job.get(), &Task::succeeded, this, [this, raw_response, fileIds, old_inst_dir, &old_files, old_minecraft_dir] {
             // Parse the API response
             QJsonParseError parse_error{};
             auto doc = QJsonDocument::fromJson(*raw_response, &parse_error);
@@ -225,7 +225,7 @@ bool FlameCreationTask::updateInstance()
                 m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(relative_path));
             }
         });
-        connect(job.get(), &NetJob::finished, &loop, &QEventLoop::quit);
+        connect(job.get(), &Task::finished, &loop, &QEventLoop::quit);
 
         m_process_update_file_info_job = job;
         job->start();
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.h b/launcher/modplatform/flame/FlameInstanceCreationTask.h
index 36b62e3e..0ae4735b 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.h
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.h
@@ -86,7 +86,7 @@ class FlameCreationTask final : public InstanceCreationTask {
     Flame::Manifest m_pack;
 
     // Handle to allow aborting
-    NetJob::Ptr m_process_update_file_info_job = nullptr;
+    Task::Ptr m_process_update_file_info_job = nullptr;
     NetJob::Ptr m_files_job = nullptr;
 
     QString m_managed_id, m_managed_version_id;
-- 
cgit 


From ea5020e188d7cb6d4c8dcf7f953161759ed17899 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Mon, 23 Jan 2023 11:03:55 -0300
Subject: fix(license): add/fix my copyright/license headers

*sobbing in messy legal stuff i know nothing about*

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FlameAPI.cpp | 4 ++++
 launcher/modplatform/flame/FlameAPI.h   | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index c8981585..57f70047 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
 #include "FlameAPI.h"
 #include "FlameModIndex.h"
 
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 8e7ed727..06d749e6 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
 #pragma once
 
 #include "modplatform/ModIndex.h"
-- 
cgit 


From 29f7ea752fd34bdea64a7c7f2c505982ac39ce0d Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 24 Jan 2023 16:52:09 -0300
Subject: refactor: make shared_qobject_ptr ctor explicit

This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FileResolvingTask.cpp         |  4 ++--
 launcher/modplatform/flame/FlameAPI.cpp                  | 16 ++++++++--------
 launcher/modplatform/flame/FlameCheckUpdate.cpp          |  2 +-
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'launcher/modplatform/flame')

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 7f1beb1a..d3a737bb 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -23,7 +23,7 @@ void Flame::FileResolvingTask::executeTask()
 {
     setStatus(tr("Resolving mod IDs..."));
     setProgress(0, 3);
-    m_dljob = new NetJob("Mod id resolver", m_network);
+    m_dljob.reset(new NetJob("Mod id resolver", m_network));
     result.reset(new QByteArray());
     //build json data to send
     QJsonObject object;
@@ -43,7 +43,7 @@ void Flame::FileResolvingTask::netJobFinished()
 {
     setProgress(1, 3);
     // job to check modrinth for blocked projects
-    m_checkJob = new NetJob("Modrinth check", m_network);
+    m_checkJob.reset(new NetJob("Modrinth check", m_network));
     blockedProjects = QMap<File *,QByteArray *>();
 
     QJsonDocument doc;
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 4b926ec3..5ef9a409 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -13,7 +13,7 @@
 
 Task::Ptr FlameAPI::matchFingerprints(const QList<uint>& fingerpr