send blocked mod info to dialog & prototype UI

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

4 files changed, 78 insertions, 20 deletions

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 48ac02e0..15e660a9 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -372,13 +372,20 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
     auto results = m_mod_id_resolver->getResults();
 
     // first check for blocked mods
-    QString text;
-    QList<QUrl> urls;
+    QList<BlockedMod> blocked_mods;
     auto anyBlocked = false;
     for (const auto& result : results.files.values()) {
         if (!result.resolved || result.url.isEmpty()) {
-            text += QString("%1: <a href='%2'>%2</a><br/>").arg(result.fileName, result.websiteUrl);
-            urls.append(QUrl(result.websiteUrl));
+
+            BlockedMod blocked_mod;
+            blocked_mod.name = result.fileName;
+            blocked_mod.websiteUrl = result.websiteUrl;
+            blocked_mod.hash = result.hash;
+            blocked_mod.matched = false;
+            blocked_mod.localPath = "";
+
+            blocked_mods.append(blocked_mod);
+
             anyBlocked = true;
         }
     }
@@ -388,8 +395,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
         auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked mods found"),
                                                    tr("The following mods were blocked on third party launchers.<br/>"
                                                       "You will need to manually download them and add them to the modpack"),
-                                                   text,
-                                                   urls);
+                                                   blocked_mods);
         message_dialog->setModal(true);
 
         if (message_dialog->exec()) {
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index 7b112d8f..75fda208 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -176,8 +176,7 @@ void PackInstallTask::resolveMods()
 
 void PackInstallTask::onResolveModsSucceeded()
 {
-    QString text;
-    QList<QUrl> urls;
+    QList<BlockedMod> blocked_mods;
     auto anyBlocked = false;
 
     Flame::Manifest results = m_mod_id_resolver_task->getResults();
@@ -191,11 +190,19 @@ void PackInstallTask::onResolveModsSucceeded()
 
         // First check for blocked mods
         if (!results_file.resolved || results_file.url.isEmpty()) {
-            QString type(local_file.type);
+            // QString type(local_file.type);
+
+            // type[0] = type[0].toUpper();
+
+            BlockedMod blocked_mod;
+            blocked_mod.name = local_file.name;
+            blocked_mod.websiteUrl = results_file.websiteUrl;
+            blocked_mod.hash = results_file.hash;
+            blocked_mod.matched = false;
+            blocked_mod.localPath = "";
+
+            blocked_mods.append(blocked_mod);
 
-            type[0] = type[0].toUpper();
-            text += QString("%1: %2 - <a href='%3'>%3</a><br/>").arg(type, local_file.name, results_file.websiteUrl);
-            urls.append(QUrl(results_file.websiteUrl));
             anyBlocked = true;
         } else {
             local_file.url = results_file.url.toString();
@@ -210,8 +217,7 @@ void PackInstallTask::onResolveModsSucceeded()
         auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked files found"),
                                                    tr("The following files are not available for download in third party launchers.<br/>"
                                                       "You will need to manually download them and add them to the instance."),
-                                                   text,
-                                                   urls);
+                                                   blocked_mods);
 
         if (message_dialog->exec() == QDialog::Accepted)
             createInstance();
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();
 };
+