diff options
author | Subv <subv2112@gmail.com> | 2015-03-14 18:00:01 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2015-03-14 18:00:01 +0100 |
commit | 1d61cd446016badb1dd218a2a4692b1e5e3eeb14 (patch) | |
tree | 1900da40954404556fa05ed85be22537e500b740 /src/core/file_sys | |
parent | Merge pull request #642 from bunnei/touchpad (diff) | |
download | yuzu-1d61cd446016badb1dd218a2a4692b1e5e3eeb14.tar yuzu-1d61cd446016badb1dd218a2a4692b1e5e3eeb14.tar.gz yuzu-1d61cd446016badb1dd218a2a4692b1e5e3eeb14.tar.bz2 yuzu-1d61cd446016badb1dd218a2a4692b1e5e3eeb14.tar.lz yuzu-1d61cd446016badb1dd218a2a4692b1e5e3eeb14.tar.xz yuzu-1d61cd446016badb1dd218a2a4692b1e5e3eeb14.tar.zst yuzu-1d61cd446016badb1dd218a2a4692b1e5e3eeb14.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/archive_extsavedata.cpp | 21 | ||||
-rw-r--r-- | src/core/file_sys/archive_extsavedata.h | 10 | ||||
-rw-r--r-- | src/core/file_sys/archive_systemsavedata.cpp | 22 | ||||
-rw-r--r-- | src/core/file_sys/archive_systemsavedata.h | 25 |
4 files changed, 76 insertions, 2 deletions
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 0363c9771..3076fa263 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -34,6 +34,27 @@ std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) SYSTEM_ID.c_str(), SDCARD_ID.c_str()); } +Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low) { + std::vector<u8> binary_path; + binary_path.reserve(12); + + // Append each word byte by byte + + // The first word is the media type + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back((media_type >> (8 * i)) & 0xFF); + + // Next is the low word + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back((low >> (8 * i)) & 0xFF); + + // Next is the high word + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back((high >> (8 * i)) & 0xFF); + + return { binary_path }; +} + ArchiveFactory_ExtSaveData::ArchiveFactory_ExtSaveData(const std::string& mount_location, bool shared) : mount_point(GetExtDataContainerPath(mount_location, shared)) { LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str()); diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h index 83c6b0291..c77c04e44 100644 --- a/src/core/file_sys/archive_extsavedata.h +++ b/src/core/file_sys/archive_extsavedata.h @@ -58,4 +58,14 @@ std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path) */ std::string GetExtDataContainerPath(const std::string& mount_point, bool shared); +/** + * Constructs a FileSys::Path object that refers to the ExtData archive identified by + * the specified media type, high save id and low save id. + * @param media_type The media type where the archive is located (NAND / SDMC) + * @param high The high word of the save id for the archive + * @param low The low word of the save id for the archive + * @returns A FileSys::Path to the wanted archive + */ +Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low); + } // namespace FileSys diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index 25c94cd26..4fe785c97 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp @@ -17,7 +17,7 @@ namespace FileSys { -static std::string GetSystemSaveDataPath(const std::string& mount_point, const Path& path) { +std::string GetSystemSaveDataPath(const std::string& mount_point, const Path& path) { std::vector<u8> vec_data = path.AsBinary(); const u32* data = reinterpret_cast<const u32*>(vec_data.data()); u32 save_low = data[1]; @@ -25,10 +25,27 @@ static std::string GetSystemSaveDataPath(const std::string& mount_point, const P return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_low, save_high); } -static std::string GetSystemSaveDataContainerPath(const std::string& mount_point) { +std::string GetSystemSaveDataContainerPath(const std::string& mount_point) { return Common::StringFromFormat("%sdata/%s/sysdata/", mount_point.c_str(), SYSTEM_ID.c_str()); } +Path ConstructSystemSaveDataBinaryPath(u32 high, u32 low) { + std::vector<u8> binary_path; + binary_path.reserve(8); + + // Append each word byte by byte + + // First is the high word + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back((high >> (8 * i)) & 0xFF); + + // Next is the low word + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back((low >> (8 * i)) & 0xFF); + + return { binary_path }; +} + ArchiveFactory_SystemSaveData::ArchiveFactory_SystemSaveData(const std::string& nand_path) : base_path(GetSystemSaveDataContainerPath(nand_path)) { } @@ -46,6 +63,7 @@ ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SystemSaveData::Open(c ResultCode ArchiveFactory_SystemSaveData::Format(const Path& path) { std::string fullpath = GetSystemSaveDataPath(base_path, path); + FileUtil::DeleteDirRecursively(fullpath); FileUtil::CreateFullPath(fullpath); return RESULT_SUCCESS; } diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h index 556a2a488..3431fed88 100644 --- a/src/core/file_sys/archive_systemsavedata.h +++ b/src/core/file_sys/archive_systemsavedata.h @@ -28,4 +28,29 @@ private: std::string base_path; }; +/** + * Constructs a path to the concrete SystemSaveData archive in the host filesystem based on the + * input Path and base mount point. + * @param mount_point The base mount point of the SystemSaveData archives. + * @param path The path that identifies the requested concrete SystemSaveData archive. + * @returns The complete path to the specified SystemSaveData archive in the host filesystem + */ +std::string GetSystemSaveDataPath(const std::string& mount_point, const Path& path); + +/** + * Constructs a path to the base folder to hold concrete SystemSaveData archives in the host file system. + * @param mount_point The base folder where this folder resides, ie. SDMC or NAND. + * @returns The path to the base SystemSaveData archives' folder in the host file system + */ +std::string GetSystemSaveDataContainerPath(const std::string& mount_point); + +/** + * Constructs a FileSys::Path object that refers to the SystemSaveData archive identified by + * the specified high save id and low save id. + * @param high The high word of the save id for the archive + * @param low The low word of the save id for the archive + * @returns A FileSys::Path to the wanted archive + */ +Path ConstructSystemSaveDataBinaryPath(u32 high, u32 low); + } // namespace FileSys |