mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2025-02-16 20:15:38 +00:00
(Windows) Changed many logging entries to use backslashes instead of forward slashes as directory separators.
This commit is contained in:
parent
0d23719fe7
commit
81268fb11c
|
@ -112,7 +112,12 @@ namespace GamelistFileParser
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(_WIN64)
|
||||||
|
LOG(LogInfo) << "Parsing gamelist file \"" << Utils::String::replace(xmlpath, "/", "\\")
|
||||||
|
<< "\"...";
|
||||||
|
#else
|
||||||
LOG(LogInfo) << "Parsing gamelist file \"" << xmlpath << "\"...";
|
LOG(LogInfo) << "Parsing gamelist file \"" << xmlpath << "\"...";
|
||||||
|
#endif
|
||||||
|
|
||||||
pugi::xml_document doc;
|
pugi::xml_document doc;
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
|
@ -174,7 +179,12 @@ namespace GamelistFileParser
|
||||||
fileNode.child("path").text().get(), relativeTo, false);
|
fileNode.child("path").text().get(), relativeTo, false);
|
||||||
|
|
||||||
if (!trustGamelist && !Utils::FileSystem::exists(path)) {
|
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
|
LOG(LogWarning) << (type == GAME ? "File \"" : "Folder \"") << path
|
||||||
|
#endif
|
||||||
<< "\" does not exist, ignoring entry";
|
<< "\" does not exist, ignoring entry";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -432,7 +442,11 @@ namespace GamelistFileParser
|
||||||
LOG(LogDebug) << "GamelistFileParser::updateGamelist(): Added/updated "
|
LOG(LogDebug) << "GamelistFileParser::updateGamelist(): Added/updated "
|
||||||
<< numUpdated
|
<< numUpdated
|
||||||
<< (numUpdated == 1 ? " entity in \"" : " entities in \"")
|
<< (numUpdated == 1 ? " entity in \"" : " entities in \"")
|
||||||
|
#if defined(_WIN64)
|
||||||
|
<< Utils::String::replace(xmlWritePath, "/", "\\") << "\"";
|
||||||
|
#else
|
||||||
<< xmlWritePath << "\"";
|
<< xmlWritePath << "\"";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
if (!doc.save_file(Utils::String::stringToWideString(xmlWritePath).c_str())) {
|
if (!doc.save_file(Utils::String::stringToWideString(xmlWritePath).c_str())) {
|
||||||
|
|
|
@ -66,7 +66,12 @@ void FindRules::loadFindRules()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(_WIN64)
|
||||||
|
LOG(LogInfo) << "Parsing find rules configuration file \""
|
||||||
|
<< Utils::String::replace(path, "/", "\\") << "\"...";
|
||||||
|
#else
|
||||||
LOG(LogInfo) << "Parsing find rules configuration file \"" << path << "\"...";
|
LOG(LogInfo) << "Parsing find rules configuration file \"" << path << "\"...";
|
||||||
|
#endif
|
||||||
|
|
||||||
pugi::xml_document doc;
|
pugi::xml_document doc;
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
|
@ -433,7 +438,12 @@ bool SystemData::loadConfig()
|
||||||
if (onlyProcessCustomFile)
|
if (onlyProcessCustomFile)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#if defined(_WIN64)
|
||||||
|
LOG(LogInfo) << "Parsing systems configuration file \""
|
||||||
|
<< Utils::String::replace(configPath, "/", "\\") << "\"...";
|
||||||
|
#else
|
||||||
LOG(LogInfo) << "Parsing systems configuration file \"" << configPath << "\"...";
|
LOG(LogInfo) << "Parsing systems configuration file \"" << configPath << "\"...";
|
||||||
|
#endif
|
||||||
|
|
||||||
pugi::xml_document doc;
|
pugi::xml_document doc;
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
|
@ -514,7 +524,12 @@ bool SystemData::loadConfig()
|
||||||
// processing.
|
// processing.
|
||||||
if (!Utils::FileSystem::exists(path)) {
|
if (!Utils::FileSystem::exists(path)) {
|
||||||
LOG(LogDebug) << "SystemData::loadConfig(): Skipping system \"" << name
|
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
|
<< "\" as the defined ROM directory \"" << path
|
||||||
|
#endif
|
||||||
<< "\" does not exist";
|
<< "\" does not exist";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -720,9 +735,16 @@ std::vector<std::string> SystemData::getConfigPath(bool legacyWarning)
|
||||||
Utils::FileSystem::getHomePath() + "/.emulationstation/es_systems.cfg";
|
Utils::FileSystem::getHomePath() + "/.emulationstation/es_systems.cfg";
|
||||||
|
|
||||||
if (Utils::FileSystem::exists(legacyConfigFile)) {
|
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
|
LOG(LogInfo) << "Found legacy systems configuration file \"" << legacyConfigFile
|
||||||
<< "\", to retain your customizations move it to "
|
<< "\", to retain your customizations move it to "
|
||||||
"\"custom_systems/es_systems.xml\" or otherwise delete the file";
|
"\"custom_systems/es_systems.xml\" or otherwise delete the file";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -829,7 +851,12 @@ bool SystemData::createSystemDirectories()
|
||||||
if (onlyProcessCustomFile && configPath == configPaths.front())
|
if (onlyProcessCustomFile && configPath == configPaths.front())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
#if defined(_WIN64)
|
||||||
|
LOG(LogInfo) << "Parsing systems configuration file \""
|
||||||
|
<< Utils::String::replace(configPath, "/", "\\") << "\"...";
|
||||||
|
#else
|
||||||
LOG(LogInfo) << "Parsing systems configuration file \"" << configPath << "\"...";
|
LOG(LogInfo) << "Parsing systems configuration file \"" << configPath << "\"...";
|
||||||
|
#endif
|
||||||
|
|
||||||
pugi::xml_document doc;
|
pugi::xml_document doc;
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
|
|
|
@ -400,6 +400,20 @@ void GuiGamelistOptions::openMetaDataEd()
|
||||||
std::function<void()> deleteGameBtnFunc;
|
std::function<void()> deleteGameBtnFunc;
|
||||||
|
|
||||||
clearGameBtnFunc = [this, file] {
|
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) {
|
if (file->getType() == FOLDER) {
|
||||||
LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the folder \""
|
LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the folder \""
|
||||||
<< file->getFullPath() << "\"";
|
<< file->getFullPath() << "\"";
|
||||||
|
@ -412,6 +426,7 @@ void GuiGamelistOptions::openMetaDataEd()
|
||||||
else {
|
else {
|
||||||
LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the file \""
|
LOG(LogInfo) << "Deleting the media files and gamelist.xml entry for the file \""
|
||||||
<< file->getFullPath() << "\"";
|
<< file->getFullPath() << "\"";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
ViewController::getInstance()->getGamelistView(file->getSystem()).get()->removeMedia(file);
|
ViewController::getInstance()->getGamelistView(file->getSystem()).get()->removeMedia(file);
|
||||||
|
|
||||||
|
|
|
@ -31,14 +31,16 @@ MameNames::MameNames()
|
||||||
if (!Utils::FileSystem::exists(xmlpath))
|
if (!Utils::FileSystem::exists(xmlpath))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
LOG(LogInfo) << "Parsing MAME names file \"" << xmlpath << "\"...";
|
|
||||||
|
|
||||||
pugi::xml_document doc;
|
pugi::xml_document doc;
|
||||||
|
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
pugi::xml_parse_result result =
|
LOG(LogInfo) << "Parsing MAME names file \"" << Utils::String::replace(xmlpath, "/", "\\")
|
||||||
doc.load_file(Utils::String::stringToWideString(xmlpath).c_str());
|
<< "\"...";
|
||||||
|
pugi::xml_parse_result result {
|
||||||
|
doc.load_file(Utils::String::stringToWideString(xmlpath).c_str())};
|
||||||
#else
|
#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
|
#endif
|
||||||
|
|
||||||
if (!result) {
|
if (!result) {
|
||||||
|
@ -59,11 +61,12 @@ MameNames::MameNames()
|
||||||
if (!Utils::FileSystem::exists(xmlpath))
|
if (!Utils::FileSystem::exists(xmlpath))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
LOG(LogInfo) << "Parsing MAME BIOSes file \"" << xmlpath << "\"...";
|
|
||||||
|
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
|
LOG(LogInfo) << "Parsing MAME BIOSes file \"" << Utils::String::replace(xmlpath, "/", "\\")
|
||||||
|
<< "\"...";
|
||||||
result = doc.load_file(Utils::String::stringToWideString(xmlpath).c_str());
|
result = doc.load_file(Utils::String::stringToWideString(xmlpath).c_str());
|
||||||
#else
|
#else
|
||||||
|
LOG(LogInfo) << "Parsing MAME BIOSes file \"" << xmlpath << "\"...";
|
||||||
result = doc.load_file(xmlpath.c_str());
|
result = doc.load_file(xmlpath.c_str());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -85,11 +88,12 @@ MameNames::MameNames()
|
||||||
if (!Utils::FileSystem::exists(xmlpath))
|
if (!Utils::FileSystem::exists(xmlpath))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
LOG(LogInfo) << "Parsing MAME devices file \"" << xmlpath << "\"...";
|
|
||||||
|
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
|
LOG(LogInfo) << "Parsing MAME devices file \"" << Utils::String::replace(xmlpath, "/", "\\")
|
||||||
|
<< "\"...";
|
||||||
result = doc.load_file(Utils::String::stringToWideString(xmlpath).c_str());
|
result = doc.load_file(Utils::String::stringToWideString(xmlpath).c_str());
|
||||||
#else
|
#else
|
||||||
|
LOG(LogInfo) << "Parsing MAME devices file \"" << xmlpath << "\"...";
|
||||||
result = doc.load_file(xmlpath.c_str());
|
result = doc.load_file(xmlpath.c_str());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -564,11 +564,21 @@ void ThemeData::populateThemeSets()
|
||||||
for (Utils::FileSystem::StringList::const_iterator it = dirContent.cbegin();
|
for (Utils::FileSystem::StringList::const_iterator it = dirContent.cbegin();
|
||||||
it != dirContent.cend(); ++it) {
|
it != dirContent.cend(); ++it) {
|
||||||
if (Utils::FileSystem::isDirectory(*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 << "\"...";
|
LOG(LogDebug) << "Loading theme set capabilities for \"" << *it << "\"...";
|
||||||
|
#endif
|
||||||
ThemeCapability capabilities {parseThemeCapabilities(*it)};
|
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" : "")
|
LOG(LogInfo) << "Added" << (capabilities.legacyTheme ? " legacy" : "")
|
||||||
<< " theme set \"" << *it << "\"";
|
<< " theme set \"" << *it << "\"";
|
||||||
|
#endif
|
||||||
if (!capabilities.legacyTheme) {
|
if (!capabilities.legacyTheme) {
|
||||||
LOG(LogDebug) << "Theme set includes support for "
|
LOG(LogDebug) << "Theme set includes support for "
|
||||||
<< capabilities.variants.size() << " variant"
|
<< capabilities.variants.size() << " variant"
|
||||||
|
|
Loading…
Reference in a new issue