JJBanana13/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2026-04-29 05:32:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into 'dev'"

Browse Source 
This reverts merge request !17
This commit is contained in:
Crimson Hawk
2024-03-06 05:26:38 +00:00
parent fdadc50fff
commit cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/fs/file.cpp
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <vector>

2
src/common/fs/file.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

2
src/common/fs/fs.cpp
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "common/fs/file.h"

2
src/common/fs/fs.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

2
src/common/fs/fs_android.cpp
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "common/android/android_common.h"

2
src/common/fs/fs_android.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2023 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

10
src/common/fs/fs_paths.h
View File

@@ -1,14 +1,14 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
// suyu data directories
// yuzu data directories
#define suyu_DIR "suyu"
#define YUZU_DIR "suyu"
#define PORTABLE_DIR "user"
// Sub-directories contained within a suyu data directory
// Sub-directories contained within a yuzu data directory
#define AMIIBO_DIR "amiibo"
#define CACHE_DIR "cache"
@@ -26,6 +26,6 @@
#define TAS_DIR "tas"
#define ICONS_DIR "icons"
// suyu-specific files
// yuzu-specific files
#define LOG_FILE "suyu_log.txt"

2
src/common/fs/fs_types.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

2
src/common/fs/fs_util.cpp
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <algorithm>

2
src/common/fs/fs_util.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

