aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/fs/fs_paths.h9
-rw-r--r--src/common/fs/path_util.cpp162
-rw-r--r--src/common/fs/path_util.h76
-rw-r--r--src/common/logging/backend.cpp2
-rw-r--r--src/common/nvidia_flags.cpp2
-rw-r--r--src/common/settings.cpp10
-rw-r--r--src/common/settings.h1
7 files changed, 186 insertions, 76 deletions
diff --git a/src/common/fs/fs_paths.h b/src/common/fs/fs_paths.h
index 5b9579ac29..c1e05577ff 100644
--- a/src/common/fs/fs_paths.h
+++ b/src/common/fs/fs_paths.h
@@ -1,11 +1,14 @@
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: Copyright 2025 eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
#pragma once
// yuzu data directories
-#define YUZU_DIR "yuzu"
+#define EDEN_DIR "eden"
#define PORTABLE_DIR "user"
// Sub-directories contained within a yuzu data directory
@@ -25,6 +28,10 @@
#define SHADER_DIR "shader"
#define TAS_DIR "tas"
#define ICONS_DIR "icons"
+#define CITRON_DIR "citron"
+#define SUDACHI_DIR "sudachi"
+#define YUZU_DIR "yuzu"
+#define SUYU_DIR "suyu"
// yuzu-specific files
diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp
index 4f69db6f5c..296ef69b30 100644
--- a/src/common/fs/path_util.cpp
+++ b/src/common/fs/path_util.cpp
@@ -1,7 +1,11 @@
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: Copyright 2025 eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
#include <algorithm>
+#include <iostream>
#include <sstream>
#include <unordered_map>
@@ -56,10 +60,10 @@ namespace fs = std::filesystem;
/**
* The PathManagerImpl is a singleton allowing to manage the mapping of
- * YuzuPath enums to real filesystem paths.
- * This class provides 2 functions: GetYuzuPathImpl and SetYuzuPathImpl.
- * These are used by GetYuzuPath and SetYuzuPath respectively to get or modify
- * the path mapped by the YuzuPath enum.
+ * EdenPath enums to real filesystem paths.
+ * This class provides 2 functions: GetEdenPathImpl and SetEdenPathImpl.
+ * These are used by GetEdenPath and SetEdenPath respectively to get or modify
+ * the path mapped by the EdenPath enum.
*/
class PathManagerImpl {
public:
@@ -75,62 +79,99 @@ public:
PathManagerImpl(PathManagerImpl&&) = delete;
PathManagerImpl& operator=(PathManagerImpl&&) = delete;
- [[nodiscard]] const fs::path& GetYuzuPathImpl(YuzuPath yuzu_path) {
- return yuzu_paths.at(yuzu_path);
+ [[nodiscard]] const fs::path& GetEdenPathImpl(EdenPath eden_path) {
+ return eden_paths.at(eden_path);
+ }
+
+ [[nodiscard]] const fs::path& GetLegacyPathImpl(LegacyPath legacy_path) {
+ return legacy_paths.at(legacy_path);
}
- void SetYuzuPathImpl(YuzuPath yuzu_path, const fs::path& new_path) {
- yuzu_paths.insert_or_assign(yuzu_path, new_path);
+ void CreateEdenPaths() {
+ std::for_each(eden_paths.begin(), eden_paths.end(), [](auto &path) {
+ void(FS::CreateDir(path.second));
+ });
}
- void Reinitialize(fs::path yuzu_path = {}) {
- fs::path yuzu_path_cache;
- fs::path yuzu_path_config;
+ void SetEdenPathImpl(EdenPath eden_path, const fs::path& new_path) {
+ eden_paths.insert_or_assign(eden_path, new_path);
+ }
+
+ void SetLegacyPathImpl(LegacyPath legacy_path, const fs::path& new_path) {
+ legacy_paths.insert_or_assign(legacy_path, new_path);
+ }
+
+ void Reinitialize(fs::path eden_path = {}) {
+ fs::path eden_path_cache;
+ fs::path eden_path_config;
#ifdef _WIN32
#ifdef YUZU_ENABLE_PORTABLE
- yuzu_path = GetExeDirectory() / PORTABLE_DIR;
+ eden_path = GetExeDirectory() / PORTABLE_DIR;
#endif
- if (!IsDir(yuzu_path)) {
- yuzu_path = GetAppDataRoamingDirectory() / YUZU_DIR;
+ if (!IsDir(eden_path)) {
+ eden_path = GetAppDataRoamingDirectory() / EDEN_DIR;
}
- yuzu_path_cache = yuzu_path / CACHE_DIR;
- yuzu_path_config = yuzu_path / CONFIG_DIR;
+ eden_path_cache = eden_path / CACHE_DIR;
+ eden_path_config = eden_path / CONFIG_DIR;
+
+#define LEGACY_PATH(titleName, upperName) GenerateLegacyPath(LegacyPath::titleName##Dir, GetAppDataRoamingDirectory() / upperName##_DIR); \
+ GenerateLegacyPath(LegacyPath::titleName##ConfigDir, GetAppDataRoamingDirectory() / upperName##_DIR / CONFIG_DIR); \
+ GenerateLegacyPath(LegacyPath::titleName##CacheDir, GetAppDataRoamingDirectory() / upperName##_DIR / CACHE_DIR);
+
+ LEGACY_PATH(Citron, CITRON)
+ LEGACY_PATH(Sudachi, SUDACHI)
+ LEGACY_PATH(Yuzu, YUZU)
+ LEGACY_PATH(Suyu, SUYU)
+#undef LEGACY_PATH
+
#elif ANDROID
- ASSERT(!yuzu_path.empty());
- yuzu_path_cache = yuzu_path / CACHE_DIR;
- yuzu_path_config = yuzu_path / CONFIG_DIR;
+ ASSERT(!eden_path.empty());
+ eden_path_cache = eden_path / CACHE_DIR;
+ eden_path_config = eden_path / CONFIG_DIR;
#else
#ifdef YUZU_ENABLE_PORTABLE
- yuzu_path = GetCurrentDir() / PORTABLE_DIR;
+ eden_path = GetCurrentDir() / PORTABLE_DIR;
#endif
- if (Exists(yuzu_path) && IsDir(yuzu_path)) {
- yuzu_path_cache = yuzu_path / CACHE_DIR;
- yuzu_path_config = yuzu_path / CONFIG_DIR;
+ if (Exists(eden_path) && IsDir(eden_path)) {
+ eden_path_cache = eden_path / CACHE_DIR;
+ eden_path_config = eden_path / CONFIG_DIR;
} else {
- yuzu_path = GetDataDirectory("XDG_DATA_HOME") / YUZU_DIR;
- yuzu_path_cache = GetDataDirectory("XDG_CACHE_HOME") / YUZU_DIR;
- yuzu_path_config = GetDataDirectory("XDG_CONFIG_HOME") / YUZU_DIR;
+ eden_path = GetDataDirectory("XDG_DATA_HOME") / EDEN_DIR;
+ eden_path_cache = GetDataDirectory("XDG_CACHE_HOME") / EDEN_DIR;
+ eden_path_config = GetDataDirectory("XDG_CONFIG_HOME") / EDEN_DIR;
}
+
+#define LEGACY_PATH(titleName, upperName) GenerateLegacyPath(LegacyPath::titleName##Dir, GetDataDirectory("XDG_DATA_HOME") / upperName##_DIR); \
+ GenerateLegacyPath(LegacyPath::titleName##ConfigDir, GetDataDirectory("XDG_CONFIG_HOME") / upperName##_DIR); \
+ GenerateLegacyPath(LegacyPath::titleName##CacheDir, GetDataDirectory("XDG_CACHE_HOME") / upperName##_DIR);
+
+ LEGACY_PATH(Citron, CITRON)
+ LEGACY_PATH(Sudachi, SUDACHI)
+ LEGACY_PATH(Yuzu, YUZU)
+ LEGACY_PATH(Suyu, SUYU)
+
+#undef LEGACY_PATH
+
#endif
- GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path);
- GenerateYuzuPath(YuzuPath::AmiiboDir, yuzu_path / AMIIBO_DIR);
- GenerateYuzuPath(YuzuPath::CacheDir, yuzu_path_cache);
- GenerateYuzuPath(YuzuPath::ConfigDir, yuzu_path_config);
- GenerateYuzuPath(YuzuPath::CrashDumpsDir, yuzu_path / CRASH_DUMPS_DIR);
- GenerateYuzuPath(YuzuPath::DumpDir, yuzu_path / DUMP_DIR);
- GenerateYuzuPath(YuzuPath::KeysDir, yuzu_path / KEYS_DIR);
- GenerateYuzuPath(YuzuPath::LoadDir, yuzu_path / LOAD_DIR);
- GenerateYuzuPath(YuzuPath::LogDir, yuzu_path / LOG_DIR);
- GenerateYuzuPath(YuzuPath::NANDDir, yuzu_path / NAND_DIR);
- GenerateYuzuPath(YuzuPath::PlayTimeDir, yuzu_path / PLAY_TIME_DIR);
- GenerateYuzuPath(YuzuPath::ScreenshotsDir, yuzu_path / SCREENSHOTS_DIR);
- GenerateYuzuPath(YuzuPath::SDMCDir, yuzu_path / SDMC_DIR);
- GenerateYuzuPath(YuzuPath::ShaderDir, yuzu_path / SHADER_DIR);
- GenerateYuzuPath(YuzuPath::TASDir, yuzu_path / TAS_DIR);
- GenerateYuzuPath(YuzuPath::IconsDir, yuzu_path / ICONS_DIR);
+ GenerateEdenPath(EdenPath::EdenDir, eden_path);
+ GenerateEdenPath(EdenPath::AmiiboDir, eden_path / AMIIBO_DIR);
+ GenerateEdenPath(EdenPath::CacheDir, eden_path_cache);
+ GenerateEdenPath(EdenPath::ConfigDir, eden_path_config);
+ GenerateEdenPath(EdenPath::CrashDumpsDir, eden_path / CRASH_DUMPS_DIR);
+ GenerateEdenPath(EdenPath::DumpDir, eden_path / DUMP_DIR);
+ GenerateEdenPath(EdenPath::KeysDir, eden_path / KEYS_DIR);
+ GenerateEdenPath(EdenPath::LoadDir, eden_path / LOAD_DIR);
+ GenerateEdenPath(EdenPath::LogDir, eden_path / LOG_DIR);
+ GenerateEdenPath(EdenPath::NANDDir, eden_path / NAND_DIR);
+ GenerateEdenPath(EdenPath::PlayTimeDir, eden_path / PLAY_TIME_DIR);
+ GenerateEdenPath(EdenPath::ScreenshotsDir, eden_path / SCREENSHOTS_DIR);
+ GenerateEdenPath(EdenPath::SDMCDir, eden_path / SDMC_DIR);
+ GenerateEdenPath(EdenPath::ShaderDir, eden_path / SHADER_DIR);
+ GenerateEdenPath(EdenPath::TASDir, eden_path / TAS_DIR);
+ GenerateEdenPath(EdenPath::IconsDir, eden_path / ICONS_DIR);
}
private:
@@ -140,13 +181,17 @@ private:
~PathManagerImpl() = default;
- void GenerateYuzuPath(YuzuPath yuzu_path, const fs::path& new_path) {
- void(FS::CreateDir(new_path));
+ void GenerateEdenPath(EdenPath eden_path, const fs::path& new_path) {
+ // Defer path creation
+ SetEdenPathImpl(eden_path, new_path);
+ }
- SetYuzuPathImpl(yuzu_path, new_path);
+ void GenerateLegacyPath(LegacyPath legacy_path, const fs::path& new_path) {
+ SetLegacyPathImpl(legacy_path, new_path);
}
- std::unordered_map<YuzuPath, fs::path> yuzu_paths;
+ std::unordered_map<EdenPath, fs::path> eden_paths;
+ std::unordered_map<LegacyPath, fs::path> legacy_paths;
};
bool ValidatePath(const fs::path& path) {
@@ -230,22 +275,35 @@ void SetAppDirectory(const std::string& app_directory) {
PathManagerImpl::GetInstance().Reinitialize(app_directory);
}
-const fs::path& GetYuzuPath(YuzuPath yuzu_path) {
- return PathManagerImpl::GetInstance().GetYuzuPathImpl(yuzu_path);
+const fs::path& GetEdenPath(EdenPath eden_path) {
+ return PathManagerImpl::GetInstance().GetEdenPathImpl(eden_path);
+}
+
+const std::filesystem::path& GetLegacyPath(LegacyPath legacy_path) {
+ return PathManagerImpl::GetInstance().GetLegacyPathImpl(legacy_path);
+}
+
+std::string GetEdenPathString(EdenPath eden_path) {
+ return PathToUTF8String(GetEdenPath(eden_path));
}
-std::string GetYuzuPathString(YuzuPath yuzu_path) {
- return PathToUTF8String(GetYuzuPath(yuzu_path));
+std::string GetLegacyPathString(LegacyPath legacy_path) {
+ return PathToUTF8String(GetLegacyPath(legacy_path));
}
-void SetYuzuPath(YuzuPath yuzu_path, const fs::path& new_path) {
+void SetEdenPath(EdenPath eden_path, const fs::path& new_path) {
if (!FS::IsDir(new_path)) {
LOG_ERROR(Common_Filesystem, "Filesystem object at new_path={} is not a directory",
PathToUTF8String(new_path));
return;
}
- PathManagerImpl::GetInstance().SetYuzuPathImpl(yuzu_path, new_path);
+ PathManagerImpl::GetInstance().SetEdenPathImpl(eden_path, new_path);
+}
+
+void CreateEdenPaths()
+{
+ PathManagerImpl::GetInstance().CreateEdenPaths();
}
#ifdef _WIN32
diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h
index 59301e7edd..1dd95391f7 100644
--- a/src/common/fs/path_util.h
+++ b/src/common/fs/path_util.h
@@ -1,6 +1,9 @@
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: Copyright 2025 eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
#pragma once
#include <filesystem>
@@ -10,8 +13,8 @@
namespace Common::FS {
-enum class YuzuPath {
- YuzuDir, // Where yuzu stores its data.
+enum class EdenPath {
+ EdenDir, // Where yuzu stores its data.
AmiiboDir, // Where Amiibo backups are stored.
CacheDir, // Where cached filesystem data is stored.
ConfigDir, // Where config files are stored.
@@ -29,6 +32,24 @@ enum class YuzuPath {
IconsDir, // Where Icons for Windows shortcuts are stored.
};
+enum LegacyPath {
+ CitronDir, // Citron Directories for migration
+ CitronConfigDir,
+ CitronCacheDir,
+
+ SudachiDir, // Sudachi Directories for migration
+ SudachiConfigDir,
+ SudachiCacheDir,
+
+ YuzuDir, // Yuzu Directories for migration
+ YuzuConfigDir,
+ YuzuCacheDir,
+
+ SuyuDir, // Suyu Directories for migration
+ SuyuConfigDir,
+ SuyuCacheDir,
+};
+
/**
* Validates a given path.
*
@@ -193,39 +214,62 @@ template <typename Path>
void SetAppDirectory(const std::string& app_directory);
/**
- * Gets the filesystem path associated with the YuzuPath enum.
+ * Gets the filesystem path associated with the EdenPath enum.
*
- * @param yuzu_path YuzuPath enum
+ * @param eden_path EdenPath enum
*
- * @returns The filesystem path associated with the YuzuPath enum.
+ * @returns The filesystem path associated with the EdenPath enum.
*/
-[[nodiscard]] const std::filesystem::path& GetYuzuPath(YuzuPath yuzu_path);
+[[nodiscard]] const std::filesystem::path& GetEdenPath(EdenPath eden_path);
/**
- * Gets the filesystem path associated with the YuzuPath enum as a UTF-8 encoded std::string.
+ * Gets the filesystem path associated with the LegacyPath enum.
*
- * @param yuzu_path YuzuPath enum
+ * @param legacy_path LegacyPath enum
*
- * @returns The filesystem path associated with the YuzuPath enum as a UTF-8 encoded std::string.
+ * @returns The filesystem path associated with the LegacyPath enum.
*/
-[[nodiscard]] std::string GetYuzuPathString(YuzuPath yuzu_path);
+[[nodiscard]] const std::filesystem::path& GetLegacyPath(LegacyPath legacy_path);
/**
- * Sets a new filesystem path associated with the YuzuPath enum.
+ * Gets the filesystem path associated with the EdenPath enum as a UTF-8 encoded std::string.
+ *
+ * @param eden_path EdenPath enum
+ *
+ * @returns The filesystem path associated with the EdenPath enum as a UTF-8 encoded std::string.
+ */
+[[nodiscard]] std::string GetEdenPathString(EdenPath eden_path);
+
+/**
+ * Gets the filesystem path associated with the LegacyPath enum as a UTF-8 encoded std::string.
+ *
+ * @param legacy_path LegacyPath enum
+ *
+ * @returns The filesystem path associated with the LegacyPath enum as a UTF-8 encoded std::string.
+ */
+[[nodiscard]] std::string GetLegacyPathString(LegacyPath legacy_path);
+
+/**
+ * Sets a new filesystem path associated with the EdenPath enum.
* If the filesystem object at new_path is not a directory, this function will not do anything.
*
- * @param yuzu_path YuzuPath enum
+ * @param eden_path EdenPath enum
* @param new_path New filesystem path
*/
-void SetYuzuPath(YuzuPath yuzu_path, const std::filesystem::path& new_path);
+void SetEdenPath(EdenPath eden_path, const std::filesystem::path& new_path);
+
+/**
+ * Creates all necessary Eden paths in the filesystem.
+ */
+void CreateEdenPaths();
#ifdef _WIN32
template <typename Path>
-void SetYuzuPath(YuzuPath yuzu_path, const Path& new_path) {
+void SetEdenPath(EdenPath eden_path, const Path& new_path) {
if constexpr (IsChar<typename Path::value_type>) {
- SetYuzuPath(yuzu_path, ToU8String(new_path));
+ SetEdenPath(eden_path, ToU8String(new_path));
} else {
- SetYuzuPath(yuzu_path, std::filesystem::path{new_path});
+ SetEdenPath(eden_path, std::filesystem::path{new_path});
}
}
#endif
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 3b400c6566..e5bf6b723a 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -200,7 +200,7 @@ public:
return;
}
using namespace Common::FS;
- const auto& log_dir = GetYuzuPath(YuzuPath::LogDir);
+ const auto& log_dir = GetEdenPath(EdenPath::LogDir);
void(CreateDir(log_dir));
Filter filter;
filter.ParseFilterString(Settings::values.log_filter.GetValue());
diff --git a/src/common/nvidia_flags.cpp b/src/common/nvidia_flags.cpp
index 5e44c0c6ca..baca31b0ac 100644
--- a/src/common/nvidia_flags.cpp
+++ b/src/common/nvidia_flags.cpp
@@ -14,7 +14,7 @@ namespace Common {
void ConfigureNvidiaEnvironmentFlags() {
#ifdef _WIN32
const auto nvidia_shader_dir =
- Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir) / "nvidia";
+ Common::FS::GetEdenPath(Common::FS::EdenPath::ShaderDir) / "nvidia";
if (!Common::FS::CreateDirs(nvidia_shader_dir)) {
return;
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index ee7074b128..cb6431d536 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -131,11 +131,11 @@ void LogSettings() {
log_setting(name, setting->Canonicalize());
}
}
- log_path("DataStorage_CacheDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir));
- log_path("DataStorage_ConfigDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir));
- log_path("DataStorage_LoadDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::LoadDir));
- log_path("DataStorage_NANDDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir));
- log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
+ log_path("DataStorage_CacheDir", Common::FS::GetEdenPath(Common::FS::EdenPath::CacheDir));
+ log_path("DataStorage_ConfigDir", Common::FS::GetEdenPath(Common::FS::EdenPath::ConfigDir));
+ log_path("DataStorage_LoadDir", Common::FS::GetEdenPath(Common::FS::EdenPath::LoadDir));
+ log_path("DataStorage_NANDDir", Common::FS::GetEdenPath(Common::FS::EdenPath::NANDDir));
+ log_path("DataStorage_SDMCDir", Common::FS::GetEdenPath(Common::FS::EdenPath::SDMCDir));
}
void UpdateGPUAccuracy() {
diff --git a/src/common/settings.h b/src/common/settings.h
index 709ca03e7c..47dc65afa8 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -629,6 +629,7 @@ struct Values {
Setting<std::string> log_filter{linkage, "*:Info", "log_filter", Category::Miscellaneous};
Setting<bool> log_flush_lines{linkage, false, "flush_lines", Category::Miscellaneous};
Setting<bool> use_dev_keys{linkage, false, "use_dev_keys", Category::Miscellaneous};
+ Setting<bool> first_launch{linkage, true, "first_launch", Category::Miscellaneous};
// Network
Setting<std::string> network_interface{linkage, std::string(), "network_interface",
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-04 04:13:22 +0000