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

Merge remote-tracking branch 'upstream/master' into canary-old-update

This commit is contained in:
illusion 2020-03-14 22:50:54 +11:00
parent 943ca109ae b1d3fd2ad3
commit d9a4f5bdb8
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/xenia/app/xenia_main.cc
View File

@ -54,8 +54,17 @@ DEFINE_string(hid, "any", "Input system. Use: [any, nop, sdl, winkey, xinput]",
DEFINE_bool(fullscreen, false, "Toggles fullscreen", "GPU"); DEFINE_bool(fullscreen, false, "Toggles fullscreen", "GPU");
DEFINE_string(content_root, "", "Root path for content (save/etc) storage.", DEFINE_string(
"Storage"); storage_root, "",
"Root path for persistent internal data storage (config, etc.), or empty "
"to use the path preferred for the OS, such as the documents folder, or "
"the emulator executable directory if portable.txt is present in it.",
"Storage");
DEFINE_string(
content_root, "",
"Root path for guest content storage (saves, etc.), or empty to use the "
"content folder under the storage root.",
"Storage");
DEFINE_bool(mount_scratch, false, "Enable scratch mount", "Storage"); DEFINE_bool(mount_scratch, false, "Enable scratch mount", "Storage");
DEFINE_bool(mount_cache, false, "Enable cache mount", "Storage"); DEFINE_bool(mount_cache, false, "Enable cache mount", "Storage");
@ -201,36 +210,32 @@ int xenia_main(const std::vector<std::wstring>& args) {
Profiler::Initialize(); Profiler::Initialize();
Profiler::ThreadEnter("main"); Profiler::ThreadEnter("main");
// Figure out where content should go. // Figure out where internal files and content should go.
std::wstring content_root = xe::to_wstring(cvars::content_root); std::wstring storage_root = xe::to_wstring(cvars::storage_root);
std::wstring config_folder; if (storage_root.empty()) {
storage_root = xe::filesystem::GetExecutableFolder();
if (content_root.empty()) { if (!xe::filesystem::PathExists(
auto base_path = xe::filesystem::GetExecutableFolder(); xe::join_paths(storage_root, L"portable.txt"))) {
base_path = xe::to_absolute_path(base_path); storage_root = xe::filesystem::GetUserFolder();
#if defined(XE_PLATFORM_WIN32) || defined(XE_PLATFORM_LINUX)
auto portable_path = xe::join_paths(base_path, L"portable.txt"); storage_root = xe::join_paths(storage_root, L"Xenia");
if (xe::filesystem::PathExists(portable_path)) {
content_root = xe::join_paths(base_path, L"content");
config_folder = base_path;
} else {
content_root = xe::filesystem::GetUserFolder();
#if defined(XE_PLATFORM_WIN32)
content_root = xe::join_paths(content_root, L"Xenia");
#elif defined(XE_PLATFORM_LINUX)
content_root = xe::join_paths(content_root, L"Xenia");
#else #else
#warning Unhandled platform for content root. #warning Unhandled platform for the data root.
content_root = xe::join_paths(content_root, L"Xenia"); storage_root = xe::join_paths(storage_root, L"Xenia");
#endif #endif
config_folder = content_root;
content_root = xe::join_paths(content_root, L"content");
} }
} }
content_root = xe::to_absolute_path(content_root); storage_root = xe::to_absolute_path(storage_root);
XELOGI("Storage root: %S", storage_root.c_str());
config::SetupConfig(storage_root);
std::wstring content_root = xe::to_wstring(cvars::content_root);
if (content_root.empty()) {
content_root = xe::join_paths(storage_root, L"content");
}
content_root = xe::to_absolute_path(content_root);
XELOGI("Content root: %S", content_root.c_str()); XELOGI("Content root: %S", content_root.c_str());
config::SetupConfig(config_folder);
if (cvars::discord) { if (cvars::discord) {
discord::DiscordPresence::Initialize(); discord::DiscordPresence::Initialize();

6
src/xenia/config.cc
View File

@ -24,6 +24,7 @@ namespace config {
std::wstring config_name = L"xenia-canary-config.toml"; std::wstring config_name = L"xenia-canary-config.toml";
std::wstring config_folder; std::wstring config_folder;
std::wstring config_path; std::wstring config_path;
std::wstring game_config_suffix = L".config.toml";
bool sortCvar(cvar::IConfigVar* a, cvar::IConfigVar* b) { bool sortCvar(cvar::IConfigVar* a, cvar::IConfigVar* b) {
if (a->category() < b->category()) return true; if (a->category() < b->category()) return true;
@ -151,9 +152,8 @@ void SetupConfig(const std::wstring& config_folder) {
} }
void LoadGameConfig(const std::wstring& title_id) { void LoadGameConfig(const std::wstring& title_id) {
const auto content_folder = xe::join_paths(config_folder, L"content"); const auto game_config_path = xe::join_paths(
const auto game_folder = xe::join_paths(content_folder, title_id); xe::join_paths(config_folder, L"config"), title_id + game_config_suffix);
const auto game_config_path = xe::join_paths(game_folder, config_name);
if (xe::filesystem::PathExists(game_config_path)) { if (xe::filesystem::PathExists(game_config_path)) {
ReadGameConfig(game_config_path); ReadGameConfig(game_config_path);
} }