Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-18 03:31:31 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

more NAND ExtSaveData fixes

Browse source
This commit is contained in:
Ada 2024-03-08 21:51:40 +00:00
parent bc0708cd10
commit f0c1584e14
No known key found for this signature in database
GPG key ID: 066E56D5C9F4E50D
3 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/services/fs.hpp
View file

@ -34,12 +34,12 @@ class FSService {
UserSaveDataArchive userSaveData2; UserSaveDataArchive userSaveData2;
std::unordered_map<u64, ExtSaveDataArchive> extSaveData_sdmc; std::unordered_map<u64, ExtSaveDataArchive> extSaveData_sdmc;
std::unordered_map<u64, ExtSaveDataArchive> sharedExtSaveData_nand; std::unordered_map<u64, ExtSaveDataArchive> nandExtSaveData_nand;
SystemSaveDataArchive systemSaveData; SystemSaveDataArchive systemSaveData;
ArchiveBase* getArchiveFromID(u32 id, const FSPath& archivePath); ArchiveBase* getArchiveFromID(u32 id, const FSPath& archivePath);
ExtSaveDataArchive* getExtArchiveFromID(u64 saveId); ExtSaveDataArchive* getExtArchiveFromID(u64 saveId, bool isShared);
ExtSaveDataArchive* getSharedExtArchiveFromID(u64 saveId); ExtSaveDataArchive* getNANDExtArchiveFromID(u64 saveId, bool isShared);
Rust::Result<Handle, HorizonResult> openArchiveHandle(u32 archiveID, const FSPath& path); Rust::Result<Handle, HorizonResult> openArchiveHandle(u32 archiveID, const FSPath& path);
Rust::Result<Handle, HorizonResult> openDirectoryHandle(ArchiveBase* archive, const FSPath& path); Rust::Result<Handle, HorizonResult> openDirectoryHandle(ArchiveBase* archive, const FSPath& path);
std::optional<Handle> openFileHandle(ArchiveBase* archive, const FSPath& path, const FSPath& archivePath, const FilePerms& perms); std::optional<Handle> openFileHandle(ArchiveBase* archive, const FSPath& path, const FSPath& archivePath, const FilePerms& perms);

2
src/core/fs/archive_ext_save_data.cpp
View file

@ -269,7 +269,7 @@ std::string ExtSaveDataArchive::getExtSaveDataPathFromBinary(const FSPath& path)
} }
const ExtSaveDataInfo info = *reinterpret_cast<const ExtSaveDataInfo*>(&path.binary[0]); const ExtSaveDataInfo info = *reinterpret_cast<const ExtSaveDataInfo*>(&path.binary[0]);
return backingFolder + "_" + std::to_string(info.save_id); return fs::path(backingFolder).filename().string() + "_" + std::to_string(info.save_id);
} }
std::string ExtSaveDataArchive::getExtSaveDataPath() const { std::string ExtSaveDataArchive::getExtSaveDataPath() const {

32
src/core/services/fs.cpp
View file

@ -84,21 +84,18 @@ void FSService::initializeFilesystem() {
} }
} }
ExtSaveDataArchive* FSService::getExtArchiveFromID(u64 saveId) { ExtSaveDataArchive* FSService::getExtArchiveFromID(u64 saveId, bool isShared) {
// todo: should we have title id in here?
if (const auto entry = extSaveData_sdmc.find(saveId); entry == extSaveData_sdmc.end()) { if (const auto entry = extSaveData_sdmc.find(saveId); entry == extSaveData_sdmc.end()) {
extSaveData_sdmc.emplace(saveId, ExtSaveDataArchive(mem, "SDMC", saveId)); extSaveData_sdmc.emplace(saveId, ExtSaveDataArchive(mem, "SDMC", saveId, isShared));
} }
return &extSaveData_sdmc.at(saveId); return &extSaveData_sdmc.at(saveId);
} }
ExtSaveDataArchive* FSService::getNANDExtArchiveFromID(u64 saveId, bool isShared) {
ExtSaveDataArchive* FSService::getSharedExtArchiveFromID(u64 saveId) { if (const auto entry = nandExtSaveData_nand.find(saveId); entry == nandExtSaveData_nand.end()) {
// todo: should we have title id in here? nandExtSaveData_nand.emplace(saveId, ExtSaveDataArchive(mem, "../SharedFiles/NAND", saveId, isShared));
if (const auto entry = sharedExtSaveData_nand.find(saveId); entry == sharedExtSaveData_nand.end()) {
sharedExtSaveData_nand.emplace(saveId, ExtSaveDataArchive(mem, "../SharedFiles/NAND", saveId, true));
} }
return &sharedExtSaveData_nand.at(saveId); return &nandExtSaveData_nand.at(saveId);
} }
@ -111,8 +108,12 @@ ArchiveBase* FSService::getArchiveFromID(u32 id, const FSPath& archivePath) {
case ArchiveID::ExtSaveData: { case ArchiveID::ExtSaveData: {
const ExtSaveDataInfo info = *reinterpret_cast<const ExtSaveDataInfo*>(&archivePath.binary[0]); const ExtSaveDataInfo info = *reinterpret_cast<const ExtSaveDataInfo*>(&archivePath.binary[0]);
switch(info.media_type) { switch(info.media_type) {
case MediaType::NAND: {
return getNANDExtArchiveFromID(info.save_id, false);
break;
}
case MediaType::SD: { case MediaType::SD: {
return getExtArchiveFromID(info.save_id); return getExtArchiveFromID(info.save_id, false);
break; break;
} }
default: default:
@ -125,7 +126,11 @@ ArchiveBase* FSService::getArchiveFromID(u32 id, const FSPath& archivePath) {
const ExtSaveDataInfo info = *reinterpret_cast<const ExtSaveDataInfo*>(&archivePath.binary[0]); const ExtSaveDataInfo info = *reinterpret_cast<const ExtSaveDataInfo*>(&archivePath.binary[0]);
switch(info.media_type) { switch(info.media_type) {
case MediaType::NAND: { case MediaType::NAND: {
return getSharedExtArchiveFromID(info.save_id); return getNANDExtArchiveFromID(info.save_id, true);
break;
}
case MediaType::SD: {
return getExtArchiveFromID(info.save_id, true);
break; break;
} }
default: default:
@ -601,8 +606,9 @@ void FSService::createExtSaveData(u32 messagePointer) {
ExtSaveDataArchive* selected = nullptr; ExtSaveDataArchive* selected = nullptr;
switch(mediaType) { switch(mediaType) {
case MediaType::NAND: selected = getSharedExtArchiveFromID(saveID); break; // is there ever a situation where it formats a shared archive?
case MediaType::SD: selected = getExtArchiveFromID(saveID); break; case MediaType::NAND: selected = getNANDExtArchiveFromID(saveID, false); break;
case MediaType::SD: selected = getExtArchiveFromID(saveID, false); break;
default: Helpers::warn("FS::CreateExtSaveData - Unhandled ExtSaveData MediaType %d", static_cast<s32>(mediaType)); break; default: Helpers::warn("FS::CreateExtSaveData - Unhandled ExtSaveData MediaType %d", static_cast<s32>(mediaType)); break;
} }