From 028e086960402f685e07163def36d6b5eee1b796 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon, 24 Oct 2022 04:08:38 -0700
Subject: send blocked mod info to dialog & prototype UI

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/ui/dialogs/BlockedModsDialog.cpp | 42 ++++++++++++++++++++++++++++---
 launcher/ui/dialogs/BlockedModsDialog.h   | 16 ++++++++++--
 2 files changed, 52 insertions(+), 6 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index fe87b517..e29f8eb3 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -4,17 +4,22 @@
 #include <QDialogButtonBox>
 #include <QDesktopServices>
 
+#include <QDebug>
 
-BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, const QString &body, const QList<QUrl> &urls) :
-        QDialog(parent), ui(new Ui::BlockedModsDialog), urls(urls) {
+
+BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, const 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);
 
+    qDebug() << "Mods List: " << mods;
+
     this->setWindowTitle(title);
     ui->label->setText(text);
     ui->textBrowser->setText(body);
+    update();
 }
 
 BlockedModsDialog::~BlockedModsDialog() {
@@ -22,7 +27,36 @@ BlockedModsDialog::~BlockedModsDialog() {
 }
 
 void BlockedModsDialog::openAll() {
-    for(auto &url : urls) {
-        QDesktopServices::openUrl(url);
+    for(auto &mod : mods) {
+        QDesktopServices::openUrl(mod.websiteUrl);
     }
 }
+
+void BlockedModsDialog::update() {
+    QString text;
+    QString span;
+
+    for (auto &mod : mods) {
+        if (mod.matched) {
+            // &#x2714; -> html for HEAVY CHECK MARK : ✔
+            span = QString("<span style=\"color:green\"> &#x2714; Found at %1 </span>").arg(mod.localPath);
+        } else {
+            // &#x2718; -> html for HEAVY BALLOT X : ✘
+            span = QString("<span style=\"color:red\"> &#x2718; Not Found </span>");
+        }
+        text += QString("%1: <a href='%2'>%2</a> <p>Hash: %3 %4</p> <br/>").arg(mod.name, mod.websiteUrl, mod.hash, span);
+    }
+
+    ui->textBrowser->setText(text);
+}
+
+
+QDebug operator<<(QDebug debug, const BlockedMod &m) {
+    QDebugStateSaver saver(debug);
+
+    debug.nospace() << "{ name: " << m.name << ", websiteUrl: " << m.websiteUrl
+        << ", hash: " << m.hash << ", matched: " << m.matched
+        << ", localPath: " << m.localPath <<"}";
+
+    return debug;
+}
\ No newline at end of file
diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h
index 5f5bd61b..4be020ec 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.h
+++ b/launcher/ui/dialogs/BlockedModsDialog.h
@@ -3,6 +3,15 @@
 #include <QDialog>
 
 
+struct BlockedMod {
+    QString name;
+    QString websiteUrl;
+    QString hash;
+    bool matched;
+    QString localPath;
+
+};
+
 QT_BEGIN_NAMESPACE
 namespace Ui { class BlockedModsDialog; }
 QT_END_NAMESPACE
@@ -11,12 +20,15 @@ class BlockedModsDialog : public QDialog {
 Q_OBJECT
 
 public:
-    BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, const QString &body, const QList<QUrl> &urls);
+    BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, const QList<BlockedMod> &mods);
 
     ~BlockedModsDialog() override;
 
+
 private:
     Ui::BlockedModsDialog *ui;
-    const QList<QUrl> &urls;
+    const QList<BlockedMod> &mods;
     void openAll();
+    void update();
 };
+
-- 
cgit 


From 1598d6582473f1bb6aa02fd9b4dabc8210771e56 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 25 Oct 2022 01:19:19 -0700
Subject: watch filesystem, compute and match hashes

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/ui/dialogs/BlockedModsDialog.cpp | 120 +++++++++++++++++++++++++++++-
 launcher/ui/dialogs/BlockedModsDialog.h   |  23 +++++-
 2 files changed, 139 insertions(+), 4 deletions(-)

(limited to 'launcher/ui')

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();
 };
 
-- 
cgit 


