From 82e59658d5a91cff278b7d2a56e2a10535ac9112 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 15 Jan 2025 21:59:31 +0200 Subject: [PATCH] uniform ignoreFilesWithPath Signed-off-by: Trial97 --- launcher/ui/dialogs/ExportInstanceDialog.cpp | 6 +++--- launcher/ui/dialogs/ExportPackDialog.cpp | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp index 2e5880540..1acecc6df 100644 --- a/launcher/ui/dialogs/ExportInstanceDialog.cpp +++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp @@ -69,10 +69,10 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent m_proxyModel = new FileIgnoreProxy(root, this); m_proxyModel->setSourceModel(model); auto prefix = QDir(instance->instanceRoot()).relativeFilePath(instance->gameRoot()); - m_proxyModel->ignoreFilesWithPath().insert({ FS::PathCombine(prefix, "logs"), FS::PathCombine(prefix, "crash-reports") }); + for (auto path : { "logs", "crash-reports", ".cache", ".fabric", ".quilt" }) { + m_proxyModel->ignoreFilesWithPath().insert(FS::PathCombine(prefix, path)); + } m_proxyModel->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" }); - m_proxyModel->ignoreFilesWithPath().insert( - { FS::PathCombine(prefix, ".cache"), FS::PathCombine(prefix, ".fabric"), FS::PathCombine(prefix, ".quilt") }); loadPackIgnore(); m_ui->treeView->setModel(m_proxyModel); diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp index c4f102515..ae7f8c4e8 100644 --- a/launcher/ui/dialogs/ExportPackDialog.cpp +++ b/launcher/ui/dialogs/ExportPackDialog.cpp @@ -73,7 +73,10 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla // use the game root - everything outside cannot be exported const QDir instanceRoot(instance->instanceRoot()); m_proxy = new FileIgnoreProxy(instance->instanceRoot(), this); - m_proxy->ignoreFilesWithPath().insert({ "logs", "crash-reports", ".cache", ".fabric", ".quilt" }); + auto prefix = QDir(instance->instanceRoot()).relativeFilePath(instance->gameRoot()); + for (auto path : { "logs", "crash-reports", ".cache", ".fabric", ".quilt" }) { + m_proxy->ignoreFilesWithPath().insert(FS::PathCombine(prefix, path)); + } m_proxy->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" }); m_proxy->setSourceModel(model); loadPackIgnore(); @@ -84,7 +87,7 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla for (const QString& file : gameRoot.entryList(filter)) { if (!(file == "mods" || file == "coremods" || file == "datapacks" || file == "config" || file == "options.txt" || file == "servers.dat")) - m_proxy->blockedPaths().insert(instanceRoot.relativeFilePath(gameRoot.absoluteFilePath(file))); + m_proxy->blockedPaths().insert(FS::PathCombine(prefix, file)); } }