Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-07 22:55:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

return NotFormatted on non-shared NAND archive (??)

Browse source
This commit is contained in:
Ada 2024-03-08 22:05:26 +00:00
parent 0cd81c9ed6
commit fe9167ee66
No known key found for this signature in database
GPG key ID: 066E56D5C9F4E50D
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/fs/archive_ext_save_data.hpp
View file

@ -13,8 +13,8 @@ struct ExtSaveDataInfo {
class ExtSaveDataArchive : public ArchiveBase { class ExtSaveDataArchive : public ArchiveBase {
public: public:
ExtSaveDataArchive(Memory& mem, const std::string& folder, u64 saveId, bool isShared = false) : ArchiveBase(mem), ExtSaveDataArchive(Memory& mem, const std::string& folder, u64 saveId, bool isShared = false, bool isNAND = false) : ArchiveBase(mem),
archiveSaveId(saveId), isShared(isShared), backingFolder(folder) {} archiveSaveId(saveId), isShared(isShared), isNAND(isNAND), backingFolder(folder) {}
u64 getFreeBytes() override { Helpers::panic("ExtSaveData::GetFreeBytes unimplemented"); return 0; } u64 getFreeBytes() override { Helpers::panic("ExtSaveData::GetFreeBytes unimplemented"); return 0; }
std::string name() override { return "ExtSaveData::" + backingFolder + "::" + std::to_string(archiveSaveId); } std::string name() override { return "ExtSaveData::" + backingFolder + "::" + std::to_string(archiveSaveId); }
@ -43,5 +43,6 @@ public:
u64 archiveSaveId = 0; u64 archiveSaveId = 0;
bool isShared = false; bool isShared = false;
bool isNAND = false;
std::string backingFolder; // Backing folder for the archive. Can be NAND, Gamecard or SD depending on the archive path. std::string backingFolder; // Backing folder for the archive. Can be NAND, Gamecard or SD depending on the archive path.
}; };

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

@ -296,7 +296,7 @@ Rust::Result<ArchiveBase*, HorizonResult> ExtSaveDataArchive::openArchive(const
const fs::path formatInfoPath = getFormatInfoPath(path); const fs::path formatInfoPath = getFormatInfoPath(path);
// Format info not found so the archive is not formatted // Format info not found so the archive is not formatted
if (!fs::is_regular_file(formatInfoPath)) { if (!fs::is_regular_file(formatInfoPath)) {
return Err(Result::FS::NotFoundInvalid); return isNAND ? Err(Result::FS::NotFormatted) : Err(Result::FS::NotFoundInvalid);
} }
return Ok((ArchiveBase*)this); return Ok((ArchiveBase*)this);

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

@ -96,14 +96,14 @@ void FSService::initializeFilesystem() {
ExtSaveDataArchive* FSService::getExtArchiveFromID(u64 saveId, bool isShared) { ExtSaveDataArchive* FSService::getExtArchiveFromID(u64 saveId, bool isShared) {
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, isShared ? "../SharedFiles/SDMC" : "SDMC", saveId, isShared)); extSaveData_sdmc.emplace(saveId, ExtSaveDataArchive(mem, isShared ? "../SharedFiles/SDMC" : "SDMC", saveId, isShared, false));
} }
return &extSaveData_sdmc.at(saveId); return &extSaveData_sdmc.at(saveId);
} }
ExtSaveDataArchive* FSService::getNANDExtArchiveFromID(u64 saveId, bool isShared) { ExtSaveDataArchive* FSService::getNANDExtArchiveFromID(u64 saveId, bool isShared) {
if (const auto entry = nandExtSaveData_nand.find(saveId); entry == nandExtSaveData_nand.end()) { if (const auto entry = nandExtSaveData_nand.find(saveId); entry == nandExtSaveData_nand.end()) {
nandExtSaveData_nand.emplace(saveId, ExtSaveDataArchive(mem, isShared ? "../SharedFiles/NAND" : "NAND", saveId, isShared)); nandExtSaveData_nand.emplace(saveId, ExtSaveDataArchive(mem, isShared ? "../SharedFiles/NAND" : "NAND", saveId, isShared, true));
} }
return &nandExtSaveData_nand.at(saveId); return &nandExtSaveData_nand.at(saveId);
} }