franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common/fs/path_util: Slightly refactor PathManagerImpl's constructor

Browse Source 
This moves all GenerateYuzuPath calls outside of the platofrm-specific #ifdefs, replacing them with assignments to paths.
This commit is contained in:
Creak 2021-10-11 21:56:25 -04:00 committed by GitHub
parent 2a77c29c6d
commit 0b8a7ca213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/fs/path_util.cpp
View File

@ -82,32 +82,35 @@ public:
private: private:
PathManagerImpl() { PathManagerImpl() {
fs::path yuzu_path;
fs::path yuzu_path_cache;
fs::path yuzu_path_config;
#ifdef _WIN32 #ifdef _WIN32
auto yuzu_path = GetExeDirectory() / PORTABLE_DIR; yuzu_path = GetExeDirectory() / PORTABLE_DIR;
if (!IsDir(yuzu_path)) { if (!IsDir(yuzu_path)) {
yuzu_path = GetAppDataRoamingDirectory() / YUZU_DIR; yuzu_path = GetAppDataRoamingDirectory() / YUZU_DIR;
} }
GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path); yuzu_path_cache = yuzu_path / CACHE_DIR;
GenerateYuzuPath(YuzuPath::CacheDir, yuzu_path / CACHE_DIR); yuzu_path_config = yuzu_path / CONFIG_DIR;
GenerateYuzuPath(YuzuPath::ConfigDir, yuzu_path / CONFIG_DIR);
#else #else
auto yuzu_path = GetCurrentDir() / PORTABLE_DIR; yuzu_path = GetCurrentDir() / PORTABLE_DIR;
if (Exists(yuzu_path) && IsDir(yuzu_path)) { if (Exists(yuzu_path) && IsDir(yuzu_path)) {
GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path); yuzu_path_cache = yuzu_path / CACHE_DIR;
GenerateYuzuPath(YuzuPath::CacheDir, yuzu_path / CACHE_DIR); yuzu_path_config = yuzu_path / CONFIG_DIR;
GenerateYuzuPath(YuzuPath::ConfigDir, yuzu_path / CONFIG_DIR);
} else { } else {
yuzu_path = GetDataDirectory("XDG_DATA_HOME") / YUZU_DIR; yuzu_path = GetDataDirectory("XDG_DATA_HOME") / YUZU_DIR;
yuzu_path_cache = GetDataDirectory("XDG_CACHE_HOME") / YUZU_DIR;
GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path); yuzu_path_config = GetDataDirectory("XDG_CONFIG_HOME") / YUZU_DIR;
GenerateYuzuPath(YuzuPath::CacheDir, GetDataDirectory("XDG_CACHE_HOME") / YUZU_DIR);
GenerateYuzuPath(YuzuPath::ConfigDir, GetDataDirectory("XDG_CONFIG_HOME") / YUZU_DIR);
} }
#endif #endif
GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path);
GenerateYuzuPath(YuzuPath::CacheDir, yuzu_path_cache);
GenerateYuzuPath(YuzuPath::ConfigDir, yuzu_path_config);
GenerateYuzuPath(YuzuPath::DumpDir, yuzu_path / DUMP_DIR); GenerateYuzuPath(YuzuPath::DumpDir, yuzu_path / DUMP_DIR);
GenerateYuzuPath(YuzuPath::KeysDir, yuzu_path / KEYS_DIR); GenerateYuzuPath(YuzuPath::KeysDir, yuzu_path / KEYS_DIR);
GenerateYuzuPath(YuzuPath::LoadDir, yuzu_path / LOAD_DIR); GenerateYuzuPath(YuzuPath::LoadDir, yuzu_path / LOAD_DIR);