mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Abstract away InstanceCopyPrefs' internals through new getSelectedFiltersAsRegex() function

Browse source 
+ fix typo in comment
+ remove unused import
+ add [[nodiscard]] to methods

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
This commit is contained in:
Marcelo Hernandez 2022-10-26 00:20:36 -04:00
parent 385c452ddf
commit 63b6c6685c
No known key found for this signature in database
GPG key ID: 1405A0E7C9C4D61D
5 changed files with 45 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

60
launcher/InstanceCopyTask.cpp
View file

@ -9,62 +9,16 @@ InstanceCopyTask::InstanceCopyTask(InstancePtr origInstance, const InstanceCopyP
{
m_origInstance = origInstance;
m_keepPlaytime = prefs.keepPlaytime;
QString filter;
if(!prefs.copySaves)
QString filters = prefs.getSelectedFiltersAsRegex();
if (!filters.isEmpty())
{
appendToFilter(filter, "saves");
// Set regex filter:
// FIXME: get this from the original instance type...
auto matcherReal = new RegexpMatcher(filters);
matcherReal->caseSensitive(false);
m_matcher.reset(matcherReal);
}
if(!prefs.copyGameOptions) {
appendToFilter(filter, "options.txt");
}
if(!prefs.copyResourcePacks)
{
appendToFilter(filter, "resourcepacks");
appendToFilter(filter, "texturepacks");
}
if(!prefs.copyShaderPacks)
{
appendToFilter(filter, "shaderpacks");
}
if(!prefs.copyServers)
{
appendToFilter(filter, "servers.dat");
appendToFilter(filter, "servers.dat_old");
appendToFilter(filter, "server-resource-packs");
}
if(!prefs.copyMods)
{
appendToFilter(filter, "coremods");
appendToFilter(filter, "mods");
appendToFilter(filter, "config");
}
if (!filter.isEmpty())
{
resetFromMatcher(filter);
}
}
void InstanceCopyTask::appendToFilter(QString& filter, const QString& append)
{
if (!filter.isEmpty())
filter.append('|'); // OR regex
filter.append("[.]?minecraft/" + append);
}
void InstanceCopyTask::resetFromMatcher(const QString& regexp)
{
// FIXME: get this from the original instance type...
auto matcherReal = new RegexpMatcher(regexp);
matcherReal->caseSensitive(false);
m_matcher.reset(matcherReal);
}
void InstanceCopyTask::executeTask()