refactor: tweak the user paths for macOS/Linux

project-slippi · Oct 3, 2023 · 51e8e6d · 51e8e6d
1 parent 728f98f
commit 51e8e6d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
@@ -21,8 +21,8 @@
 #else
 #define USERDATA_DIR "user"
 #define DOLPHIN_DATA_DIR "SlippiOnline"
-#define NETPLAY_USER_DIR "slippi-netplay-beta"
-#define PLAYBACK_USER_DIR "slippi-playback-beta"
+#define NETPLAY_USER_DIR "slippi-dolphin/netplay-beta"
+#define PLAYBACK_USER_DIR "slippi-dolphin/playback-beta"
 #define NORMAL_USER_DIR "dolphin-emu"
 #endif
 #else  // ifndef STEAM

diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
@@ -758,7 +758,7 @@ std::string GetBundleDirectory()
 std::string GetApplicationSupportDirectory()
 {
   std::string dir =
-      File::GetHomeDirectory() + "/Library/Application Support/com.project-slippi.dolphin-beta";
+      File::GetHomeDirectory() + "/Library/Application Support/com.project-slippi.dolphin";
 
   if (!CreateDir(dir))
   {

diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
@@ -414,9 +414,9 @@ void SetUserDirectory(std::string custom_path)
     // we'll just have a netplay and playback folder inside the identifer similar to how
     // the Launcher does it to keep with some convention.
 #ifdef IS_PLAYBACK
-    user_path = File::GetApplicationSupportDirectory() + "/playback/User" DIR_SEP;
+    user_path = File::GetApplicationSupportDirectory() + "/playback-beta/User" DIR_SEP;
 #else
-    user_path = File::GetApplicationSupportDirectory() + "/netplay/User" DIR_SEP;
+    user_path = File::GetApplicationSupportDirectory() + "/netplay-beta/User" DIR_SEP;
 #endif
 #elif defined(ANDROID)
     if (env_path)