summaryrefslogtreecommitdiffstats
path: root/src/core/file_sys
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2015-02-25 00:02:40 +0100
committerSubv <subv2112@gmail.com>2015-02-26 01:37:10 +0100
commit9db5c9b6dc7b01a0a69179707823f27f42b9cdd9 (patch)
tree8f5c1e9de1e90b2db1f636224e5b7c4b62d69213 /src/core/file_sys
parentMerge pull request #595 from linkmauve/new-3ds-input (diff)
downloadyuzu-9db5c9b6dc7b01a0a69179707823f27f42b9cdd9.tar
yuzu-9db5c9b6dc7b01a0a69179707823f27f42b9cdd9.tar.gz
yuzu-9db5c9b6dc7b01a0a69179707823f27f42b9cdd9.tar.bz2
yuzu-9db5c9b6dc7b01a0a69179707823f27f42b9cdd9.tar.lz
yuzu-9db5c9b6dc7b01a0a69179707823f27f42b9cdd9.tar.xz
yuzu-9db5c9b6dc7b01a0a69179707823f27f42b9cdd9.tar.zst
yuzu-9db5c9b6dc7b01a0a69179707823f27f42b9cdd9.zip
Diffstat (limited to 'src/core/file_sys')
-rw-r--r--src/core/file_sys/archive_systemsavedata.cpp33
-rw-r--r--src/core/file_sys/archive_systemsavedata.h14
2 files changed, 28 insertions, 19 deletions
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp
index c2a5d641a..25c94cd26 100644
--- a/src/core/file_sys/archive_systemsavedata.cpp
+++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -6,9 +6,9 @@
#include "common/common_types.h"
#include "common/file_util.h"
+#include "common/make_unique.h"
#include "core/file_sys/archive_systemsavedata.h"
-#include "core/file_sys/disk_archive.h"
#include "core/hle/service/fs/archive.h"
#include "core/settings.h"
@@ -17,9 +17,11 @@
namespace FileSys {
-static std::string GetSystemSaveDataPath(const std::string& mount_point, u64 save_id) {
- u32 save_high = static_cast<u32>((save_id >> 32) & 0xFFFFFFFF);
- u32 save_low = static_cast<u32>(save_id & 0xFFFFFFFF);
+static 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];
+ u32 save_high = data[0];
return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_low, save_high);
}
@@ -27,18 +29,25 @@ static std::string GetSystemSaveDataContainerPath(const std::string& mount_point
return Common::StringFromFormat("%sdata/%s/sysdata/", mount_point.c_str(), SYSTEM_ID.c_str());
}
-Archive_SystemSaveData::Archive_SystemSaveData(const std::string& mount_point, u64 save_id)
- : DiskArchive(GetSystemSaveDataPath(GetSystemSaveDataContainerPath(mount_point), save_id)) {
- LOG_INFO(Service_FS, "Directory %s set as SystemSaveData.", this->mount_point.c_str());
+ArchiveFactory_SystemSaveData::ArchiveFactory_SystemSaveData(const std::string& nand_path)
+ : base_path(GetSystemSaveDataContainerPath(nand_path)) {
}
-bool Archive_SystemSaveData::Initialize() {
- if (!FileUtil::CreateFullPath(mount_point)) {
- LOG_ERROR(Service_FS, "Unable to create SystemSaveData path.");
- return false;
+ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SystemSaveData::Open(const Path& path) {
+ std::string fullpath = GetSystemSaveDataPath(base_path, path);
+ if (!FileUtil::Exists(fullpath)) {
+ // TODO(Subv): Check error code, this one is probably wrong
+ return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
+ ErrorSummary::InvalidState, ErrorLevel::Status);
}
+ auto archive = Common::make_unique<DiskArchive>(fullpath);
+ return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
+}
- return true;
+ResultCode ArchiveFactory_SystemSaveData::Format(const Path& path) {
+ std::string fullpath = GetSystemSaveDataPath(base_path, path);
+ FileUtil::CreateFullPath(fullpath);
+ return RESULT_SUCCESS;
}
} // namespace FileSys
diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h
index c8f5845ca..556a2a488 100644
--- a/src/core/file_sys/archive_systemsavedata.h
+++ b/src/core/file_sys/archive_systemsavedata.h
@@ -15,17 +15,17 @@
namespace FileSys {
/// File system interface to the SystemSaveData archive
-class Archive_SystemSaveData final : public DiskArchive {
+class ArchiveFactory_SystemSaveData final : public ArchiveFactory {
public:
- Archive_SystemSaveData(const std::string& mount_point, u64 save_id);
+ ArchiveFactory_SystemSaveData(const std::string& mount_point);
- /**
- * Initialize the archive.
- * @return true if it initialized successfully
- */
- bool Initialize();
+ ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) override;
+ ResultCode Format(const Path& path) override;
std::string GetName() const override { return "SystemSaveData"; }
+
+private:
+ std::string base_path;
};
} // namespace FileSys