Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added some additional gamelist.xml cleanup logic to GuiOrphanedDataCleanup

Browse source
This commit is contained in:
Leon Styhre 2023-10-17 23:03:17 +02:00
parent 4c4529b650
commit 8c3c3e4e0f
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
es-app/src/guis/GuiOrphanedDataCleanup.cpp
View file

@ -520,7 +520,7 @@ void GuiOrphanedDataCleanup::cleanupGamelists()
"/gamelist.xml_CLEANUP.tmp"}; "/gamelist.xml_CLEANUP.tmp"};
if (Utils::FileSystem::exists(tempFile)) { if (Utils::FileSystem::exists(tempFile)) {
LOG(LogWarning) << "Found existing temporary file \"" << tempFile << "\""; LOG(LogWarning) << "Found existing temporary file \"" << tempFile << "\", deleting it";
if (!Utils::FileSystem::removeFile(tempFile)) { if (!Utils::FileSystem::removeFile(tempFile)) {
LOG(LogError) << "Couldn't remove temporary file \"" << tempFile << "\""; LOG(LogError) << "Couldn't remove temporary file \"" << tempFile << "\"";
{ {
@ -567,6 +567,7 @@ void GuiOrphanedDataCleanup::cleanupGamelists()
} }
const std::vector<std::string> knownTags {"game", "folder"}; const std::vector<std::string> knownTags {"game", "folder"};
const std::vector<std::string>& extensions {system->getSystemEnvData()->mSearchExtensions};
// Step through every game and folder element so that the order of entries will remain // Step through every game and folder element so that the order of entries will remain
// in the target gamelist.xml file. // in the target gamelist.xml file.
@ -583,7 +584,35 @@ void GuiOrphanedDataCleanup::cleanupGamelists()
++removeCount; ++removeCount;
} }
else if (Utils::FileSystem::exists(startPath + "/" + path)) { else if (Utils::FileSystem::exists(startPath + "/" + path)) {
targetRoot.append_copy((*it)); if (tag == "game") {
// Remove entries with extensions not defined in es_systems.xml.
if (std::find(extensions.cbegin(), extensions.cend(),
Utils::FileSystem::getExtension(path)) != extensions.cend()) {
targetRoot.append_copy((*it));
}
else {
LOG(LogInfo) << "Found orphaned " << tag << " entry \"" << path << "\"";
++removeCount;
}
}
else {
bool folderExists {false};
for (auto child : system->getRootFolder()->getChildrenRecursive()) {
if (child->getType() == FOLDER &&
child->getPath() ==
system->getRootFolder()->getPath() + path.substr(1)) {
folderExists = true;
break;
}
}
if (folderExists) {
targetRoot.append_copy((*it));
}
else {
LOG(LogInfo) << "Found orphaned " << tag << " entry \"" << path << "\"";
++removeCount;
}
}
} }
else { else {
LOG(LogInfo) << "Found orphaned " << tag << " entry \"" << path << "\""; LOG(LogInfo) << "Found orphaned " << tag << " entry \"" << path << "\"";
@ -794,7 +823,7 @@ void GuiOrphanedDataCleanup::cleanupCollections()
const std::string tempFile {collectionFile + "_CLEANUP.tmp"}; const std::string tempFile {collectionFile + "_CLEANUP.tmp"};
if (Utils::FileSystem::exists(tempFile)) { if (Utils::FileSystem::exists(tempFile)) {
LOG(LogWarning) << "Found existing temporary file \"" << tempFile << "\""; LOG(LogWarning) << "Found existing temporary file \"" << tempFile << "\", deleting it";
if (!Utils::FileSystem::removeFile(tempFile)) { if (!Utils::FileSystem::removeFile(tempFile)) {
LOG(LogError) << "Couldn't remove temporary file"; LOG(LogError) << "Couldn't remove temporary file";
{ {