From 978b4b234b6ca60224e62c461d76ccc0c32009c4 Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Mon, 4 Sep 2023 19:40:09 -0500 Subject: Parse secondary data directories into the directory structure --- src/directoryrefresher.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/directoryrefresher.cpp') diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp index 90bfad3b..e6d5524f 100644 --- a/src/directoryrefresher.cpp +++ b/src/directoryrefresher.cpp @@ -489,6 +489,11 @@ void DirectoryRefresher::refresh() m_Root->addFromOrigin(L"data", dataDirectory, 0, dummy); } + for (auto directory : game->secondaryDataDirectories().toStdMap()) { + DirectoryStats dummy; + m_Root->addFromOrigin(directory.first.toStdWString(), QDir::toNativeSeparators(directory.second.absolutePath()).toStdWString(), 0, dummy); + } + std::sort(m_Mods.begin(), m_Mods.end(), [](auto lhs, auto rhs) { return lhs.priority < rhs.priority; }); -- cgit v1.3.1 From d586bb23e95e0cf2b1e130f9c027c48636c1e3c4 Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Sat, 9 Sep 2023 05:13:48 -0500 Subject: Code cleanup --- src/directoryrefresher.cpp | 5 ++++- src/organizercore.cpp | 13 +++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/directoryrefresher.cpp') diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp index 63ac28d7..6abbd0c4 100644 --- a/src/directoryrefresher.cpp +++ b/src/directoryrefresher.cpp @@ -475,7 +475,10 @@ void DirectoryRefresher::refresh() for (auto directory : game->secondaryDataDirectories().toStdMap()) { DirectoryStats dummy; - m_Root->addFromOrigin(directory.first.toStdWString(), QDir::toNativeSeparators(directory.second.absolutePath()).toStdWString(), 0, dummy); + m_Root->addFromOrigin( + directory.first.toStdWString(), + QDir::toNativeSeparators(directory.second.absolutePath()).toStdWString(), 0, + dummy); } std::sort(m_Mods.begin(), m_Mods.end(), [](auto lhs, auto rhs) { diff --git a/src/organizercore.cpp b/src/organizercore.cpp index b92c6c6f..e3d1ff29 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -2015,8 +2015,8 @@ std::vector OrganizerCore::fileMapping(const QString& profileName, if (modPtr->isRegular()) { for (auto dataPath : dataPaths) { - result.insert(result.end(), { QDir::toNativeSeparators(std::get<1>(mod)), - dataPath, true, createTarget }); + result.insert(result.end(), {QDir::toNativeSeparators(std::get<1>(mod)), + dataPath, true, createTarget}); } } } @@ -2039,12 +2039,9 @@ std::vector OrganizerCore::fileMapping(const QString& profileName, } for (auto dataPath : dataPaths) { - result.insert(result.end(), { - QDir::toNativeSeparators(m_Settings.paths().overwrite()), - dataPath, - true, - customOverwrite.isEmpty() - }); + result.insert(result.end(), + {QDir::toNativeSeparators(m_Settings.paths().overwrite()), dataPath, + true, customOverwrite.isEmpty()}); } for (MOBase::IPluginFileMapper* mapper : -- cgit v1.3.1