From 13c7efa0584caf34950a6e6efa4b8e3bee16d764 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:59:37 -0700
Subject: copy found mods to instance (FTB and Flame)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/ui/dialogs/BlockedModsDialog.cpp |  7 ++++++
 launcher/ui/dialogs/BlockedModsDialog.h   |  1 +
 launcher/ui/dialogs/BlockedModsDialog.ui  | 37 ++++++++++++++++++++-----------
 3 files changed, 32 insertions(+), 13 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 9ba033d7..542d0681 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -31,6 +31,7 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
 
     this->setWindowTitle(title);
     ui->label->setText(text);
+    ui->labelModsFound->setText("Please download the missing mods.");
     update();
 }
 
@@ -60,6 +61,12 @@ void BlockedModsDialog::update() {
     }
 
     ui->textBrowser->setText(text);
+
+    if (allModsMatched()) {
+        ui->labelModsFound->setText("All mods found ✔");
+    } else {
+        ui->labelModsFound->setText("Please download the missing mods.");
+    }
 }
 
 void BlockedModsDialog::directoryChanged(QString path) {
diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h
index f1ea99ca..93b9f46a 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.h
+++ b/launcher/ui/dialogs/BlockedModsDialog.h
@@ -51,3 +51,4 @@ private:
     bool allModsMatched();
 };
 
+QDebug operator<<(QDebug debug, const BlockedMod &m);
\ No newline at end of file
diff --git a/launcher/ui/dialogs/BlockedModsDialog.ui b/launcher/ui/dialogs/BlockedModsDialog.ui
index f4ae95b6..371549cf 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.ui
+++ b/launcher/ui/dialogs/BlockedModsDialog.ui
@@ -13,8 +13,8 @@
   <property name="windowTitle">
    <string notr="true">BlockedModsDialog</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <widget class="QLabel" name="label">
      <property name="text">
       <string notr="true"/>
@@ -24,17 +24,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
+   <item>
     <widget class="QTextBrowser" name="textBrowser">
      <property name="acceptRichText">
       <bool>true</bool>
@@ -44,6 +34,27 @@
      </property>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="bottomBoxH">
+     <item>
+      <widget class="QLabel" name="labelModsFound">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>
-- 
cgit 


From e9d4793b1e98944dad910b3952c117bb2d3369de Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 25 Oct 2022 20:18:14 -0700
Subject: minor clean up and add some docs

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/ui/dialogs/BlockedModsDialog.cpp | 42 ++++++++++++++++++-------------
 launcher/ui/dialogs/BlockedModsDialog.h   |  5 ++--
 2 files changed, 27 insertions(+), 20 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 542d0681..f5bc7f73 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -1,5 +1,3 @@
-#include <qfileinfo.h>
-#include <qnamespace.h>
 #include "Application.h"
 #include "BlockedModsDialog.h"
 #include "ui_BlockedModsDialog.h"
@@ -27,7 +25,7 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
     qDebug() << "Mods List: " << mods;
 
     setupWatch();
-    scanPaths(true);
+    scanPaths();
 
     this->setWindowTitle(title);
     ui->label->setText(text);
@@ -45,6 +43,7 @@ void BlockedModsDialog::openAll() {
     }
 }
 
+/// @brief update UI with current status of the blocked mod detection
 void BlockedModsDialog::update() {
     QString text;
     QString span;
@@ -69,12 +68,15 @@ void BlockedModsDialog::update() {
     }
 }
 
+/// @brief Signal fired when a watched direcotry has changed
+/// @param path the path to the changed directory
 void BlockedModsDialog::directoryChanged(QString path) {
     qDebug() << "Directory changed: " << path;
-    scanPath(path, false);
+    scanPath(path);
 }
 
 
+/// @brief add the user downloads folder and the global mods folder to the filesystem watcher
 void BlockedModsDialog::setupWatch() {
     const QString downloadsFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
     const QString modsFolder = APPLICATION->settings()->get("CentralModsDir").toString();
@@ -82,23 +84,24 @@ void BlockedModsDialog::setupWatch() {
     watcher.addPath(modsFolder);
 }
 
-void BlockedModsDialog::scanPaths(bool init) {
+
+/// @brief scan all watched folder
+void BlockedModsDialog::scanPaths() {
     for (auto &dir : watcher.directories()) {
-        scanPath(dir, init);
+        scanPath(dir);
     }
 }
 
-void BlockedModsDialog::scanPath(QString path, bool init) {
+/// @brief Scan the directory at path, skip paths that do not contain a file name 
+///        of a blocked mod we are looking for
+/// @param path the directory to scan
+void BlockedModsDialog::scanPath(QString path) {
 
     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;
         }
@@ -113,10 +116,6 @@ void BlockedModsDialog::scanPath(QString path, bool init) {
         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);
     }
@@ -125,6 +124,10 @@ void BlockedModsDialog::scanPath(QString path, bool init) {
 
 }
 
+/// @brief check if the conputed hash for the provided path matches a blocked
+///        mod we are looking for
+/// @param hash the computed hash for the provided path
+/// @param path the path to the local file being compared
 void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
     bool match = false;
 
@@ -150,6 +153,9 @@ void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
     }
 }
 
