From 71a063f45cba961ee07730f4ab79f2bcc3ff9b5b Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 3 Jan 2015 20:46:05 -0500 Subject: Archives: Changed the way paths are built for the archives. Each archive now takes a mount point of either NAND or SDMC, and builds its own directory structure there, trying to simulate an HLE-friendly hardware layout --- src/core/file_sys/archive_savedata.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/core/file_sys/archive_savedata.cpp') diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index 280d4ff5d..f189692fa 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp @@ -9,6 +9,7 @@ #include "core/file_sys/archive_savedata.h" #include "core/file_sys/disk_archive.h" +#include "core/hle/service/fs/archive.h" #include "core/settings.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -16,14 +17,24 @@ namespace FileSys { +static std::string GetSaveDataContainerPath(const std::string& mount_point) { + return Common::StringFromFormat("%sNintendo 3DS/%32x/%32x/title/", mount_point.c_str(), ID0, ID1); +} + +static std::string GetSaveDataPath(const std::string& mount_point, u64 program_id) { + u32 high = program_id >> 32; + u32 low = program_id & 0xFFFFFFFF; + return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_point.c_str(), high, low); +} + Archive_SaveData::Archive_SaveData(const std::string& mount_point) - : DiskArchive(mount_point) { + : DiskArchive(GetSaveDataContainerPath(mount_point)) { LOG_INFO(Service_FS, "Directory %s set as SaveData.", this->mount_point.c_str()); } ResultCode Archive_SaveData::Open(const Path& path) { if (concrete_mount_point.empty()) - concrete_mount_point = Common::StringFromFormat("%s%016X", mount_point.c_str(), Kernel::g_program_id) + DIR_SEP; + concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_program_id); if (!FileUtil::Exists(concrete_mount_point)) { // When a SaveData archive is created for the first time, it is not yet formatted // and the save file/directory structure expected by the game has not yet been initialized. -- cgit v1.2.3 From 90dffe3fc16dd60166c53bafa2b3157737f39225 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 4 Jan 2015 09:10:27 -0500 Subject: Archives: Make SYSTEM_ID and SDCARD_ID strings --- src/core/file_sys/archive_savedata.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core/file_sys/archive_savedata.cpp') diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index f189692fa..ecce7c105 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp @@ -18,7 +18,8 @@ namespace FileSys { static std::string GetSaveDataContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%sNintendo 3DS/%32x/%32x/title/", mount_point.c_str(), ID0, ID1); + return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", mount_point.c_str(), + SYSTEM_ID.c_str(), SDCARD_ID.c_str()); } static std::string GetSaveDataPath(const std::string& mount_point, u64 program_id) { -- cgit v1.2.3 From 5244ac0e9c784c402946616f913a8b4fe63af88c Mon Sep 17 00:00:00 2001 From: Subv Date: Tue, 6 Jan 2015 15:02:30 -0500 Subject: Archives: Addressed some comments --- src/core/file_sys/archive_savedata.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/file_sys/archive_savedata.cpp') diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index ecce7c105..3baee5294 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp @@ -17,19 +17,19 @@ namespace FileSys { -static std::string GetSaveDataContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", mount_point.c_str(), +static std::string GetSaveDataContainerPath(const std::string& sdmc_directory) { + return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", sdmc_directory.c_str(), SYSTEM_ID.c_str(), SDCARD_ID.c_str()); } -static std::string GetSaveDataPath(const std::string& mount_point, u64 program_id) { +static std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) { u32 high = program_id >> 32; u32 low = program_id & 0xFFFFFFFF; - return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_point.c_str(), high, low); + return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, low); } -Archive_SaveData::Archive_SaveData(const std::string& mount_point) - : DiskArchive(GetSaveDataContainerPath(mount_point)) { +Archive_SaveData::Archive_SaveData(const std::string& sdmc_directory) + : DiskArchive(GetSaveDataContainerPath(sdmc_directory)) { LOG_INFO(Service_FS, "Directory %s set as SaveData.", this->mount_point.c_str()); } -- cgit v1.2.3