diff --git a/es-app/src/GamelistFileParser.cpp b/es-app/src/GamelistFileParser.cpp index 5a1b6ae51..a6ca3659f 100644 --- a/es-app/src/GamelistFileParser.cpp +++ b/es-app/src/GamelistFileParser.cpp @@ -112,7 +112,12 @@ namespace GamelistFileParser return; } +#if defined(_WIN64) + LOG(LogInfo) << "Parsing gamelist file \"" << Utils::String::replace(xmlpath, "/", "\\") + << "\"..."; +#else LOG(LogInfo) << "Parsing gamelist file \"" << xmlpath << "\"..."; +#endif pugi::xml_document doc; #if defined(_WIN64) @@ -174,7 +179,12 @@ namespace GamelistFileParser fileNode.child("path").text().get(), relativeTo, false); if (!trustGamelist && !Utils::FileSystem::exists(path)) { +#if defined(_WIN64) + LOG(LogWarning) << (type == GAME ? "File \"" : "Folder \"") + << Utils::String::replace(path, "/", "\\") +#else LOG(LogWarning) << (type == GAME ? "File \"" : "Folder \"") << path +#endif << "\" does not exist, ignoring entry"; continue; } @@ -432,7 +442,11 @@ namespace GamelistFileParser LOG(LogDebug) << "GamelistFileParser::updateGamelist(): Added/updated " << numUpdated << (numUpdated == 1 ? " entity in \"" : " entities in \"") +#if defined(_WIN64) + << Utils::String::replace(xmlWritePath, "/", "\\") << "\""; +#else << xmlWritePath << "\""; +#endif } #if defined(_WIN64) if (!doc.save_file(Utils::String::stringToWideString(xmlWritePath).c_str())) { diff --git a/es-app/src/SystemData.cpp b/es-app/src/SystemData.cpp index 8b900de82..57c372688 100644 --- a/es-app/src/SystemData.cpp +++ b/es-app/src/SystemData.cpp @@ -66,7 +66,12 @@ void FindRules::loadFindRules() return; } +#if defined(_WIN64) + LOG(LogInfo) << "Parsing find rules configuration file \"" + << Utils::String::replace(path, "/", "\\") << "\"..."; +#else LOG(LogInfo) << "Parsing find rules configuration file \"" << path << "\"..."; +#endif pugi::xml_document doc; #if defined(_WIN64) @@ -433,7 +438,12 @@ bool SystemData::loadConfig() if (onlyProcessCustomFile) break; +#if defined(_WIN64) + LOG(LogInfo) << "Parsing systems configuration file \"" + << Utils::String::replace(configPath, "/", "\\") << "\"..."; +#else LOG(LogInfo) << "Parsing systems configuration file \"" << configPath << "\"..."; +#endif pugi::xml_document doc; #if defined(_WIN64) @@ -514,7 +524,12 @@ bool SystemData::loadConfig() // processing. if (!Utils::FileSystem::exists(path)) { LOG(LogDebug) << "SystemData::loadConfig(): Skipping system \"" << name +#if defined(_WIN64) + << "\" as the defined ROM directory \"" + << Utils::String::replace(path, "/", "\\") +#else << "\" as the defined ROM directory \"" << path +#endif << "\" does not exist"; continue; } @@ -720,9 +735,16 @@ std::vector SystemData::getConfigPath(bool legacyWarning) Utils::FileSystem::getHomePath() + "/.emulationstation/es_systems.cfg"; if (Utils::FileSystem::exists(legacyConfigFile)) { +#if defined(_WIN64) + LOG(LogInfo) << "Found legacy systems configuration file \"" + << Utils::String::replace(legacyConfigFile, "/", "\\") + << "\", to retain your customizations move it to " + "\"custom_systems\\es_systems.xml\" or otherwise delete the file"; +#else LOG(LogInfo) << "Found legacy systems configuration file \"" << legacyConfigFile << "\", to retain your customizations move it to " "\"custom_systems/es_systems.xml\" or otherwise delete the file"; +#endif } } @@ -829,7 +851,12 @@ bool SystemData::createSystemDirectories() if (onlyProcessCustomFile && configPath == configPaths.front()) continue; +#if defined(_WIN64) + LOG(LogInfo) << "Parsing systems configuration file \"" + << Utils::String::replace(configPath, "/", "\\") << "\"..."; +#else LOG(LogInfo) << "Parsing systems configuration file \"" << configPath << "\"..."; +#endif pugi::xml_document doc; #if defined(_WIN64) diff --git a/es-app/src/guis/GuiGamelistOptions.cpp b/es-app/src/guis/GuiGamelistOptions.cpp index cab1d1995..e9a320bf5 100644 --- a/es-app/src/guis/GuiGamelistOptions.cpp +++ b/es-app/src/guis/GuiGamelistOptions.cpp @@ -400,6 +400,20 @@ void GuiGamelistOptions::openMetaDataEd() std::function deleteGameBtnFunc; clearGameBtnFunc = [this, file] { +#if defined(_WIN64) + if (file->getType() == FOLDER) { + LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the folder \"" + << Utils::String::replace(file->getFullPath(), "/", "\\") << "\""; + } + else if (file->getType() == GAME && Utils::FileSystem::isDirectory(file->getFullPath())) { + LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the " + "file-interpreted folder \"" + << Utils::String::replace(file->getFullPath(), "/", "\\") << "\""; + } + else { + LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the file \"" + << Utils::String::replace(file->getFullPath(), "/", "\\") << "\""; +#else if (file->getType() == FOLDER) { LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the folder \"" << file->getFullPath() << "\""; @@ -412,6 +426,7 @@ void GuiGamelistOptions::openMetaDataEd() else { LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the file \"" << file->getFullPath() << "\""; +#endif } ViewController::getInstance()->getGamelistView(file->getSystem()).get()->removeMedia(file); diff --git a/es-core/src/MameNames.cpp b/es-core/src/MameNames.cpp index 7d78b6e90..39e9a2725 100644 --- a/es-core/src/MameNames.cpp +++ b/es-core/src/MameNames.cpp @@ -31,14 +31,16 @@ MameNames::MameNames() if (!Utils::FileSystem::exists(xmlpath)) return; - LOG(LogInfo) << "Parsing MAME names file \"" << xmlpath << "\"..."; - pugi::xml_document doc; + #if defined(_WIN64) - pugi::xml_parse_result result = - doc.load_file(Utils::String::stringToWideString(xmlpath).c_str()); + LOG(LogInfo) << "Parsing MAME names file \"" << Utils::String::replace(xmlpath, "/", "\\") + << "\"..."; + pugi::xml_parse_result result { + doc.load_file(Utils::String::stringToWideString(xmlpath).c_str())}; #else - pugi::xml_parse_result result = doc.load_file(xmlpath.c_str()); + LOG(LogInfo) << "Parsing MAME names file \"" << xmlpath << "\"..."; + pugi::xml_parse_result result {doc.load_file(xmlpath.c_str())}; #endif if (!result) { @@ -59,11 +61,12 @@ MameNames::MameNames() if (!Utils::FileSystem::exists(xmlpath)) return; - LOG(LogInfo) << "Parsing MAME BIOSes file \"" << xmlpath << "\"..."; - #if defined(_WIN64) + LOG(LogInfo) << "Parsing MAME BIOSes file \"" << Utils::String::replace(xmlpath, "/", "\\") + << "\"..."; result = doc.load_file(Utils::String::stringToWideString(xmlpath).c_str()); #else + LOG(LogInfo) << "Parsing MAME BIOSes file \"" << xmlpath << "\"..."; result = doc.load_file(xmlpath.c_str()); #endif @@ -85,11 +88,12 @@ MameNames::MameNames() if (!Utils::FileSystem::exists(xmlpath)) return; - LOG(LogInfo) << "Parsing MAME devices file \"" << xmlpath << "\"..."; - #if defined(_WIN64) + LOG(LogInfo) << "Parsing MAME devices file \"" << Utils::String::replace(xmlpath, "/", "\\") + << "\"..."; result = doc.load_file(Utils::String::stringToWideString(xmlpath).c_str()); #else + LOG(LogInfo) << "Parsing MAME devices file \"" << xmlpath << "\"..."; result = doc.load_file(xmlpath.c_str()); #endif diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp index 9fcfb4cd1..e6054837d 100644 --- a/es-core/src/ThemeData.cpp +++ b/es-core/src/ThemeData.cpp @@ -564,11 +564,21 @@ void ThemeData::populateThemeSets() for (Utils::FileSystem::StringList::const_iterator it = dirContent.cbegin(); it != dirContent.cend(); ++it) { if (Utils::FileSystem::isDirectory(*it)) { +#if defined(_WIN64) + LOG(LogDebug) << "Loading theme set capabilities for \"" + << Utils::String::replace(*it, "/", "\\") << "\"..."; +#else LOG(LogDebug) << "Loading theme set capabilities for \"" << *it << "\"..."; +#endif ThemeCapability capabilities {parseThemeCapabilities(*it)}; +#if defined(_WIN64) + LOG(LogInfo) << "Added" << (capabilities.legacyTheme ? " legacy" : "") + << " theme set \"" << Utils::String::replace(*it, "/", "\\") << "\""; +#else LOG(LogInfo) << "Added" << (capabilities.legacyTheme ? " legacy" : "") << " theme set \"" << *it << "\""; +#endif if (!capabilities.legacyTheme) { LOG(LogDebug) << "Theme set includes support for " << capabilities.variants.size() << " variant"