+/// @brief Check if the name of the file at path matches the naem of a blocked mod we are searching for
+/// @param path the path to check
+/// @return boolean: did the path match the name of a blocked mod?
 bool BlockedModsDialog::checkValidPath(QString path) {
 
     QFileInfo file = QFileInfo(path);
@@ -165,6 +171,8 @@ bool BlockedModsDialog::checkValidPath(QString path) {
     return false;
 }
 
+/// @brief have we found all the mods we're lookign for?
+/// @return boolean
 bool BlockedModsDialog::allModsMatched() {
     for (auto &mod : mods) {
         if (!mod.matched)
@@ -173,7 +181,7 @@ bool BlockedModsDialog::allModsMatched() {
     return true;
 }
 
-
+/// qDebug print support for the BlockedMod struct
 QDebug operator<<(QDebug debug, const BlockedMod &m) {
     QDebugStateSaver saver(debug);
 
@@ -182,4 +190,4 @@ QDebug operator<<(QDebug debug, const BlockedMod &m) {
         << ", localPath: " << m.localPath <<"}";
 
     return debug;
-}
\ No newline at end of file
+}
diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h
index 93b9f46a..cf1d3b3d 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.h
+++ b/launcher/ui/dialogs/BlockedModsDialog.h
@@ -37,14 +37,13 @@ private:
     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 scanPaths();
+    void scanPath(QString path);
     void checkMatchHash(QString hash, QString path);
 
     bool checkValidPath(QString path);
-- 
cgit 


From d2f3dbaa2984b70a71e5fb1b246a31987a6fdf10 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 30 Oct 2022 22:39:12 -0700
Subject: fix mispellings and wrap strings for translation

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/ui/dialogs/BlockedModsDialog.cpp | 18 ++++++++----------
 launcher/ui/dialogs/BlockedModsDialog.h   |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index f5bc7f73..136a7371 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -29,7 +29,7 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
 
     this->setWindowTitle(title);
     ui->label->setText(text);
-    ui->labelModsFound->setText("Please download the missing mods.");
+    ui->labelModsFound->setText(tr("Please download the missing mods."));
     update();
 }
 
@@ -51,20 +51,20 @@ void BlockedModsDialog::update() {
     for (auto &mod : mods) {
         if (mod.matched) {
             // &#x2714; -> html for HEAVY CHECK MARK : ✔
-            span = QString("<span style=\"color:green\"> &#x2714; Found at %1 </span>").arg(mod.localPath);
+            span = QString(tr("<span style=\"color:green\"> &#x2714; Found at %1 </span>")).arg(mod.localPath);
         } else {
             // &#x2718; -> html for HEAVY BALLOT X : ✘
-            span = QString("<span style=\"color:red\"> &#x2718; Not Found </span>");
+            span = QString(tr("<span style=\"color:red\"> &#x2718; Not Found </span>"));
         }
-        text += QString("%1: <a href='%2'>%2</a> <p>Hash: %3 %4</p> <br/>").arg(mod.name, mod.websiteUrl, mod.hash, span);
+        text += QString(tr("%1: <a href='%2'>%2</a> <p>Hash: %3 %4</p> <br/>")).arg(mod.name, mod.websiteUrl, mod.hash, span);
     }
 
     ui->textBrowser->setText(text);
 
     if (allModsMatched()) {
-        ui->labelModsFound->setText("All mods found ✔");
+        ui->labelModsFound->setText(tr("All mods found ✔"));
     } else {
-        ui->labelModsFound->setText("Please download the missing mods.");
+        ui->labelModsFound->setText(tr("Please download the missing mods."));
     }
 }
 
@@ -124,7 +124,7 @@ void BlockedModsDialog::scanPath(QString path) {
 
 }
 
-/// @brief check if the conputed hash for the provided path matches a blocked
+/// @brief check if the computed hash for the provided path matches a blocked
 ///        mod we are looking for
 /// @param hash the computed hash for the provided path
 /// @param path the path to the local file being compared
@@ -153,7 +153,7 @@ void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
     }
 }
 
