1 files changed, 16 insertions, 83 deletions

diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index 3d6efac3..c33195ed 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -44,6 +44,7 @@
 #include <QAbstractListModel>
 
 #include "Mod.h"
+#include "ResourceFolderModel.h"
 
 #include "minecraft/mod/tasks/ModFolderLoadTask.h"
 #include "minecraft/mod/tasks/LocalModParseTask.h"
@@ -56,7 +57,7 @@ class QFileSystemWatcher;
  * A legacy mod list.
  * Backed by a folder.
  */
-class ModFolderModel : public QAbstractListModel
+class ModFolderModel : public ResourceFolderModel
 {
     Q_OBJECT
 public:
@@ -75,106 +76,38 @@ public:
     };
     ModFolderModel(const QString &dir, bool is_indexed = false);
 
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-    Qt::DropActions supportedDropActions() const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
-    /// flags, mostly to support drag&drop
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
-    QStringList mimeTypes() const override;
-    bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    int columnCount(const QModelIndex &parent) const override;
 
-    virtual int rowCount(const QModelIndex &) const override
-    {
-        return size();
-    }
-
-    virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    virtual int columnCount(const QModelIndex &parent) const override;
-
-    size_t size() const
-    {
-        return mods.size();
-    }
-    ;
-    bool empty() const
-    {
-        return size() == 0;
-    }
-    Mod& operator[](size_t index)
-    {
-        return *mods[index];
-    }
-    const Mod& at(size_t index) const
-    {
-        return *mods.at(index);
-    }
-
-    /// Reloads the mod list and returns true if the list changed.
-    bool update();
-
-    /**
-     * Adds the given mod to the list at the given index - if the list supports custom ordering
-     */
-    bool installMod(const QString& filename);
+    [[nodiscard]] Task* createUpdateTask() override;
+    [[nodiscard]] Task* createParseTask(Resource const&) override;
 
+    bool installMod(QString file_path) { return ResourceFolderModel::installResource(file_path); }
     bool uninstallMod(const QString& filename, bool preserve_metadata = false);
 
     /// Deletes all the selected mods
     bool deleteMods(const QModelIndexList &indexes);
 
-    /// Enable or disable listed mods
-    bool setModStatus(const QModelIndexList &indexes, ModStatusAction action);
-
-    void startWatching();
-    void stopWatching();
-
     bool isValid();
 
-    QDir& dir()
-    {
-        return m_dir;
-    }
-
-    QDir indexDir()
-    {
-        return { QString("%1/.index").arg(dir().absolutePath()) };
-    }
+    bool startWatching() override;
+    bool stopWatching() override;
 
-    const QList<Mod::Ptr>& allMods()
-    {
-        return mods;
-    }
+    QDir indexDir() { return { QString("%1/.index").arg(dir().absolutePath()) }; }
 
-    auto selectedMods(QModelIndexList& indexes) -> QList<Mod::Ptr>;
+    auto selectedMods(QModelIndexList& indexes) -> QList<Mod*>;
+    auto allMods() -> QList<Mod*>;
 
-public slots:
-    void disableInteraction(bool disabled);
+    RESOURCE_HELPERS(Mod)
 
 private
 slots:
-    void directoryChanged(QString path);
-    void finishUpdate();
-    void finishModParse(int token);
-
-signals:
-    void updateFinished();
-
-private:
-    void resolveMod(Mod::Ptr m);
-    bool setModStatus(int index, ModStatusAction action);
+    void onUpdateSucceeded() override;
+    void onParseSucceeded(int ticket, QString resource_id) override;
 
 protected:
-    QFileSystemWatcher *m_watcher;
-    bool is_watching = false;
-    ModFolderLoadTask::ResultPtr m_update;
-    bool scheduled_update = false;
-    bool interaction_disabled = false;
-    QDir m_dir;
     bool m_is_indexed;
     bool m_first_folder_load = true;
-    QMap<QString, int> modsIndex;
-    QMap<int, LocalModParseTask::ResultPtr> activeTickets;
-    int nextResolutionTicket = 0;
-    QList<Mod::Ptr> mods;
 };