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

properly handle save ids

Browse source
This commit is contained in:
Ada 2024-03-08 16:23:37 +00:00
parent ee4a85aa4a
commit 9ab49617ea
No known key found for this signature in database
GPG key ID: 066E56D5C9F4E50D
4 changed files with 71 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/fs/archive_ext_save_data.hpp
View file

@ -1,13 +1,21 @@
#pragma once
#include "archive_base.hpp"
#pragma pack(push, 1)
struct ExtSaveDataInfo {
u8 media_type;
u8 unknown;
u16 reserved;
u64 save_id;
};
#pragma pack(pop)
class ExtSaveDataArchive : public ArchiveBase {
public:
ExtSaveDataArchive(Memory& mem, const std::string& folder, bool isShared = false) : ArchiveBase(mem),
isShared(isShared), backingFolder(folder) {}
ExtSaveDataArchive(Memory& mem, const std::string& folder, u64 saveId, bool isShared = false) : ArchiveBase(mem),
archiveSaveId(saveId), isShared(isShared), backingFolder(folder) {}
u64 getFreeBytes() override { Helpers::panic("ExtSaveData::GetFreeBytes unimplemented"); return 0; }
std::string name() override { return "ExtSaveData::" + backingFolder; }
std::string name() override { return "ExtSaveData::" + backingFolder + "::" + std::to_string(archiveSaveId); }
HorizonResult createDirectory(const FSPath& path) override;
HorizonResult deleteDirectory(const FSPath& path) override;
@ -30,7 +38,9 @@ public:
// Takes in a binary ExtSaveData path, outputs a combination of the backing folder with the low and high save entries of the path
// Used for identifying the archive format info files
std::string getExtSaveDataPathFromBinary(const FSPath& path) const;
std::string getExtSaveDataPath() const;
u64 archiveSaveId = 0;
bool isShared = false;
std::string backingFolder; // Backing folder for the archive. Can be NAND, Gamecard or SD depending on the archive path.
};

8
include/services/fs.hpp
View file

@ -33,11 +33,13 @@ class FSService {
UserSaveDataArchive userSaveData1;
UserSaveDataArchive userSaveData2;
ExtSaveDataArchive extSaveData_sdmc;
ExtSaveDataArchive sharedExtSaveData_nand;
std::unordered_map<u64, ExtSaveDataArchive> extSaveData_sdmc;
std::unordered_map<u64, ExtSaveDataArchive> sharedExtSaveData_nand;
SystemSaveDataArchive systemSaveData;
ArchiveBase* getArchiveFromID(u32 id, const FSPath& archivePath);
ExtSaveDataArchive* getExtArchiveFromID(u64 saveId);
ExtSaveDataArchive* getSharedExtArchiveFromID(u64 saveId);
Rust::Result<Handle, HorizonResult> openArchiveHandle(u32 archiveID, 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);
@ -85,7 +87,7 @@ class FSService {
public:
FSService(Memory& mem, Kernel& kernel, const EmulatorConfig& config)
: mem(mem), saveData(mem), sharedExtSaveData_nand(mem, "../SharedFiles/NAND", true), extSaveData_sdmc(mem, "SDMC"), sdmc(mem),
: mem(mem), saveData(mem), sdmc(mem),
sdmcWriteOnly(mem, true), selfNcch(mem), ncch(mem), userSaveData1(mem, ArchiveID::UserSaveData1),
userSaveData2(mem, ArchiveID::UserSaveData2), kernel(kernel), config(config), systemSaveData(mem) {}