preserve-emulation/RMG
1
0
Fork 0
mirror of https://github.com/Rosalie241/RMG.git synced 2026-07-11 01:24:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

RMG-Core: remove user directories override settings

Browse Source
This commit is contained in:
Rosalie Wanders
2025-10-11 21:40:15 +02:00
parent 5732775246
commit d577dd4194
5 changed files with 33 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/RMG-Core/Core.cpp
+2 -12
View File
@@ -55,18 +55,8 @@ static bool config_override_user_dirs(void)
{
std::string error;
m64p_error ret;
std::string dataDir;
std::string cacheDir;
bool overrideUserDirs;
dataDir = CoreSettingsGetStringValue(SettingsID::Core_UserDataDirOverride);
cacheDir = CoreSettingsGetStringValue(SettingsID::Core_UserCacheDirOverride);
overrideUserDirs = CoreSettingsGetBoolValue(SettingsID::Core_OverrideUserDirs);
if (!overrideUserDirs)
{
return true;
}
const std::string dataDir = CoreGetUserDataDirectory().string();
const std::string cacheDir = CoreGetUserCacheDirectory().string();
ret = m64p::Config.OverrideUserPaths(dataDir.c_str(), cacheDir.c_str());
if (ret != M64ERR_SUCCESS)
Source/RMG-Core/Directories.cpp
+31 -51
View File
@@ -296,47 +296,6 @@ CORE_EXPORT std::filesystem::path CoreGetUserConfigDirectory(void)
return directory.make_preferred();
}
CORE_EXPORT std::filesystem::path CoreGetDefaultUserDataDirectory(void)
{
std::filesystem::path directory;
#ifdef PORTABLE_INSTALL
if (CoreGetPortableDirectoryMode())
{
directory = "Data";
}
else
#endif // PORTABLE_INSTALL
{
#ifdef _WIN32
directory = get_appdata_directory("Data");
#else
directory = get_var_directory("XDG_DATA_HOME", "/RMG", "HOME", "/.local/share/RMG");
#endif // _WIN32
}
return directory.make_preferred();
}
CORE_EXPORT std::filesystem::path CoreGetDefaultUserCacheDirectory(void)
{
std::filesystem::path directory;
#ifdef PORTABLE_INSTALL
if (CoreGetPortableDirectoryMode())
{
directory = "Cache";
}
else
#endif // PORTABLE_INSTALL
{
#ifdef _WIN32
directory = get_appdata_directory("Cache");
#else
directory = get_var_directory("XDG_CACHE_HOME", "/RMG", "HOME", "/.cache/RMG");
#endif // _WIN32
}
return directory.make_preferred();
}
CORE_EXPORT std::filesystem::path CoreGetDefaultSaveDirectory(void)
{
std::filesystem::path directory;
@@ -352,7 +311,7 @@ CORE_EXPORT std::filesystem::path CoreGetDefaultSaveDirectory(void)
directory = get_appdata_directory("Save/Game");
#else
directory = CoreGetDefaultUserDataDirectory();
directory = CoreGetUserDataDirectory();
directory += "/Save/Game";
#endif // _WIN32
}
@@ -374,7 +333,7 @@ CORE_EXPORT std::filesystem::path CoreGetDefaultSaveStateDirectory(void)
directory = get_appdata_directory("Save/State");
#else
directory = CoreGetDefaultUserDataDirectory();
directory = CoreGetUserDataDirectory();
directory += "/Save/State";
#endif // _WIN32
}
@@ -396,7 +355,7 @@ CORE_EXPORT std::filesystem::path CoreGetDefaultScreenshotDirectory(void)
directory = get_appdata_directory("Screenshots");
#else
directory = CoreGetDefaultUserDataDirectory();
directory = CoreGetUserDataDirectory();
directory += "/Screenshots";
#endif // _WIN32
}
@@ -405,22 +364,43 @@ CORE_EXPORT std::filesystem::path CoreGetDefaultScreenshotDirectory(void)
CORE_EXPORT std::filesystem::path CoreGetUserDataDirectory(void)
{
if (!m64p::Config.IsHooked())
std::filesystem::path directory;
#ifdef PORTABLE_INSTALL
if (CoreGetPortableDirectoryMode())
{
return std::filesystem::path();
directory = "Data";
}
return std::filesystem::path(m64p::Config.GetUserDataPath());
else
#endif // PORTABLE_INSTALL
{
#ifdef _WIN32
directory = get_appdata_directory("Data");
#else
directory = get_var_directory("XDG_DATA_HOME", "/RMG", "HOME", "/.local/share/RMG");
#endif // _WIN32
}
return directory.make_preferred();
}
CORE_EXPORT std::filesystem::path CoreGetUserCacheDirectory(void)
{
if (!m64p::Config.IsHooked())
std::filesystem::path directory;
#ifdef PORTABLE_INSTALL
if (CoreGetPortableDirectoryMode())
{
return std::filesystem::path();
directory = "Cache";
}
else
#endif // PORTABLE_INSTALL
{
#ifdef _WIN32
directory = get_appdata_directory("Cache");
return std::filesystem::path(m64p::Config.GetUserCachePath());
#else
directory = get_var_directory("XDG_CACHE_HOME", "/RMG", "HOME", "/.cache/RMG");
#endif // _WIN32
}
return directory.make_preferred();
}
CORE_EXPORT std::filesystem::path CoreGetSharedDataDirectory(void)
Source/RMG-Core/Directories.hpp
-8
View File
@@ -40,14 +40,6 @@ std::filesystem::path CoreGetLibraryDirectory(void);
// plugins should be located
std::filesystem::path CoreGetPluginDirectory(void);
// returns the default user data directory where
// data files should be located
std::filesystem::path CoreGetDefaultUserDataDirectory(void);
// returns the default user cache directory where
// cache files should be located
std::filesystem::path CoreGetDefaultUserCacheDirectory(void);
// returns the default save directory where
// game saves should be located
std::filesystem::path CoreGetDefaultSaveDirectory(void);
Source/RMG-Core/Settings.cpp
-10
View File
@@ -214,16 +214,6 @@ static l_Setting get_setting(SettingsID settingId)
};
break;
case SettingsID::Core_OverrideUserDirs:
setting = {SETTING_SECTION_CORE, "OverrideUserDirectories", true};
break;
case SettingsID::Core_UserDataDirOverride:
setting = {SETTING_SECTION_CORE, "UserDataDirectory", CoreGetDefaultUserDataDirectory().string()};
break;
case SettingsID::Core_UserCacheDirOverride:
setting = {SETTING_SECTION_CORE, "UserCacheDirectory", CoreGetDefaultUserCacheDirectory().string()};
break;
case SettingsID::Core_OverrideGameSpecificSettings:
setting = {SETTING_SECTION_CORE, "OverrideGameSpecificSettings", false};
break;
Source/RMG-Core/Settings.hpp
-5
View File
@@ -54,11 +54,6 @@ enum class SettingsID
Core_INPUT_Plugin,
Core_RSP_Plugin,
// Core User Directory Settings
Core_OverrideUserDirs,
Core_UserDataDirOverride,
Core_UserCacheDirOverride,
// Core 64DD ROM Settings
Core_64DD_JapaneseIPL,
Core_64DD_AmericanIPL,