Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Converted forward slashes to backslashes for a couple of GuiOrphanedDataCleanup log messages

Browse source
This commit is contained in:
Leon Styhre 2023-07-27 14:03:15 +02:00
parent 9e46d46dd5
commit ada0fa0df4
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -319,7 +319,12 @@ void GuiOrphanedDataCleanup::cleanupMediaFiles()
if (std::find(systemFilesRelative.cbegin(), systemFilesRelative.cend(), if (std::find(systemFilesRelative.cbegin(), systemFilesRelative.cend(),
relativePath) == systemFilesRelative.end()) { relativePath) == systemFilesRelative.end()) {
cleanupFiles.emplace_back(mediaFile); cleanupFiles.emplace_back(mediaFile);
#if defined(_WIN64)
LOG(LogInfo) << "Found orphaned media file \""
<< Utils::String::replace(mediaFile, "/", "\\") << "\"";
#else
LOG(LogInfo) << "Found orphaned media file \"" << mediaFile << "\""; LOG(LogInfo) << "Found orphaned media file \"" << mediaFile << "\"";
#endif
} }
} }
} }
@ -337,9 +342,14 @@ void GuiOrphanedDataCleanup::cleanupMediaFiles()
#endif #endif
dateString.erase(dateString.find('\0')); dateString.erase(dateString.find('\0'));
const std::string targetDirectory {mMediaDirectory + "CLEANUP/" + dateString + "/"}; const std::string targetDirectory {mMediaDirectory + "CLEANUP/" + dateString + "/"};
#if defined(_WIN64)
LOG(LogInfo) << "Moving orphaned files to \""
<< Utils::String::replace(targetDirectory, "/", "\\") + system->getName()
<< "\\\"";
#else
LOG(LogInfo) << "Moving orphaned files to \"" << targetDirectory + system->getName() LOG(LogInfo) << "Moving orphaned files to \"" << targetDirectory + system->getName()
<< "/\""; << "/\"";
#endif
for (auto& file : cleanupFiles) { for (auto& file : cleanupFiles) {
const std::string fileDirectory { const std::string fileDirectory {
@ -440,9 +450,13 @@ void GuiOrphanedDataCleanup::cleanupGamelists()
SDL_Delay(500); SDL_Delay(500);
continue; continue;
} }
#if defined(_WIN64)
LOG(LogDebug) << "GuiOrphanedDataCleanup::cleanupGamelists(): Parsing file \""
<< Utils::String::replace(gamelistFile, "/", "\\") << "\"";
#else
LOG(LogDebug) << "GuiOrphanedDataCleanup::cleanupGamelists(): Parsing file \"" LOG(LogDebug) << "GuiOrphanedDataCleanup::cleanupGamelists(): Parsing file \""
<< gamelistFile << "\""; << gamelistFile << "\"";
#endif
const pugi::xml_node& alternativeEmulator {sourceDoc.child("alternativeEmulator")}; const pugi::xml_node& alternativeEmulator {sourceDoc.child("alternativeEmulator")};
if (alternativeEmulator) { if (alternativeEmulator) {
@ -580,8 +594,12 @@ void GuiOrphanedDataCleanup::cleanupGamelists()
} }
if (!mFailed) { if (!mFailed) {
#if defined(_WIN64)
LOG(LogInfo) << "Moving old gamelist.xml file to \""
<< Utils::String::replace(targetDirectory, "/", "\\") << "\\\"";
#else
LOG(LogInfo) << "Moving old gamelist.xml file to \"" << targetDirectory << "/\""; LOG(LogInfo) << "Moving old gamelist.xml file to \"" << targetDirectory << "/\"";
#endif
if (Utils::FileSystem::renameFile(gamelistFile, targetDirectory + "/gamelist.xml", if (Utils::FileSystem::renameFile(gamelistFile, targetDirectory + "/gamelist.xml",
true)) { true)) {
LOG(LogError) << "Couldn't move file \"" << gamelistFile << "\""; LOG(LogError) << "Couldn't move file \"" << gamelistFile << "\"";
@ -683,10 +701,13 @@ void GuiOrphanedDataCleanup::cleanupCollections()
mIsProcessing = false; mIsProcessing = false;
return; return;
} }
#if defined(_WIN64)
LOG(LogDebug) << "GuiOrphanedDataCleanup::cleanupCollections(): Parsing file \""
<< Utils::String::replace(collectionFile, "/", "\\") << "\"";
#else
LOG(LogDebug) << "GuiOrphanedDataCleanup::cleanupCollections(): Parsing file \"" LOG(LogDebug) << "GuiOrphanedDataCleanup::cleanupCollections(): Parsing file \""
<< collectionFile << "\""; << collectionFile << "\"";
#endif
// Get configuration for this custom collection. // Get configuration for this custom collection.
std::vector<std::string> validEntries; std::vector<std::string> validEntries;
int removeCount {0}; int removeCount {0};
@ -791,9 +812,14 @@ void GuiOrphanedDataCleanup::cleanupCollections()
if (configFileTarget.is_open()) if (configFileTarget.is_open())
configFileTarget.close(); configFileTarget.close();
#if defined(_WIN64)
LOG(LogInfo) << "Moving old \"" << Utils::FileSystem::getFileName(collectionFile)
<< "\" file to \""
<< Utils::String::replace(targetDirectory, "/", "\\") << "\"";
#else
LOG(LogInfo) << "Moving old \"" << Utils::FileSystem::getFileName(collectionFile) LOG(LogInfo) << "Moving old \"" << Utils::FileSystem::getFileName(collectionFile)
<< "\" file to \"" << targetDirectory << "\""; << "\" file to \"" << targetDirectory << "\"";
#endif
if (Utils::FileSystem::renameFile( if (Utils::FileSystem::renameFile(
collectionFile, collectionFile,