Fall back to $HOME/.fex-emu if it exists

Signed-off-by: crueter <[email protected]>

Author: crueter

Source/Common/Config.cpp

@@ -556,23 +556,29 @@ fextl::string GetDataDirectory(bool Global, const PortableInformation& PortableI
     return fextl::fmt::format("{}/fex-emu/", PortableInfo.InterpreterPath);
   }
 
-  fextl::string DataDir {};
   if (Global) {
-    DataDir = GLOBAL_DATA_DIRECTORY;
-  } else {
-    const char* HomeDir = GetHomeDirectory();
-    const char* DataXDG = getenv("XDG_DATA_HOME");
+    return GLOBAL_DATA_DIRECTORY;
+  }
 
-    // use ~/.local/share if XDG_DATA_HOME is unset
-    const std::string fallback = fmt::format("{}/.local/share", HomeDir);
+  const char* HomeDir = GetHomeDirectory();
+  const char* DataXDG = getenv("XDG_DATA_HOME");
+  const fextl::string LegacyDir = fextl::string {HomeDir} + "/.fex-emu";
 
-    if (DataOverride) {
-      // Data override will override the complete directory
-      DataDir = DataOverride;
-    } else {
-      DataDir = DataXDG ? DataXDG : fallback;
-      DataDir += "/fex-emu/";
-    }
+  // If $HOME/.fex-emu exists, use that
+  if (FHU::Filesystem::Exists(LegacyDir)) {
+    return LegacyDir;
+  }
+
+  // use ~/.local/share if XDG_DATA_HOME is unset
+  const std::string fallback = fmt::format("{}/.local/share", HomeDir);
+
+  fextl::string DataDir {};
+  if (DataOverride) {
+    // Data override will override the complete directory
+    DataDir = DataOverride;
+  } else {
+    DataDir = DataXDG ? DataXDG : fallback;
+    DataDir += "/fex-emu/";
   }
 
   return DataDir;
@@ -600,23 +606,31 @@ fextl::string GetConfigDirectory(bool Global, const PortableInformation& Portabl
 
   fextl::string ConfigDir;
   if (Global) {
-    ConfigDir = GLOBAL_DATA_DIRECTORY;
-  } else {
-    const char* HomeDir = GetHomeDirectory();
-    const char* ConfigXDG = getenv("XDG_CONFIG_HOME");
+    return GLOBAL_DATA_DIRECTORY;
+  }
 
-    // use ~/.config if XDG_CONFIG_HOME is unset
-    const std::string fallback = fmt::format("{}/.config", HomeDir);
+  const char* HomeDir = GetHomeDirectory();
+  const char* ConfigXDG = getenv("XDG_CONFIG_HOME");
 
-    if (ConfigOverride) {
-      // Config override will override the complete directory
-      ConfigDir = ConfigOverride;
-    } else {
-      ConfigDir = ConfigXDG ? ConfigXDG : fallback;
-      ConfigDir += "/fex-emu/";
-    }
+  const fextl::string LegacyDir = fextl::string {HomeDir} + "/.fex-emu";
+
+  // If $HOME/.fex-emu exists, use that
+  if (FHU::Filesystem::Exists(LegacyDir)) {
+    return LegacyDir;
+  }
+
+  // use ~/.config if XDG_CONFIG_HOME is unset
+  const std::string fallback = fmt::format("{}/.config", HomeDir);
+
+  if (ConfigOverride) {
+    // Config override will override the complete directory
+    ConfigDir = ConfigOverride;
+  } else {
+    ConfigDir = ConfigXDG ? ConfigXDG : fallback;
+    ConfigDir += "/fex-emu/";
   }
 
+
   return ConfigDir;
 }
 
@@ -638,6 +652,13 @@ fextl::string GetCacheDirectory() {
   const char* HomeDir = GetHomeDirectory();
   const char* CacheXDG = getenv("XDG_CACHE_HOME");
 
+  const fextl::string LegacyDir = fextl::string {HomeDir} + "/.fex-emu";
+
+  // If $HOME/.fex-emu exists, use that
+  if (FHU::Filesystem::Exists(LegacyDir)) {
+    return LegacyDir;
+  }
+
   // use ~/.cache if XDG_CACHE_HOME is unset
   const std::string fallback = fmt::format("{}/.cache", HomeDir);