From b1d3fd2ad3c201e287a4641ec143786629da3db7 Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Fri, 13 Mar 2020 09:42:29 +0300
Subject: [PATCH] [App/Config] Add storage_root cvar and make content_root
 inside it by default, move game configs from content

---
 src/xenia/app/xenia_main.cc | 57 ++++++++++++++++++++-----------------
 src/xenia/config.cc         |  6 ++--
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
index 69a756f05..492345d6a 100644
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -54,8 +54,17 @@ DEFINE_string(hid, "any", "Input system. Use: [any, nop, sdl, winkey, xinput]",
 
 DEFINE_bool(fullscreen, false, "Toggles fullscreen", "GPU");
 
-DEFINE_string(content_root, "", "Root path for content (save/etc) storage.",
-              "Storage");
+DEFINE_string(
+    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_cache, false, "Enable cache mount", "Storage");
@@ -201,36 +210,32 @@ int xenia_main(const std::vector<std::wstring>& args) {
   Profiler::Initialize();
   Profiler::ThreadEnter("main");
 
-  // Figure out where content should go.
-  std::wstring content_root = xe::to_wstring(cvars::content_root);
-  std::wstring config_folder;
-
-  if (content_root.empty()) {
-    auto base_path = xe::filesystem::GetExecutableFolder();
-    base_path = xe::to_absolute_path(base_path);
-
-    auto portable_path = xe::join_paths(base_path, L"portable.txt");
-    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");
+  // Figure out where internal files and content should go.
+  std::wstring storage_root = xe::to_wstring(cvars::storage_root);
+  if (storage_root.empty()) {
+    storage_root = xe::filesystem::GetExecutableFolder();
+    if (!xe::filesystem::PathExists(
+            xe::join_paths(storage_root, L"portable.txt"))) {
+      storage_root = xe::filesystem::GetUserFolder();
+#if defined(XE_PLATFORM_WIN32) || defined(XE_PLATFORM_LINUX)
+      storage_root = xe::join_paths(storage_root, L"Xenia");
 #else
-#warning Unhandled platform for content root.
-      content_root = xe::join_paths(content_root, L"Xenia");
+#warning Unhandled platform for the data root.
+      storage_root = xe::join_paths(storage_root, L"Xenia");
 #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());
-  config::SetupConfig(config_folder);
 
   if (cvars::discord) {
     discord::DiscordPresence::Initialize();
diff --git a/src/xenia/config.cc b/src/xenia/config.cc
index f07667673..92582d08b 100644
--- a/src/xenia/config.cc
+++ b/src/xenia/config.cc
@@ -24,6 +24,7 @@ namespace config {
 std::wstring config_name = L"xenia.config.toml";
 std::wstring config_folder;
 std::wstring config_path;
+std::wstring game_config_suffix = L".config.toml";
 
 bool sortCvar(cvar::IConfigVar* a, cvar::IConfigVar* b) {
   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) {
-  const auto content_folder = xe::join_paths(config_folder, L"content");
-  const auto game_folder = xe::join_paths(content_folder, title_id);
-  const auto game_config_path = xe::join_paths(game_folder, config_name);
+  const auto game_config_path = xe::join_paths(
+      xe::join_paths(config_folder, L"config"), title_id + game_config_suffix);
   if (xe::filesystem::PathExists(game_config_path)) {
     ReadGameConfig(game_config_path);
   }