108
src/common/fs/path_util.cpp
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <algorithm>
@@ -56,10 +56,10 @@ namespace fs = std::filesystem;
/**
* The PathManagerImpl is a singleton allowing to manage the mapping of
* suyuPath enums to real filesystem paths.
* This class provides 2 functions: GetsuyuPathImpl and SetsuyuPathImpl.
* These are used by GetsuyuPath and SetsuyuPath respectively to get or modify
* the path mapped by the suyuPath enum.
* 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.
*/
class PathManagerImpl {
public:
@@ -75,62 +75,62 @@ public:
PathManagerImpl(PathManagerImpl&&) = delete;
PathManagerImpl& operator=(PathManagerImpl&&) = delete;
[[nodiscard]] const fs::path& GetsuyuPathImpl(suyuPath suyu_path) {
return suyu_paths.at(suyu_path);
[[nodiscard]] const fs::path& GetYuzuPathImpl(YuzuPath yuzu_path) {
return yuzu_paths.at(yuzu_path);
}
void SetsuyuPathImpl(suyuPath suyu_path, const fs::path& new_path) {
suyu_paths.insert_or_assign(suyu_path, new_path);
void SetYuzuPathImpl(YuzuPath yuzu_path, const fs::path& new_path) {
yuzu_paths.insert_or_assign(yuzu_path, new_path);
}
void Reinitialize(fs::path suyu_path = {}) {
fs::path suyu_path_cache;
fs::path suyu_path_config;
void Reinitialize(fs::path yuzu_path = {}) {
fs::path yuzu_path_cache;
fs::path yuzu_path_config;
#ifdef _WIN32
#ifdef suyu_ENABLE_PORTABLE
suyu_path = GetExeDirectory() / PORTABLE_DIR;
#ifdef YUZU_ENABLE_PORTABLE
yuzu_path = GetExeDirectory() / PORTABLE_DIR;
#endif
if (!IsDir(suyu_path)) {
suyu_path = GetAppDataRoamingDirectory() / suyu_DIR;
if (!IsDir(yuzu_path)) {
yuzu_path = GetAppDataRoamingDirectory() / YUZU_DIR;
}
suyu_path_cache = suyu_path / CACHE_DIR;
suyu_path_config = suyu_path / CONFIG_DIR;
yuzu_path_cache = yuzu_path / CACHE_DIR;
yuzu_path_config = yuzu_path / CONFIG_DIR;
#elif ANDROID
ASSERT(!suyu_path.empty());
suyu_path_cache = suyu_path / CACHE_DIR;
suyu_path_config = suyu_path / CONFIG_DIR;
ASSERT(!yuzu_path.empty());
yuzu_path_cache = yuzu_path / CACHE_DIR;
yuzu_path_config = yuzu_path / CONFIG_DIR;
#else
#ifdef suyu_ENABLE_PORTABLE
suyu_path = GetCurrentDir() / PORTABLE_DIR;
#ifdef YUZU_ENABLE_PORTABLE
yuzu_path = GetCurrentDir() / PORTABLE_DIR;
#endif
if (Exists(suyu_path) && IsDir(suyu_path)) {
suyu_path_cache = suyu_path / CACHE_DIR;
suyu_path_config = suyu_path / CONFIG_DIR;
if (Exists(yuzu_path) && IsDir(yuzu_path)) {
yuzu_path_cache = yuzu_path / CACHE_DIR;
yuzu_path_config = yuzu_path / CONFIG_DIR;
} else {
suyu_path = GetDataDirectory("XDG_DATA_HOME") / suyu_DIR;
suyu_path_cache = GetDataDirectory("XDG_CACHE_HOME") / suyu_DIR;
suyu_path_config = GetDataDirectory("XDG_CONFIG_HOME") / suyu_DIR;
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;
}
#endif
GeneratesuyuPath(suyuPath::suyuDir, suyu_path);
GeneratesuyuPath(suyuPath::AmiiboDir, suyu_path / AMIIBO_DIR);
GeneratesuyuPath(suyuPath::CacheDir, suyu_path_cache);
GeneratesuyuPath(suyuPath::ConfigDir, suyu_path_config);
GeneratesuyuPath(suyuPath::CrashDumpsDir, suyu_path / CRASH_DUMPS_DIR);
GeneratesuyuPath(suyuPath::DumpDir, suyu_path / DUMP_DIR);
GeneratesuyuPath(suyuPath::KeysDir, suyu_path / KEYS_DIR);
GeneratesuyuPath(suyuPath::LoadDir, suyu_path / LOAD_DIR);
GeneratesuyuPath(suyuPath::LogDir, suyu_path / LOG_DIR);
GeneratesuyuPath(suyuPath::NANDDir, suyu_path / NAND_DIR);
GeneratesuyuPath(suyuPath::PlayTimeDir, suyu_path / PLAY_TIME_DIR);
GeneratesuyuPath(suyuPath::ScreenshotsDir, suyu_path / SCREENSHOTS_DIR);
GeneratesuyuPath(suyuPath::SDMCDir, suyu_path / SDMC_DIR);
GeneratesuyuPath(suyuPath::ShaderDir, suyu_path / SHADER_DIR);
GeneratesuyuPath(suyuPath::TASDir, suyu_path / TAS_DIR);
GeneratesuyuPath(suyuPath::IconsDir, suyu_path / ICONS_DIR);
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);
}
private:
@@ -140,13 +140,13 @@ private:
~PathManagerImpl() = default;
void GeneratesuyuPath(suyuPath suyu_path, const fs::path& new_path) {
void GenerateYuzuPath(YuzuPath yuzu_path, const fs::path& new_path) {
void(FS::CreateDir(new_path));
SetsuyuPathImpl(suyu_path, new_path);
SetYuzuPathImpl(yuzu_path, new_path);
}
std::unordered_map<suyuPath, fs::path> suyu_paths;
std::unordered_map<YuzuPath, fs::path> yuzu_paths;
};
bool ValidatePath(const fs::path& path) {
@@ -230,22 +230,22 @@ void SetAppDirectory(const std::string& app_directory) {
PathManagerImpl::GetInstance().Reinitialize(app_directory);
}
const fs::path& GetsuyuPath(suyuPath suyu_path) {
return PathManagerImpl::GetInstance().GetsuyuPathImpl(suyu_path);
const fs::path& GetYuzuPath(YuzuPath yuzu_path) {
return PathManagerImpl::GetInstance().GetYuzuPathImpl(yuzu_path);
}
std::string GetsuyuPathString(suyuPath suyu_path) {
return PathToUTF8String(GetsuyuPath(suyu_path));
std::string GetYuzuPathString(YuzuPath yuzu_path) {
return PathToUTF8String(GetYuzuPath(yuzu_path));
}
void SetsuyuPath(suyuPath suyu_path, const fs::path& new_path) {
void SetYuzuPath(YuzuPath yuzu_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().SetsuyuPathImpl(suyu_path, new_path);
PathManagerImpl::GetInstance().SetYuzuPathImpl(yuzu_path, new_path);
}
#ifdef _WIN32

44
src/common/fs/path_util.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2021 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
@@ -10,8 +10,8 @@
namespace Common::FS {
enum class suyuPath {
suyuDir, // Where suyu stores its data.
enum class YuzuPath {
YuzuDir, // Where yuzu stores its data.
AmiiboDir, // Where Amiibo backups are stored.
CacheDir, // Where cached filesystem data is stored.
ConfigDir, // Where config files are stored.
@@ -22,7 +22,7 @@ enum class suyuPath {
LogDir, // Where log files are stored.
NANDDir, // Where the emulated NAND is stored.
PlayTimeDir, // Where play time data is stored.
ScreenshotsDir, // Where suyu screenshots are stored.
ScreenshotsDir, // Where yuzu screenshots are stored.
SDMCDir, // Where the emulated SDMC is stored.
ShaderDir, // Where shaders are stored.
TASDir, // Where TAS scripts are stored.
@@ -193,39 +193,39 @@ template <typename Path>
void SetAppDirectory(const std::string& app_directory);
/**
* Gets the filesystem path associated with the suyuPath enum.
* Gets the filesystem path associated with the YuzuPath enum.
*
* @param suyu_path suyuPath enum
* @param yuzu_path YuzuPath enum
*
* @returns The filesystem path associated with the suyuPath enum.
* @returns The filesystem path associated with the YuzuPath enum.
*/
[[nodiscard]] const std::filesystem::path& GetsuyuPath(suyuPath suyu_path);
[[nodiscard]] const std::filesystem::path& GetYuzuPath(YuzuPath yuzu_path);
/**
* Gets the filesystem path associated with the suyuPath enum as a UTF-8 encoded std::string.
* Gets the filesystem path associated with the YuzuPath enum as a UTF-8 encoded std::string.
*
* @param suyu_path suyuPath enum
* @param yuzu_path YuzuPath enum
*
* @returns The filesystem path associated with the suyuPath enum as a UTF-8 encoded std::string.
* @returns The filesystem path associated with the YuzuPath enum as a UTF-8 encoded std::string.
*/
[[nodiscard]] std::string GetsuyuPathString(suyuPath suyu_path);
[[nodiscard]] std::string GetYuzuPathString(YuzuPath yuzu_path);
/**
* Sets a new filesystem path associated with the suyuPath enum.
* Sets a new filesystem path associated with the YuzuPath enum.
* If the filesystem object at new_path is not a directory, this function will not do anything.
*
* @param suyu_path suyuPath enum
* @param yuzu_path YuzuPath enum
* @param new_path New filesystem path
*/
void SetsuyuPath(suyuPath suyu_path, const std::filesystem::path& new_path);
void SetYuzuPath(YuzuPath yuzu_path, const std::filesystem::path& new_path);
#ifdef _WIN32
template <typename Path>
void SetsuyuPath(suyuPath suyu_path, const Path& new_path) {
void SetYuzuPath(YuzuPath yuzu_path, const Path& new_path) {
if constexpr (IsChar<typename Path::value_type>) {
SetsuyuPath(suyu_path, ToU8String(new_path));
SetYuzuPath(yuzu_path, ToU8String(new_path));
} else {
SetsuyuPath(suyu_path, std::filesystem::path{new_path});
SetYuzuPath(yuzu_path, std::filesystem::path{new_path});
}
}
#endif
@@ -257,14 +257,14 @@ void SetsuyuPath(suyuPath suyu_path, const Path& new_path) {
[[nodiscard]] std::filesystem::path GetHomeDirectory();
/**
* Gets the relevant paths for suyu to store its data based on the given XDG environment variable.
* Gets the relevant paths for yuzu to store its data based on the given XDG environment variable.
* See https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
* Defaults to $HOME/.local/share for main application data,
* $HOME/.cache for cached data, and $HOME/.config for configuration files.
*
* @param env_name XDG environment variable name
*
* @returns The path where suyu should store its data.
* @returns The path where yuzu should store its data.
*/
[[nodiscard]] std::filesystem::path GetDataDirectory(const std::string& env_name);
@@ -288,11 +288,11 @@ enum class DirectorySeparator {
};
// Splits the path on '/' or '\' and put the components into a vector
// i.e. "C:\Users\suyu\Documents\save.bin" becomes {"C:", "Users", "suyu", "Documents", "save.bin" }
// i.e. "C:\Users\Yuzu\Documents\save.bin" becomes {"C:", "Users", "Yuzu", "Documents", "save.bin" }
[[nodiscard]] std::vector<std::string_view> SplitPathComponents(std::string_view filename);
// Splits the path on '/' or '\' and put the components into a vector
// i.e. "C:\Users\suyu\Documents\save.bin" becomes {"C:", "Users", "suyu", "Documents", "save.bin" }
// i.e. "C:\Users\Yuzu\Documents\save.bin" becomes {"C:", "Users", "Yuzu", "Documents", "save.bin" }
[[nodiscard]] std::vector<std::string> SplitPathComponentsCopy(std::string_view filename);
// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\'