games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-10 00:43:59 +02:00
Code Issues Releases Activity

Fix overwriting mod download URL during repo checkout

Browse Source
This commit is contained in:
Ivan Savenko 2024-12-15 19:16:49 +00:00
parent 92dcac90ae
commit 63af2d174f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/modManager/cmodlistview_moc.cpp
View File

@ -27,12 +27,13 @@
#include "../vcmiqt/jsonutils.h" #include "../vcmiqt/jsonutils.h"
#include "../helper.h" #include "../helper.h"
#include "../../lib/VCMIDirs.h"
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
#include "../../lib/texts/Languages.h" #include "../../lib/VCMIDirs.h"
#include "../../lib/modding/CModVersion.h"
#include "../../lib/filesystem/Filesystem.h" #include "../../lib/filesystem/Filesystem.h"
#include "../../lib/json/JsonUtils.h"
#include "../../lib/modding/CModVersion.h"
#include "../../lib/texts/CGeneralTextHandler.h" #include "../../lib/texts/CGeneralTextHandler.h"
#include "../../lib/texts/Languages.h"
#include <future> #include <future>
@ -747,7 +748,7 @@ void CModListView::installFiles(QStringList files)
else if(filename.endsWith(".json", Qt::CaseInsensitive)) else if(filename.endsWith(".json", Qt::CaseInsensitive))
{ {
//download and merge additional files //download and merge additional files
const auto &repoData = JsonUtils::jsonFromFile(filename); JsonNode repoData = JsonUtils::jsonFromFile(filename);
if(repoData["name"].isNull()) if(repoData["name"].isNull())
{ {
// This is main repository index. Download all referenced mods // This is main repository index. Download all referenced mods
@ -769,7 +770,7 @@ void CModListView::installFiles(QStringList files)
// This is json of a single mod. Extract name of mod and add it to repo // This is json of a single mod. Extract name of mod and add it to repo
auto modName = QFileInfo(filename).baseName().toStdString(); auto modName = QFileInfo(filename).baseName().toStdString();
auto modNameLower = boost::algorithm::to_lower_copy(modName); auto modNameLower = boost::algorithm::to_lower_copy(modName);
accumulatedRepositoryData[modNameLower] = repoData; JsonUtils::merge(accumulatedRepositoryData[modNameLower], repoData);
} }
} }
else if(filename.endsWith(".png", Qt::CaseInsensitive)) else if(filename.endsWith(".png", Qt::CaseInsensitive))