Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

uniform ignoreFilesWithPath

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2025-01-15 21:59:31 +02:00
parent a6f5858dac
commit 82e59658d5
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/ui/dialogs/ExportInstanceDialog.cpp
View File

@ -69,10 +69,10 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent
m_proxyModel = new FileIgnoreProxy(root, this); m_proxyModel = new FileIgnoreProxy(root, this);
m_proxyModel->setSourceModel(model); m_proxyModel->setSourceModel(model);
auto prefix = QDir(instance->instanceRoot()).relativeFilePath(instance->gameRoot()); 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->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(); loadPackIgnore();
m_ui->treeView->setModel(m_proxyModel); m_ui->treeView->setModel(m_proxyModel);

7
launcher/ui/dialogs/ExportPackDialog.cpp
View File

@ -73,7 +73,10 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
// use the game root - everything outside cannot be exported // use the game root - everything outside cannot be exported
const QDir instanceRoot(instance->instanceRoot()); const QDir instanceRoot(instance->instanceRoot());
m_proxy = new FileIgnoreProxy(instance->instanceRoot(), this); 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->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
m_proxy->setSourceModel(model); m_proxy->setSourceModel(model);
loadPackIgnore(); loadPackIgnore();
@ -84,7 +87,7 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
for (const QString& file : gameRoot.entryList(filter)) { for (const QString& file : gameRoot.entryList(filter)) {
if (!(file == "mods" || file == "coremods" || file == "datapacks" || file == "config" || file == "options.txt" || if (!(file == "mods" || file == "coremods" || file == "datapacks" || file == "config" || file == "options.txt" ||
file == "servers.dat")) file == "servers.dat"))
m_proxy->blockedPaths().insert(instanceRoot.relativeFilePath(gameRoot.absoluteFilePath(file))); m_proxy->blockedPaths().insert(FS::PathCombine(prefix, file));
} }
} }