5 files changed, 69 insertions, 26 deletions
diff --git a/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h b/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
new file mode 100644
index 00000000..0fd5c292
--- /dev/null
+++ b/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <QDir>
+#include <QMap>
+#include <QObject>
+
+#include <memory>
+
+#include "minecraft/mod/Resource.h"
+
+#include "tasks/Task.h"
+
+/** Very simple task that just loads a folder's contents directly. 
+ */
+class BasicFolderLoadTask : public Task
+{
+    Q_OBJECT
+public:
+    struct Result {
+        QMap<QString, Resource::Ptr> resources;
+    };
+    using ResultPtr = std::shared_ptr<Result>;
+
+    [[nodiscard]] ResultPtr result() const {
+        return m_result;
+    }
+
+public:
+    BasicFolderLoadTask(QDir dir) : Task(nullptr, false), m_dir(dir), m_result(new Result) {}
+    void executeTask() override
+    {
+        m_dir.refresh();
+        for (auto entry : m_dir.entryInfoList()) {
+            auto resource = new Resource(entry);
+            m_result->resources.insert(resource->internal_id(), resource);
+        }
+
+        emitSucceeded();
+    }
+
+private:
+    QDir m_dir;
+    ResultPtr m_result;
+};
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index 1519f49d..fe3716ce 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -338,13 +338,13 @@ std::shared_ptr<ModDetails> ReadLiteModInfo(QByteArray contents)
 
 }
 
-LocalModParseTask::LocalModParseTask(int token, Mod::ModType type, const QFileInfo& modFile):
+LocalModParseTask::LocalModParseTask(int token, ResourceType type, const QFileInfo& modFile):
+    Task(nullptr, false),
     m_token(token),
     m_type(type),
     m_modFile(modFile),
     m_result(new Result())
-{
-}
+{}
 
 void LocalModParseTask::processAsZip()
 {
@@ -497,21 +497,21 @@ void LocalModParseTask::processAsLitemod()
     zip.close();
 }
 
-void LocalModParseTask::run()
+void LocalModParseTask::executeTask()
 {
     switch(m_type)
     {
-        case Mod::MOD_ZIPFILE:
+        case ResourceType::ZIPFILE:
             processAsZip();
             break;
-        case Mod::MOD_FOLDER:
+        case ResourceType::FOLDER:
             processAsFolder();
             break;
-        case Mod::MOD_LITEMOD:
+        case ResourceType::LITEMOD:
             processAsLitemod();
             break;
         default:
             break;
     }
-    emit finished(m_token);
+    emitSucceeded();
 }
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.h b/launcher/minecraft/mod/tasks/LocalModParseTask.h
index ed92394c..dbecb449 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.h
@@ -2,17 +2,17 @@
 
 #include <QDebug>
 #include <QObject>
-#include <QRunnable>
 
 #include "minecraft/mod/Mod.h"
 #include "minecraft/mod/ModDetails.h"
 
-class LocalModParseTask : public QObject, public QRunnable
+#include "tasks/Task.h"
+
+class LocalModParseTask : public Task
 {
     Q_OBJECT
 public:
     struct Result {
-        QString id;
         std::shared_ptr<ModDetails> details;
     };
     using ResultPtr = std::shared_ptr<Result>;
@@ -20,11 +20,10 @@ public:
         return m_result;
     }
 
-    LocalModParseTask(int token, Mod::ModType type, const QFileInfo & modFile);
-    void run();
+    LocalModParseTask(int token, ResourceType type, const QFileInfo & modFile);
+    void executeTask() override;
 
-signals:
-    void finished(int token);
+    [[nodiscard]] int token() const { return m_token; }
 
 private:
     void processAsZip();
@@ -33,7 +32,7 @@ private:
 
 private:
     int m_token;
-    Mod::ModType m_type;
+    ResourceType m_type;
     QFileInfo m_modFile;
     ResultPtr m_result;
 };
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 015ead80..e8180c11 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -38,11 +38,11 @@
 
 #include "minecraft/mod/MetadataHandler.h"
 
-ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir, bool is_indexed, bool clean_orphan)
-    : m_mods_dir(mods_dir), m_index_dir(index_dir), m_is_indexed(is_indexed), m_clean_orphan(clean_orphan), m_result(new Result())
+ModFolderLoadTask::ModFolderLoadTask(QDir mods_dir, QDir index_dir, bool is_indexed, bool clean_orphan)
+    : Task(nullptr, false), m_mods_dir(mods_dir), m_index_dir(index_dir), m_is_indexed(is_indexed), m_clean_orphan(clean_orphan), m_result(new Result())
 {}
 
-void ModFolderLoadTask::run()
+void ModFolderLoadTask::executeTask()
 {
     if (m_is_indexed) {
         // Read metadata first
@@ -96,7 +96,7 @@ void ModFolderLoadTask::run()
         }
     }
 
-    emit succeeded();
+    emitSucceeded();
 }
 
 void ModFolderLoadTask::getFromMetadata()
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
index 1f2015d2..86f3f67f 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
@@ -42,8 +42,9 @@
 #include <QRunnable>
 #include <memory>
 #include "minecraft/mod/Mod.h"
+#include "tasks/Task.h"
 
-class ModFolderLoadTask : public QObject, public QRunnable
+class ModFolderLoadTask : public Task
 {
     Q_OBJECT
 public:
@@ -56,16 +57,15 @@ public:
     }
 
 public:
-    ModFolderLoadTask(QDir& mods_dir, QDir& index_dir, bool is_indexed, bool clean_orphan = false);
-    void run();
-signals:
-    void succeeded();
+    ModFolderLoadTask(QDir mods_dir, QDir index_dir, bool is_indexed, bool clean_orphan = false);
+
+    void executeTask() override;
 
 private:
     void getFromMetadata();
 
 private:
-    QDir& m_mods_dir, m_index_dir;
+    QDir m_mods_dir, m_index_dir;
     bool m_is_indexed;
     bool m_clean_orphan;
     ResultPtr m_result;