2 files changed, 139 insertions, 4 deletions

diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index e29f8eb3..9ba033d7 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -1,3 +1,6 @@
+#include <qfileinfo.h>
+#include <qnamespace.h>
+#include "Application.h"
 #include "BlockedModsDialog.h"
 #include "ui_BlockedModsDialog.h"
 #include <QPushButton>
@@ -5,20 +8,29 @@
 #include <QDesktopServices>
 
 #include <QDebug>
+#include <QStandardPaths>
 
 
-BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, const QList<BlockedMod> &mods) :
+
+
+BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, QList<BlockedMod> &mods) :
         QDialog(parent), ui(new Ui::BlockedModsDialog), mods(mods) {
     ui->setupUi(this);
 
     auto openAllButton = ui->buttonBox->addButton(tr("Open All"), QDialogButtonBox::ActionRole);
     connect(openAllButton, &QPushButton::clicked, this, &BlockedModsDialog::openAll);
 
+    connect(&watcher, &QFileSystemWatcher::directoryChanged, this, &BlockedModsDialog::directoryChanged);
+
+    hashing_task = shared_qobject_ptr<ConcurrentTask>(new ConcurrentTask(this, "MakeHashesTask", 10));
+    
     qDebug() << "Mods List: " << mods;
 
+    setupWatch();
+    scanPaths(true);
+
     this->setWindowTitle(title);
     ui->label->setText(text);
-    ui->textBrowser->setText(body);
     update();
 }
 
@@ -50,6 +62,110 @@ void BlockedModsDialog::update() {
     ui->textBrowser->setText(text);
 }
 
+void BlockedModsDialog::directoryChanged(QString path) {
+    qDebug() << "Directory changed: " << path;
+    scanPath(path, false);
+}
+
+
+void BlockedModsDialog::setupWatch() {
+    const QString downloadsFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
+    const QString modsFolder = APPLICATION->settings()->get("CentralModsDir").toString();
+    watcher.addPath(downloadsFolder);
+    watcher.addPath(modsFolder);
+}
+
+void BlockedModsDialog::scanPaths(bool init) {
+    for (auto &dir : watcher.directories()) {
+        scanPath(dir, init);
+    }
+}
+
+void BlockedModsDialog::scanPath(QString path, bool init) {
+
+    QDir scan_dir(path);
+    QDirIterator scan_it(path, QDir::Filter::Files | QDir::Filter::Hidden, QDirIterator::NoIteratorFlags);
+    while (scan_it.hasNext()) {
+        QString file = scan_it.next();
+
+        if (checked_paths.contains(file)){
+            continue;
+        }
+
+        if (!checkValidPath(file)) {
+            continue;
+        }
+
+        auto hash_task = Hashing::createBlockedModHasher(file, ModPlatform::Provider::FLAME, "sha1");
+
+        qDebug() << "Creating Hash task for path: " << file;
+
+        connect(hash_task.get(), &Task::succeeded, [this, hash_task, file] { 
+            checkMatchHash(hash_task->getResult(), file);
+        });
+        connect(hash_task.get(), &Task::failed, [this, hash_task, file] { 
+            qDebug() << "Failed to hash path: " << file;
+        });
+
+        if (init) {
+            checked_paths.insert(file);
+        }
+        
+        hashing_task->addTask(hash_task);
+    }
+
+    hashing_task->start();
+
+}
+
+void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
+    bool match = false;
+
+    qDebug() << "Checking for match on hash: " << hash << " | From path:" << path;
+
+    for (auto &mod : mods) {
+        if (mod.matched) {
+            continue;
+        }
+        if (mod.hash.compare(hash, Qt::CaseInsensitive) == 0) {
+            mod.matched = true;
+            mod.localPath = path;
+            match = true;
+
+            qDebug() << "Hash match found: " << mod.name << " " << hash << " | From path:" << path;
+
+            break;
+        }
+    }
+
+    if (match) {
+        update();
+    }
+}
+
+bool BlockedModsDialog::checkValidPath(QString path) {
+
+    QFileInfo file = QFileInfo(path);
+    QString filename = file.fileName();
+
+    for (auto &mod : mods) {
+        if (mod.name.compare(filename, Qt::CaseInsensitive) == 0) {
+            qDebug() << "Name match found: " << mod.name << " | From path:" << path;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool BlockedModsDialog::allModsMatched() {
+    for (auto &mod : mods) {
+        if (!mod.matched)
+            return false;
+    }
+    return true;
+}
+
 
 QDebug operator<<(QDebug debug, const BlockedMod &m) {
     QDebugStateSaver saver(debug);
diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h
index 4be020ec..f1ea99ca 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.h
+++ b/launcher/ui/dialogs/BlockedModsDialog.h
@@ -1,7 +1,14 @@
 #pragma once
 
 #include <QDialog>
+#include <QString>
+#include <QList>
 
+#include <QFileSystemWatcher>
+
+#include "modplatform/helpers/HashUtils.h"
+
+#include "tasks/ConcurrentTask.h"
 
 struct BlockedMod {
     QString name;
@@ -20,15 +27,27 @@ class BlockedModsDialog : public QDialog {
 Q_OBJECT
 
 public:
-    BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, const QList<BlockedMod> &mods);
+    BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, QList<BlockedMod> &mods);
 
     ~BlockedModsDialog() override;
 
 
 private:
     Ui::BlockedModsDialog *ui;
-    const QList<BlockedMod> &mods;
+    QList<BlockedMod> &mods;
+    QFileSystemWatcher watcher;
+    shared_qobject_ptr<ConcurrentTask> hashing_task;
+    QSet<QString> checked_paths;
+
     void openAll();
     void update();
+    void directoryChanged(QString path);
+    void setupWatch();
+    void scanPaths(bool init);
+    void scanPath(QString path, bool init);
+    void checkMatchHash(QString hash, QString path);
+
+    bool checkValidPath(QString path);
+    bool allModsMatched();
 };