aboutsummaryrefslogtreecommitdiff
path: root/launcher/FileSystem.cpp
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2023-04-03 17:14:06 -0700
committerRachel Powers <508861+Ryex@users.noreply.github.com>2023-04-03 17:14:06 -0700
commit5b50b806ec5954aa3822443969d22ea79faa07c5 (patch)
treea66ade07315680fbd2d433e0a71fca1099f5b0a7 /launcher/FileSystem.cpp
parent538092b72728fa34bafc873e16abaa7f318a945c (diff)
downloadPrismLauncher-5b50b806ec5954aa3822443969d22ea79faa07c5.tar.gz
PrismLauncher-5b50b806ec5954aa3822443969d22ea79faa07c5.tar.bz2
PrismLauncher-5b50b806ec5954aa3822443969d22ea79faa07c5.zip
refactor: remove data duplication in statis FS Names
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/FileSystem.cpp')
-rw-r--r--launcher/FileSystem.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index c046ee86..869fbe36 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -955,29 +955,29 @@ QString getFilesystemTypeName(FilesystemType type)
{
auto iter = s_filesystem_type_names.constFind(type);
if (iter != s_filesystem_type_names.constEnd()) {
- return iter.value();
+ return iter.value().constFirst();
}
return getFilesystemTypeName(FilesystemType::UNKNOWN);
}
FilesystemType getFilesystemTypeFuzzy(const QString& name)
{
- auto iter = s_filesystem_type_names_inverse.constFind(name.toUpper());
- if (iter != s_filesystem_type_names_inverse.constEnd()) {
- return iter.value();
+ for (auto iter = s_filesystem_type_names.constBegin(); iter != s_filesystem_type_names.constEnd(); ++iter) {
+ auto fs_names = iter.value();
+ for (auto fs_name : fs_names) {
+ if (name.toUpper().contains(fs_name.toUpper()))
+ return iter.key();
+ }
}
return FilesystemType::UNKNOWN;
}
FilesystemType getFilesystemType(const QString& name)
{
- for (auto fs_type_pair : s_filesystem_type_names_inverse.toStdMap()) {
- auto fs_type_name = fs_type_pair.first;
- auto fs_type = fs_type_pair.second;
-
- if (name.toUpper().contains(fs_type_name.toUpper())) {
- return fs_type;
- }
+ for (auto iter = s_filesystem_type_names.constBegin(); iter != s_filesystem_type_names.constEnd(); ++iter) {
+ auto fs_names = iter.value();
+ if(fs_names.contains(name.toUpper()))
+ return iter.key();
}
return FilesystemType::UNKNOWN;
}