-/// @brief Check if the name of the file at path matches the naem of a blocked mod we are searching for
+/// @brief Check if the name of the file at path matches the name of a blocked mod we are searching for
 /// @param path the path to check
 /// @return boolean: did the path match the name of a blocked mod?
 bool BlockedModsDialog::checkValidPath(QString path) {
@@ -171,8 +171,6 @@ bool BlockedModsDialog::checkValidPath(QString path) {
     return false;
 }
 
-/// @brief have we found all the mods we're lookign for?
-/// @return boolean
 bool BlockedModsDialog::allModsMatched() {
     for (auto &mod : mods) {
         if (!mod.matched)
diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h
index cf1d3b3d..0a5c90db 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.h
+++ b/launcher/ui/dialogs/BlockedModsDialog.h
@@ -50,4 +50,4 @@ private:
     bool allModsMatched();
 };
 
-QDebug operator<<(QDebug debug, const BlockedMod &m);
\ No newline at end of file
+QDebug operator<<(QDebug debug, const BlockedMod &m);
-- 
cgit 


From 209a1650e489e21417ce2e1a29862703d51a2cd0 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 1 Nov 2022 07:06:36 -0700
Subject: clang_format and code cleanup

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/ui/dialogs/BlockedModsDialog.cpp | 95 +++++++++++++++----------------
 1 file changed, 45 insertions(+), 50 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 136a7371..2cf94250 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -1,18 +1,16 @@
-#include "Application.h"
 #include "BlockedModsDialog.h"
-#include "ui_BlockedModsDialog.h"
-#include <QPushButton>
-#include <QDialogButtonBox>
 #include <QDesktopServices>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include "Application.h"
+#include "ui_BlockedModsDialog.h"
 
 #include <QDebug>
 #include <QStandardPaths>
 
-
-
-
-BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, QList<BlockedMod> &mods) :
-        QDialog(parent), ui(new Ui::BlockedModsDialog), mods(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);
@@ -21,7 +19,7 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
     connect(&watcher, &QFileSystemWatcher::directoryChanged, this, &BlockedModsDialog::directoryChanged);
 
     hashing_task = shared_qobject_ptr<ConcurrentTask>(new ConcurrentTask(this, "MakeHashesTask", 10));
-    
+
     qDebug() << "Mods List: " << mods;
 
     setupWatch();
@@ -33,22 +31,25 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
     update();
 }
 
