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

ExtSaveData: More fixes

Browse source
This commit is contained in:
wheremyfoodat 2025-02-10 02:14:56 +02:00
parent f4c32bfdc9
commit 40cdccef51
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -261,7 +261,6 @@ Rust::Result<ArchiveBase::FormatInfo, HorizonResult> ExtSaveDataArchive::getForm
return Err(Result::FS::NotFormatted); return Err(Result::FS::NotFormatted);
} }
ret.size = 0;
return Ok(ret); return Ok(ret);
} }
@ -287,12 +286,6 @@ Rust::Result<ArchiveBase*, HorizonResult> ExtSaveDataArchive::openArchive(const
Helpers::panic("ExtSaveData accessed with an invalid path in OpenArchive"); Helpers::panic("ExtSaveData accessed with an invalid path in OpenArchive");
} }
if (isShared) {
const fs::path saveDataPath = IOFile::getAppData() / getExtSaveDataPath();
if (!fs::exists(saveDataPath)) fs::create_directories(saveDataPath);
return Ok((ArchiveBase*)this);
}
// Create a format info path in the style of AppData/FormatInfo/Cartridge10390390194.format // Create a format info path in the style of AppData/FormatInfo/Cartridge10390390194.format
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
@ -300,6 +293,16 @@ Rust::Result<ArchiveBase*, HorizonResult> ExtSaveDataArchive::openArchive(const
return isNAND ? Err(Result::FS::NotFormatted) : Err(Result::FS::NotFoundInvalid); return isNAND ? Err(Result::FS::NotFormatted) : Err(Result::FS::NotFoundInvalid);
} }
// TODO: Do shared archives need to be formatted?
if (isShared) {
const fs::path saveDataPath = IOFile::getAppData() / getExtSaveDataPath();
if (!fs::exists(saveDataPath)) {
fs::create_directories(saveDataPath);
}
return Ok((ArchiveBase*)this);
}
return Ok((ArchiveBase*)this); return Ok((ArchiveBase*)this);
} }

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

@ -590,7 +590,12 @@ void FSService::createExtSaveData(u32 messagePointer) {
const u32 smdhSize = mem.read32(messagePointer + 36); const u32 smdhSize = mem.read32(messagePointer + 36);
const u32 smdhPointer = mem.read32(messagePointer + 44); const u32 smdhPointer = mem.read32(messagePointer + 44);
ArchiveBase::FormatInfo info{.size = 0, .numOfDirectories = numOfDirectories, .numOfFiles = numOfFiles, .duplicateData = false}; ArchiveBase::FormatInfo info{
.size = u32(sizeLimit),
.numOfDirectories = numOfDirectories,
.numOfFiles = numOfFiles,
.duplicateData = false,
};
FSPath path = readPath(PathType::Binary, messagePointer + 4, 32); FSPath path = readPath(PathType::Binary, messagePointer + 4, 32);
ExtSaveDataArchive* selected = nullptr; ExtSaveDataArchive* selected = nullptr;