Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed multiple issues with the new emulator find mechanism.

Browse source
This commit is contained in:
Leon Styhre 2021-06-20 12:30:14 +02:00
parent 183cdddfa0
commit 71f1f6806f
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
es-app/src/FileData.cpp
View file

@ -805,11 +805,6 @@ void FileData::launchGame(Window* window)
if (coreEntry != "") if (coreEntry != "")
emulatorCorePaths = SystemData::sFindRules.get()->mCores[coreEntry].corePaths; emulatorCorePaths = SystemData::sFindRules.get()->mCores[coreEntry].corePaths;
command = Utils::String::replace(command, "%ROM%", romPath);
command = Utils::String::replace(command, "%BASENAME%", baseName);
command = Utils::String::replace(command, "%ROMRAW%", romRaw);
command = Utils::String::replace(command, "%ESPATH%", esPath);
// Expand home path if ~ is used. // Expand home path if ~ is used.
command = Utils::FileSystem::expandHomePath(command); command = Utils::FileSystem::expandHomePath(command);
@ -915,8 +910,12 @@ void FileData::launchGame(Window* window)
// If a %CORE_ find rule entry is used in es_systems.xml for this system, then try to find // If a %CORE_ find rule entry is used in es_systems.xml for this system, then try to find
// the emulator core using the rules defined in es_find_rules.xml. // the emulator core using the rules defined in es_find_rules.xml.
for (std::string path : emulatorCorePaths) { for (std::string path : emulatorCorePaths) {
if (path.back() != '/')
path += "/"; // The position of the %CORE_ variable could have changed as there may have been an
// %EMULATOR_ variable that was substituted for the actual emulator binary.
coreEntryPos = command.find("%CORE_");
coreFilePos = command.find("%", coreEntryPos + 6);
size_t separatorPos; size_t separatorPos;
size_t quotePos = command.find("\"", coreFilePos); size_t quotePos = command.find("\"", coreFilePos);
if (quotePos == std::string::npos) if (quotePos == std::string::npos)
@ -931,8 +930,14 @@ void FileData::launchGame(Window* window)
// Expand %EMUPATH% if it has been used in the %CORE_ variable. // Expand %EMUPATH% if it has been used in the %CORE_ variable.
size_t stringPos = coreFile.find("%EMUPATH%"); size_t stringPos = coreFile.find("%EMUPATH%");
if (stringPos != std::string::npos) if (stringPos != std::string::npos) {
#if defined (_WIN64)
coreFile = Utils::String::replace(coreFile.replace(stringPos, 9,
Utils::FileSystem::getParent(emuPath)), "/", "\\");
#else
coreFile = coreFile.replace(stringPos, 9, Utils::FileSystem::getParent(emuPath)); coreFile = coreFile.replace(stringPos, 9, Utils::FileSystem::getParent(emuPath));
#endif
}
// Expand %ESPATH% if it has been used in the %CORE_ variable. // Expand %ESPATH% if it has been used in the %CORE_ variable.
stringPos = coreFile.find("%ESPATH%"); stringPos = coreFile.find("%ESPATH%");
@ -949,7 +954,7 @@ void FileData::launchGame(Window* window)
// Escape any blankspaces. // Escape any blankspaces.
if (coreFile.find(" ") != std::string::npos) if (coreFile.find(" ") != std::string::npos)
coreFile = Utils::FileSystem::getEscapedPath(coreFile); coreFile = Utils::FileSystem::getEscapedPath(coreFile);
command.replace(coreEntryPos - 1, separatorPos - coreEntryPos + 1, coreFile); command.replace(coreEntryPos, separatorPos - coreEntryPos, coreFile);
// Remove any quotation marks as it would make the launch function fail. // Remove any quotation marks as it would make the launch function fail.
if (command.find("\"") != std::string::npos) if (command.find("\"") != std::string::npos)
command = Utils::String::replace(command, "\"", ""); command = Utils::String::replace(command, "\"", "");
@ -982,6 +987,12 @@ void FileData::launchGame(Window* window)
return; return;
} }
// Replace the remaining variables with their actual values.
command = Utils::String::replace(command, "%ROM%", romPath);
command = Utils::String::replace(command, "%BASENAME%", baseName);
command = Utils::String::replace(command, "%ROMRAW%", romRaw);
command = Utils::String::replace(command, "%ESPATH%", esPath);
// swapBuffers() is called here to turn the screen black to eliminate some potential // swapBuffers() is called here to turn the screen black to eliminate some potential
// flickering and to avoid showing the game launch message briefly when returning // flickering and to avoid showing the game launch message briefly when returning
// from the game. // from the game.
@ -1116,7 +1127,11 @@ std::string FileData::findEmulatorPath(std::string& command)
exePath.pop_back(); exePath.pop_back();
} }
} }
return exePath; if (exePath != "") {
exePath += "\\" + path;
command.replace(0, endPos + 1, exePath);
return exePath;
}
#else #else
exePath = Utils::FileSystem::getPathToBinary(path); exePath = Utils::FileSystem::getPathToBinary(path);
if (exePath != "") { if (exePath != "") {
@ -1131,7 +1146,7 @@ std::string FileData::findEmulatorPath(std::string& command)
if (Utils::FileSystem::isRegularFile(path) || if (Utils::FileSystem::isRegularFile(path) ||
Utils::FileSystem::isSymlink(path)) { Utils::FileSystem::isSymlink(path)) {
command.replace(0, endPos + 1, path); command.replace(0, endPos + 1, path);
return Utils::FileSystem::getParent(path); return path;
} }
} }