Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Fixed an issue where having a value set for the ROMDirectory setting caused all custom collection files to contain absolute paths instead of relative paths

Browse source
This commit is contained in:
Leon Styhre 2023-07-29 23:53:01 +02:00
parent 885f5fa96f
commit ccae4e74bc
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
es-app/src/CollectionSystemsManager.cpp
View file

@ -126,14 +126,20 @@ void CollectionSystemsManager::deinit(const bool shutdown)
void CollectionSystemsManager::saveCustomCollection(SystemData* sys) void CollectionSystemsManager::saveCustomCollection(SystemData* sys)
{ {
const std::string rompath {FileData::getROMDirectory()}; #if defined(_WIN64)
std::string rompath {Utils::String::replace(FileData::getROMDirectory(), "\\", "/")};
#else
std::string rompath {FileData::getROMDirectory()};
#endif
rompath = Utils::String::replace(rompath, "//", "/");
std::string name {sys->getName()}; std::string name {sys->getName()};
std::unordered_map<std::string, FileData*> games { std::unordered_map<std::string, FileData*> games {
sys->getRootFolder()->getChildrenByFilename()}; sys->getRootFolder()->getChildrenByFilename()};
bool found {mCustomCollectionSystemsData.find(name) != mCustomCollectionSystemsData.cend()}; bool found {mCustomCollectionSystemsData.find(name) != mCustomCollectionSystemsData.cend()};
if (found) { if (found) {
CollectionSystemData sysData = mCustomCollectionSystemsData.at(name); CollectionSystemData sysData {mCustomCollectionSystemsData.at(name)};
// Read back any entries from the configuration file for game files that are // Read back any entries from the configuration file for game files that are
// currently missing, and combine them with the active content. If we wouldn't do // currently missing, and combine them with the active content. If we wouldn't do
// this, they would be purged from the collection. Maybe a directory has been // this, they would be purged from the collection. Maybe a directory has been
@ -166,7 +172,7 @@ void CollectionSystemsManager::saveCustomCollection(SystemData* sys)
for (std::unordered_map<std::string, FileData*>::const_iterator it = games.cbegin(); for (std::unordered_map<std::string, FileData*>::const_iterator it = games.cbegin();
it != games.cend(); ++it) { it != games.cend(); ++it) {
std::string path = it->first; std::string path {it->first};
// If the ROM path of the game begins with the path from the setting // If the ROM path of the game begins with the path from the setting
// ROMDirectory (or the default ROM directory), then replace it with %ROMPATH%. // ROMDirectory (or the default ROM directory), then replace it with %ROMPATH%.
if (path.find(rompath) == 0) if (path.find(rompath) == 0)
@ -1005,8 +1011,14 @@ void CollectionSystemsManager::deleteCustomCollection(const std::string& collect
void CollectionSystemsManager::reactivateCustomCollectionEntry(FileData* game) void CollectionSystemsManager::reactivateCustomCollectionEntry(FileData* game)
{ {
std::string gamePath { #if defined(_WIN64)
Utils::String::replace(game->getFullPath(), FileData::getROMDirectory(), "%ROMPATH%/")}; std::string rompath {Utils::String::replace(FileData::getROMDirectory(), "\\", "/")};
#else
std::string rompath {FileData::getROMDirectory()};
#endif
rompath = Utils::String::replace(rompath, "//", "/");
std::string gamePath {Utils::String::replace(game->getFullPath(), rompath, "%ROMPATH%/")};
// Try to read from all custom collection configuration files to see if there are any // Try to read from all custom collection configuration files to see if there are any
// matching entries for the game passed as the parameter. If so, then enable it in each // matching entries for the game passed as the parameter. If so, then enable it in each
@ -1279,7 +1291,12 @@ void CollectionSystemsManager::populateCustomCollection(CollectionSystemData* sy
// Get the ROM directory, either as configured in es_settings.xml, or if no value // Get the ROM directory, either as configured in es_settings.xml, or if no value
// is set there, then use the default hardcoded path. // is set there, then use the default hardcoded path.
const std::string rompath {FileData::getROMDirectory()}; #if defined(_WIN64)
std::string rompath {Utils::String::replace(FileData::getROMDirectory(), "\\", "/")};
#else
std::string rompath {FileData::getROMDirectory()};
#endif
rompath = Utils::String::replace(rompath, "//", "/");
// Iterate list of files in the config file. // Iterate list of files in the config file.
for (std::string gameKey; getline(input, gameKey);) { for (std::string gameKey; getline(input, gameKey);) {