BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-08-16 00:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make duplicate mod detection more readable

Browse Source 
Co-authored-by: SaltySnail <51403141+SaltySnail@users.noreply.github.com>
This commit is contained in:
Tixx 2025-06-07 21:55:49 +02:00
parent 2529146d5a
commit a8cd208208
No known key found for this signature in database
GPG Key ID: EC6E7A2BAABF0B8C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Network/Resources.cpp
View File

@ -478,8 +478,9 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
std::vector<std::pair<std::string, std::filesystem::path>> CachedMods = {}; std::vector<std::pair<std::string, std::filesystem::path>> CachedMods = {};
if (deleteDuplicateMods) { if (deleteDuplicateMods) {
for (const auto& entry : fs::directory_iterator(CachingDirectory)) { for (const auto& entry : fs::directory_iterator(CachingDirectory)) {
if (entry.is_regular_file() && entry.path().extension() == ".zip" && entry.path().filename().string().length() > 10) { const std::string filename = entry.path().filename().string();
CachedMods.push_back(std::make_pair(entry.path().filename().string().substr(0, entry.path().filename().string().length() - 13) + ".zip", entry.path())); if (entry.is_regular_file() && entry.path().extension() == ".zip" && filename.length() > 10) {
CachedMods.push_back(std::make_pair(filename.substr(0, filename.length() - 13) + ".zip", entry.path()));
} }
} }
} }
@ -490,7 +491,9 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
++ModNo; ++ModNo;
if (deleteDuplicateMods) { if (deleteDuplicateMods) {
for (auto& CachedMod : CachedMods) { for (auto& CachedMod : CachedMods) {
if (CachedMod.first == ModInfoIter->FileName && CachedMod.second.stem().string() + ".zip" != std::filesystem::path(ModInfoIter->FileName).stem().string() + "-" + ModInfoIter->Hash.substr(0, 8) + ".zip") { const bool cachedModExists = CachedMod.first == ModInfoIter->FileName;
const bool cachedModIsNotNewestVersion = CachedMod.second.stem().string() + ".zip" != std::filesystem::path(ModInfoIter->FileName).stem().string() + "-" + ModInfoIter->Hash.substr(0, 8) + ".zip";
if (cachedModExists && cachedModIsNotNewestVersion) {
debug("Found duplicate mod '" + CachedMod.second.stem().string() + ".zip" + "' in cache, removing it"); debug("Found duplicate mod '" + CachedMod.second.stem().string() + ".zip" + "' in cache, removing it");
std::filesystem::remove(CachedMod.second); std::filesystem::remove(CachedMod.second);
break; break;