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

Merge pull request #10430 from OatmealDome/mac-portable 

UICommon: Add support for portable.txt on macOS
This commit is contained in:
JMC47 2022-07-08 18:41:14 -04:00 committed by GitHub
parent 59e8aacf42 7ce1a5717a
commit 7853b72c46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Source/Core/UICommon/UICommon.cpp
View File

@ -299,17 +299,7 @@ void SetUserDirectory(std::string custom_path)
home = ""; home = "";
std::string home_path = std::string(home) + DIR_SEP; std::string home_path = std::string(home) + DIR_SEP;
#if defined(__APPLE__) || defined(ANDROID) // On a non-Apple and non-Android POSIX system, there are 4 cases:
if (env_path)
{
user_path = env_path;
}
else
{
user_path = home_path + DOLPHIN_DATA_DIR DIR_SEP;
}
#else
// We are on a non-Apple and non-Android POSIX system, there are 4 cases:
// 1. GetExeDirectory()/portable.txt exists // 1. GetExeDirectory()/portable.txt exists
// -> Use GetExeDirectory()/User // -> Use GetExeDirectory()/User
// 2. $DOLPHIN_EMU_USERPATH is set // 2. $DOLPHIN_EMU_USERPATH is set
@ -319,7 +309,15 @@ void SetUserDirectory(std::string custom_path)
// 4. Default // 4. Default
// -> Use XDG basedir, see // -> Use XDG basedir, see
// http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html // http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP; //
// On macOS:
// 1. GetExeDirectory()/portable.txt exists
// -> Use GetExeDirectory()/User
// 2. $DOLPHIN_EMU_USERPATH is set
// -> Use $DOLPHIN_EMU_USERPATH
// 3. Default
//
// On Android, custom_path is set, so this code path is never reached.
std::string exe_path = File::GetExeDirectory(); std::string exe_path = File::GetExeDirectory();
if (File::Exists(exe_path + DIR_SEP "portable.txt")) if (File::Exists(exe_path + DIR_SEP "portable.txt"))
{ {
@ -329,29 +327,40 @@ void SetUserDirectory(std::string custom_path)
{ {
user_path = env_path; user_path = env_path;
} }
else if (!File::Exists(user_path)) #if defined(__APPLE__) || defined(ANDROID)
else
{ {
const char* data_home = getenv("XDG_DATA_HOME"); user_path = home_path + DOLPHIN_DATA_DIR DIR_SEP;
std::string data_path = }
std::string(data_home && data_home[0] == '/' ? data_home : #else
(home_path + ".local" DIR_SEP "share")) + else
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; {
user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP;
const char* config_home = getenv("XDG_CONFIG_HOME"); if (!File::Exists(user_path))
std::string config_path = {
std::string(config_home && config_home[0] == '/' ? config_home : const char* data_home = getenv("XDG_DATA_HOME");
(home_path + ".config")) + std::string data_path =
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; std::string(data_home && data_home[0] == '/' ? data_home :
(home_path + ".local" DIR_SEP "share")) +
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
const char* cache_home = getenv("XDG_CACHE_HOME"); const char* config_home = getenv("XDG_CONFIG_HOME");
std::string cache_path = std::string config_path =
std::string(cache_home && cache_home[0] == '/' ? cache_home : (home_path + ".cache")) + std::string(config_home && config_home[0] == '/' ? config_home :
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; (home_path + ".config")) +
DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
File::SetUserPath(D_USER_IDX, data_path); const char* cache_home = getenv("XDG_CACHE_HOME");
File::SetUserPath(D_CONFIG_IDX, config_path); std::string cache_path =
File::SetUserPath(D_CACHE_IDX, cache_path); std::string(cache_home && cache_home[0] == '/' ? cache_home : (home_path + ".cache")) +
return; DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
File::SetUserPath(D_USER_IDX, data_path);
File::SetUserPath(D_CONFIG_IDX, config_path);
File::SetUserPath(D_CACHE_IDX, cache_path);
return;
}
} }
#endif #endif
} }