-BlockedModsDialog::~BlockedModsDialog() {
+BlockedModsDialog::~BlockedModsDialog()
+{
     delete ui;
 }
 
-void BlockedModsDialog::openAll() {
-    for(auto &mod : mods) {
+void BlockedModsDialog::openAll()
+{
+    for (auto& mod : mods) {
         QDesktopServices::openUrl(mod.websiteUrl);
     }
 }
 
 /// @brief update UI with current status of the blocked mod detection
-void BlockedModsDialog::update() {
+void BlockedModsDialog::update()
+{
     QString text;
     QString span;
 
-    for (auto &mod : mods) {
+    for (auto& mod : mods) {
         if (mod.matched) {
             // &#x2714; -> html for HEAVY CHECK MARK : ✔
             span = QString(tr("<span style=\"color:green\"> &#x2714; Found at %1 </span>")).arg(mod.localPath);
@@ -70,33 +71,34 @@ void BlockedModsDialog::update() {
 
 /// @brief Signal fired when a watched direcotry has changed
 /// @param path the path to the changed directory
-void BlockedModsDialog::directoryChanged(QString path) {
+void BlockedModsDialog::directoryChanged(QString path)
+{
     qDebug() << "Directory changed: " << path;
     scanPath(path);
 }
 
-
 /// @brief add the user downloads folder and the global mods folder to the filesystem watcher
-void BlockedModsDialog::setupWatch() {
+void BlockedModsDialog::setupWatch()
+{
     const QString downloadsFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
     const QString modsFolder = APPLICATION->settings()->get("CentralModsDir").toString();
     watcher.addPath(downloadsFolder);
     watcher.addPath(modsFolder);
 }
 
-
 /// @brief scan all watched folder
-void BlockedModsDialog::scanPaths() {
-    for (auto &dir : watcher.directories()) {
+void BlockedModsDialog::scanPaths()
+{
+    for (auto& dir : watcher.directories()) {
         scanPath(dir);
     }
 }
 
-/// @brief Scan the directory at path, skip paths that do not contain a file name 
+/// @brief Scan the directory at path, skip paths that do not contain a file name
 ///        of a blocked mod we are looking for
 /// @param path the directory to scan
-void BlockedModsDialog::scanPath(QString path) {
-
+void BlockedModsDialog::scanPath(QString path)
+{
     QDir scan_dir(path);
     QDirIterator scan_it(path, QDir::Filter::Files | QDir::Filter::Hidden, QDirIterator::NoIteratorFlags);
     while (scan_it.hasNext()) {
@@ -110,30 +112,26 @@ void BlockedModsDialog::scanPath(QString path) {
 
         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;
-        });
-        
+        connect(hash_task.get(), &Task::succeeded, [this, hash_task, file] { checkMatchHash(hash_task->getResult(), file); });
+        connect(hash_task.get(), &Task::failed, [file] { qDebug() << "Failed to hash path: " << file; });
+
         hashing_task->addTask(hash_task);
     }
 
     hashing_task->start();
-
 }
 
 /// @brief check if the computed hash for the provided path matches a blocked
 ///        mod we are looking for
 /// @param hash the computed hash for the provided path
 /// @param path the path to the local file being compared
-void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
+void BlockedModsDialog::checkMatchHash(QString hash, QString path)
+{
     bool match = false;
 
-    qDebug() << "Checking for match on hash: " << hash << " | From path:" << path;
+    qDebug() << "Checking for match on hash: " << hash << "| From path:" << path;
 
-    for (auto &mod : mods) {
+    for (auto& mod : mods) {
         if (mod.matched) {
             continue;
         }
@@ -142,7 +140,7 @@ void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
             mod.localPath = path;
             match = true;
 
-            qDebug() << "Hash match found: " << mod.name << " " << hash << " | From path:" << path;
+            qDebug() << "Hash match found:" << mod.name << hash << "| From path:" << path;
 
             break;
         }
@@ -156,14 +154,14 @@ void BlockedModsDialog::checkMatchHash(QString hash, QString path) {
 /// @brief Check if the name of the file at path matches the name of a blocked mod we are searching for
 /// @param path the path to check
 /// @return boolean: did the path match the name of a blocked mod?
-bool BlockedModsDialog::checkValidPath(QString path) {
-
+bool BlockedModsDialog::checkValidPath(QString path)
+{
     QFileInfo file = QFileInfo(path);
     QString filename = file.fileName();
 
-    for (auto &mod : mods) {
+    for (auto& mod : mods) {
         if (mod.name.compare(filename, Qt::CaseInsensitive) == 0) {
-            qDebug() << "Name match found: " << mod.name << " | From path:" << path;
+            qDebug() << "Name match found:" << mod.name << "| From path:" << path;
             return true;
         }
     }
@@ -171,21 +169,18 @@ bool BlockedModsDialog::checkValidPath(QString path) {
     return false;
 }
 
-bool BlockedModsDialog::allModsMatched() {
-    for (auto &mod : mods) {
-        if (!mod.matched)
-            return false;
-    }
-    return true;
+bool BlockedModsDialog::allModsMatched()
+{
+    return std::all_of(mods.begin(), mods.end(), [](auto const& mod) { return mod.matched; });
 }
 
 /// qDebug print support for the BlockedMod struct
-QDebug operator<<(QDebug debug, const BlockedMod &m) {
+QDebug operator<<(QDebug debug, const BlockedMod& m)
+{
     QDebugStateSaver saver(debug);
 
-    debug.nospace() << "{ name: " << m.name << ", websiteUrl: " << m.websiteUrl
-        << ", hash: " << m.hash << ", matched: " << m.matched
-        << ", localPath: " << m.localPath <<"}";
+    debug.nospace() << "{ name: " << m.name << ", websiteUrl: " << m.websiteUrl << ", hash: " << m.hash << ", matched: " << m.matched
+                    << ", localPath: " << m.localPath << "}";
 
     return debug;
 }
-- 
cgit