Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Entries for missing files are now retained for custom collections.

Browse source
This commit is contained in:
Leon Styhre 2020-10-19 19:51:19 +02:00
parent 0b6d0bfcd6
commit 9f617cd038
1 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
es-app/src/CollectionSystemManager.cpp
View file

@ -142,13 +142,36 @@ void CollectionSystemManager::saveCustomCollection(SystemData* sys)
if (found) { if (found) {
CollectionSystemData sysData = mCustomCollectionSystemsData.at(name); CollectionSystemData sysData = mCustomCollectionSystemsData.at(name);
if (sysData.needsSave) { if (sysData.needsSave) {
std::ofstream configFile; // 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
// this, they would be purged from the collection. Maybe a directory has been
// temporarily moved or the files are not reachable for whatever reason. It would
// be incredibly annoying to have entries purged from the collection in such
// instances. Using the logic below, the handling of custom collections corresponds
// to the handling of gamelist.xml files, i.e. it's up to the user to make a
// conscious decision of what entries to remove.
std::vector<std::string> fileGameEntries;
std::vector<std::string> activeGameEntries;
std::ifstream configFileIn;
std::ofstream configFileOut;
#if defined(_WIN64) #if defined(_WIN64)
configFile.open(Utils::String:: configFileIn.open(Utils::String::
stringToWideString(getCustomCollectionConfigPath(name)).c_str()); stringToWideString(getCustomCollectionConfigPath(name)).c_str());
#else #else
configFile.open(getCustomCollectionConfigPath(name)); configFileIn.open(getCustomCollectionConfigPath(name));
#endif #endif
for (std::string gameEntry; getline(configFileIn, gameEntry); ) {
std::string gamePath = Utils::String::replace(gameEntry, "%ROMPATH%", rompath);
gamePath = Utils::String::replace(gamePath, "//", "/");
// Only add the entry if it's not a regular file or a symlink, in other words
// only add missing files.
if (!Utils::FileSystem::isRegularFile(gamePath) &&
!Utils::FileSystem::isSymlink(gamePath))
fileGameEntries.push_back(gameEntry);
}
configFileIn.close();
for (std::unordered_map<std::string, FileData*>::const_iterator for (std::unordered_map<std::string, FileData*>::const_iterator
iter = games.cbegin(); iter != games.cend(); ++iter) { iter = games.cbegin(); iter != games.cend(); ++iter) {
std::string path = iter->first; std::string path = iter->first;
@ -157,9 +180,26 @@ void CollectionSystemManager::saveCustomCollection(SystemData* sys)
if (path.find(rompath) == 0) if (path.find(rompath) == 0)
path.replace(0, rompath.size(), "%ROMPATH%/"); path.replace(0, rompath.size(), "%ROMPATH%/");
configFile << path << std::endl; activeGameEntries.push_back(path);
} }
configFile.close();
fileGameEntries.insert(fileGameEntries.cend(), activeGameEntries.cbegin(),
activeGameEntries.cend());
std::sort(fileGameEntries.begin(), fileGameEntries.end());
auto last = std::unique(fileGameEntries.begin(), fileGameEntries.end());
fileGameEntries.erase(last, fileGameEntries.end());
#if defined(_WIN64)
configFile.open(Utils::String::
stringToWideString(getCustomCollectionConfigPath(name)).c_str());
#else
configFileOut.open(getCustomCollectionConfigPath(name));
#endif
for (auto it = fileGameEntries.cbegin(); it != fileGameEntries.cend(); it++)
configFileOut << (*it) << std::endl;
configFileOut.close();
} }
} }
else { else {