Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

launcher/ui/dialogs/ExportInstanceDialog.cpp

@@ -35,24 +35,26 @@
  */
 
 #include "ExportInstanceDialog.h"
-#include "ui_ExportInstanceDialog.h"
 #include <BaseInstance.h>
 #include <MMCZip.h>
 #include <QFileDialog>
-#include <QMessageBox>
 #include <QFileSystemModel>
+#include <QMessageBox>
+#include "FileIgnoreProxy.h"
+#include "ui_ExportInstanceDialog.h"
 
-#include <QSortFilterProxyModel>
-#include <QDebug>
-#include <QSaveFile>
-#include <QStack>
-#include <QFileInfo>
-#include "SeparatorPrefixTree.h"
-#include "Application.h"
-#include <icons/IconList.h>
 #include <FileSystem.h>
+#include <icons/IconList.h>
+#include <QDebug>
+#include <QFileInfo>
+#include <QSaveFile>
+#include <QSortFilterProxyModel>
+#include <QStack>
+#include <functional>
+#include "Application.h"
+#include "SeparatorPrefixTree.h"
 
-ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget *parent)
+ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent)
     : QDialog(parent), ui(new Ui::ExportInstanceDialog), m_instance(instance)
 {
     ui->setupUi(this);
@@ -60,8 +62,12 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget *parent
     model->setIconProvider(&icons);
     auto root = instance->instanceRoot();
     proxyModel = new FileIgnoreProxy(root, this);
-    loadPackIgnore();
     proxyModel->setSourceModel(model);
+    auto prefix = QDir(instance->instanceRoot()).relativeFilePath(instance->gameRoot());
+    proxyModel->ignoreFilesWithPath().insert({ FS::PathCombine(prefix, "logs"), FS::PathCombine(prefix, "crash-reports") });
+    proxyModel->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
+    loadPackIgnore();
+
     ui->treeView->setModel(proxyModel);
     ui->treeView->setRootIndex(proxyModel->mapFromSource(model->index(root)));
     ui->treeView->sortByColumn(0, Qt::AscendingOrder);
@@ -133,11 +139,9 @@ bool ExportInstanceDialog::doExport()
 
     SaveIcon(m_instance);
 
-    auto & blocked = proxyModel->blockedPaths();
-    using std::placeholders::_1;
     auto files = QFileInfoList();
     if (!MMCZip::collectFileListRecursively(m_instance->instanceRoot(), nullptr, &files,
-                                    std::bind(&SeparatorPrefixTree<'/'>::covers, blocked, _1))) {
+                                            std::bind(&FileIgnoreProxy::filterFile, proxyModel, std::placeholders::_1))) {
         QMessageBox::warning(this, tr("Error"), tr("Unable to export instance"));
         return false;
     }

launcher/ui/dialogs/ExportPackDialog.cpp

@@ -60,8 +60,9 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
     // use the game root - everything outside cannot be exported
     const QDir root(instance->gameRoot());
     proxy = new FileIgnoreProxy(instance->gameRoot(), this);
+    proxy->ignoreFilesWithPath().insert({ "logs", "crash-reports" });
+    proxy->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
     proxy->setSourceModel(model);
-    proxy->setFilterRegularExpression("^(?!(\\.DS_Store)|([tT]humbs\\.db)).+$");
 
     const QDir::Filters filter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);
 
@@ -114,10 +115,10 @@ void ExportPackDialog::done(int result)
         Task* task;
         if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
             task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
-                                              [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+                                              std::bind(&FileIgnoreProxy::filterFile, proxy, std::placeholders::_1));
         else
             task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
-                                           [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+                                           std::bind(&FileIgnoreProxy::filterFile, proxy, std::placeholders::_1));
 
         connect(task, &Task::failed,
                 [this](const QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });

launcher/ui/dialogs/NewInstanceDialog.cpp

@@ -54,7 +54,7 @@
 #include <utility>
 
 #include "ui/widgets/PageContainer.h"
-#include "ui/pages/modplatform/VanillaPage.h"
+#include "ui/pages/modplatform/CustomPage.h"
 #include "ui/pages/modplatform/atlauncher/AtlPage.h"
 #include "ui/pages/modplatform/legacy_ftb/Page.h"
 #include "ui/pages/modplatform/flame/FlamePage.h"
@@ -162,7 +162,7 @@ QList<BasePage *> NewInstanceDialog::getPages()
 
     importPage = new ImportPage(this);
 
-    pages.append(new VanillaPage(this));
+    pages.append(new CustomPage(this));
     pages.append(importPage);
     pages.append(new AtlPage(this));
     if (APPLICATION->capabilities() & Application::SupportsFlame)