|
|
@ -58,7 +58,7 @@ Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ArchiveFactory_ExtSaveData::ArchiveFactory_ExtSaveData(const std::string& mount_location, bool shared)
|
|
|
|
ArchiveFactory_ExtSaveData::ArchiveFactory_ExtSaveData(const std::string& mount_location, bool shared)
|
|
|
|
: mount_point(GetExtDataContainerPath(mount_location, shared)) {
|
|
|
|
: shared(shared), mount_point(GetExtDataContainerPath(mount_location, shared)) {
|
|
|
|
LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str());
|
|
|
|
LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -74,9 +74,15 @@ bool ArchiveFactory_ExtSaveData::Initialize() {
|
|
|
|
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_ExtSaveData::Open(const Path& path) {
|
|
|
|
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_ExtSaveData::Open(const Path& path) {
|
|
|
|
std::string fullpath = GetExtSaveDataPath(mount_point, path) + "user/";
|
|
|
|
std::string fullpath = GetExtSaveDataPath(mount_point, path) + "user/";
|
|
|
|
if (!FileUtil::Exists(fullpath)) {
|
|
|
|
if (!FileUtil::Exists(fullpath)) {
|
|
|
|
// TODO(Subv): Check error code, this one is probably wrong
|
|
|
|
// TODO(Subv): Verify the archive behavior of SharedExtSaveData compared to ExtSaveData.
|
|
|
|
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
|
|
|
|
// ExtSaveData seems to return FS_NotFound (120) when the archive doesn't exist.
|
|
|
|
ErrorSummary::InvalidState, ErrorLevel::Status);
|
|
|
|
if (!shared) {
|
|
|
|
|
|
|
|
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS,
|
|
|
|
|
|
|
|
ErrorSummary::InvalidState, ErrorLevel::Status);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
|
|
|
|
|
|
|
|
ErrorSummary::InvalidState, ErrorLevel::Status);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
auto archive = Common::make_unique<DiskArchive>(fullpath);
|
|
|
|
auto archive = Common::make_unique<DiskArchive>(fullpath);
|
|
|
|
return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
|
|
|
|
return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
|
|
|
@ -93,33 +99,33 @@ ResultCode ArchiveFactory_ExtSaveData::Format(const Path& path, const FileSys::A
|
|
|
|
std::string metadata_path = GetExtSaveDataPath(mount_point, path) + "metadata";
|
|
|
|
std::string metadata_path = GetExtSaveDataPath(mount_point, path) + "metadata";
|
|
|
|
FileUtil::IOFile file(metadata_path, "wb");
|
|
|
|
FileUtil::IOFile file(metadata_path, "wb");
|
|
|
|
|
|
|
|
|
|
|
|
if (file.IsOpen()) {
|
|
|
|
if (!file.IsOpen()) {
|
|
|
|
file.WriteBytes(&format_info, sizeof(format_info));
|
|
|
|
// TODO(Subv): Find the correct error code
|
|
|
|
return RESULT_SUCCESS;
|
|
|
|
return ResultCode(-1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// TODO(Subv): Find the correct error code
|
|
|
|
file.WriteBytes(&format_info, sizeof(format_info));
|
|
|
|
return ResultCode(-1);
|
|
|
|
return RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ResultVal<ArchiveFormatInfo> ArchiveFactory_ExtSaveData::GetFormatInfo(const Path& path) const {
|
|
|
|
ResultVal<ArchiveFormatInfo> ArchiveFactory_ExtSaveData::GetFormatInfo(const Path& path) const {
|
|
|
|
std::string metadata_path = GetExtSaveDataPath(mount_point, path) + "metadata";
|
|
|
|
std::string metadata_path = GetExtSaveDataPath(mount_point, path) + "metadata";
|
|
|
|
FileUtil::IOFile file(metadata_path, "rb");
|
|
|
|
FileUtil::IOFile file(metadata_path, "rb");
|
|
|
|
|
|
|
|
|
|
|
|
if (file.IsOpen()) {
|
|
|
|
if (!file.IsOpen()) {
|
|
|
|
ArchiveFormatInfo info;
|
|
|
|
LOG_ERROR(Service_FS, "Could not open metadata information for archive");
|
|
|
|
file.ReadBytes(&info, sizeof(info));
|
|
|
|
// TODO(Subv): Verify error code
|
|
|
|
return MakeResult<ArchiveFormatInfo>(info);
|
|
|
|
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS, ErrorSummary::InvalidState, ErrorLevel::Status);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
LOG_ERROR(Service_FS, "Could not open metadata information for archive");
|
|
|
|
ArchiveFormatInfo info = {};
|
|
|
|
// TODO(Subv): Verify error code
|
|
|
|
file.ReadBytes(&info, sizeof(info));
|
|
|
|
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS, ErrorSummary::InvalidState, ErrorLevel::Status);
|
|
|
|
return MakeResult<ArchiveFormatInfo>(info);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ArchiveFactory_ExtSaveData::WriteIcon(const Path& path, const u8* icon_data, u32 icon_size) {
|
|
|
|
void ArchiveFactory_ExtSaveData::WriteIcon(const Path& path, const u8* icon_data, size_t icon_size) {
|
|
|
|
std::string game_path = FileSys::GetExtSaveDataPath(GetMountPoint(), path);
|
|
|
|
std::string game_path = FileSys::GetExtSaveDataPath(GetMountPoint(), path);
|
|
|
|
FileUtil::IOFile icon_file(game_path + "icon", "wb+");
|
|
|
|
FileUtil::IOFile icon_file(game_path + "icon", "wb");
|
|
|
|
icon_file.WriteBytes(icon_data, icon_size);
|
|
|
|
icon_file.WriteBytes(icon_data, icon_size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|