ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Config: Allow specifying portable directory relative path in portable.txt

This commit is contained in:
squidbus 2024-08-11 20:01:52 -07:00 committed by Ty
parent ffe8d16df4
commit 83f9add68b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcsx2/Pcsx2Config.cpp
View File

@ -170,6 +170,7 @@ namespace EmuFolders
std::string Videos; std::string Videos;
static bool ShouldUsePortableMode(); static bool ShouldUsePortableMode();
static std::string GetPortableModePath();
} // namespace EmuFolders } // namespace EmuFolders
TraceFiltersEE::TraceFiltersEE() TraceFiltersEE::TraceFiltersEE()
@ -1910,6 +1911,14 @@ bool EmuFolders::ShouldUsePortableMode()
return FileSystem::FileExists(Path::Combine(AppRoot, "portable.ini").c_str()) || FileSystem::FileExists(Path::Combine(AppRoot, "portable.txt").c_str()); return FileSystem::FileExists(Path::Combine(AppRoot, "portable.ini").c_str()) || FileSystem::FileExists(Path::Combine(AppRoot, "portable.txt").c_str());
} }
std::string EmuFolders::GetPortableModePath()
{
const auto portable_txt_path = Path::Combine(AppRoot, "portable.txt");
const auto portable_path = FileSystem::ReadFileToString(portable_txt_path.c_str()).value_or("");
const auto trimmed_path = StringUtil::StripWhitespace(portable_path);
return std::string(trimmed_path);
}
bool EmuFolders::SetDataDirectory(Error* error) bool EmuFolders::SetDataDirectory(Error* error)
{ {
if (!ShouldUsePortableMode()) if (!ShouldUsePortableMode())
@ -1954,7 +1963,7 @@ bool EmuFolders::SetDataDirectory(Error* error)
// couldn't determine the data directory, or using portable mode? fallback to portable. // couldn't determine the data directory, or using portable mode? fallback to portable.
if (DataRoot.empty()) if (DataRoot.empty())
DataRoot = AppRoot; DataRoot = Path::Combine(AppRoot, GetPortableModePath());
// inis is always below the data root // inis is always below the data root
Settings = Path::Combine(DataRoot, "inis"); Settings = Path::Combine(DataRoot, "inis");