BoomMicrophone/undo-deletions
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

romfs: cache file and directory metadata tables

Browse source
This commit is contained in:
Liam 2023-11-27 20:30:00 -05:00
parent 5fb1a83e4c
commit 4bc932261b
1 changed files with 56 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/core/file_sys/romfs.cpp
View file

@ -55,44 +55,68 @@ struct FileEntry {
}; };
static_assert(sizeof(FileEntry) == 0x20, "FileEntry has incorrect size."); static_assert(sizeof(FileEntry) == 0x20, "FileEntry has incorrect size.");
template <typename Entry> struct RomFSTraversalContext {
std::pair<Entry, std::string> GetEntry(const VirtualFile& file, std::size_t offset) { RomFSHeader header;
Entry entry{}; VirtualFile file;
if (file->ReadObject(&entry, offset) != sizeof(Entry)) std::vector<u8> directory_meta;
std::vector<u8> file_meta;
};
template <typename EntryType, auto Member>
std::pair<EntryType, std::string> GetEntry(const RomFSTraversalContext& ctx, size_t offset) {
const size_t entry_end = offset + sizeof(EntryType);
const std::vector<u8>& vec = ctx.*Member;
const size_t size = vec.size();
const u8* data = vec.data();
EntryType entry{};
if (entry_end > size) {
return {}; return {};
std::string string(entry.name_length, '\0'); }
if (file->ReadArray(&string[0], string.size(), offset + sizeof(Entry)) != string.size()) std::memcpy(&entry, data + offset, sizeof(EntryType));
return {};
return {entry, string}; const size_t name_length = std::min(entry_end + entry.name_length, size) - entry_end;
std::string name(reinterpret_cast<const char*>(data + entry_end), name_length);
return {entry, std::move(name)};
} }
void ProcessFile(const VirtualFile& file, std::size_t file_offset, std::size_t data_offset, std::pair<DirectoryEntry, std::string> GetDirectoryEntry(const RomFSTraversalContext& ctx,
u32 this_file_offset, std::shared_ptr<VectorVfsDirectory>& parent) { size_t directory_offset) {
while (this_file_offset != ROMFS_ENTRY_EMPTY) { return GetEntry<DirectoryEntry, &RomFSTraversalContext::directory_meta>(ctx, directory_offset);
auto entry = GetEntry<FileEntry>(file, file_offset + this_file_offset); }
parent->AddFile(std::make_shared<OffsetVfsFile>( std::pair<FileEntry, std::string> GetFileEntry(const RomFSTraversalContext& ctx,
file, entry.first.size, entry.first.offset + data_offset, entry.second)); size_t file_offset) {
return GetEntry<FileEntry, &RomFSTraversalContext::file_meta>(ctx, file_offset);
}
void ProcessFile(const RomFSTraversalContext& ctx, u32 this_file_offset,
std::shared_ptr<VectorVfsDirectory>& parent) {
while (this_file_offset != ROMFS_ENTRY_EMPTY) {
auto entry = GetFileEntry(ctx, this_file_offset);
parent->AddFile(std::make_shared<OffsetVfsFile>(ctx.file, entry.first.size,
entry.first.offset + ctx.header.data_offset,
std::move(entry.second)));
this_file_offset = entry.first.sibling; this_file_offset = entry.first.sibling;
} }
} }
void ProcessDirectory(const VirtualFile& file, std::size_t dir_offset, std::size_t file_offset, void ProcessDirectory(const RomFSTraversalContext& ctx, u32 this_dir_offset,
std::size_t data_offset, u32 this_dir_offset,
std::shared_ptr<VectorVfsDirectory>& parent) { std::shared_ptr<VectorVfsDirectory>& parent) {
while (this_dir_offset != ROMFS_ENTRY_EMPTY) { while (this_dir_offset != ROMFS_ENTRY_EMPTY) {
auto entry = GetEntry<DirectoryEntry>(file, dir_offset + this_dir_offset); auto entry = GetDirectoryEntry(ctx, this_dir_offset);
auto current = std::make_shared<VectorVfsDirectory>( auto current = std::make_shared<VectorVfsDirectory>(
std::vector<VirtualFile>{}, std::vector<VirtualDir>{}, entry.second); std::vector<VirtualFile>{}, std::vector<VirtualDir>{}, entry.second);
if (entry.first.child_file != ROMFS_ENTRY_EMPTY) { if (entry.first.child_file != ROMFS_ENTRY_EMPTY) {
ProcessFile(file, file_offset, data_offset, entry.first.child_file, current); ProcessFile(ctx, entry.first.child_file, current);
} }
if (entry.first.child_dir != ROMFS_ENTRY_EMPTY) { if (entry.first.child_dir != ROMFS_ENTRY_EMPTY) {
ProcessDirectory(file, dir_offset, file_offset, data_offset, entry.first.child_dir, ProcessDirectory(ctx, entry.first.child_dir, current);
current);
} }
parent->AddDirectory(current); parent->AddDirectory(current);
@ -107,22 +131,25 @@ VirtualDir ExtractRomFS(VirtualFile file) {
return root_container; return root_container;
} }
RomFSHeader header{}; RomFSTraversalContext ctx{};
if (file->ReadObject(&header) != sizeof(RomFSHeader)) {
return root_container; if (file->ReadObject(&ctx.header) != sizeof(RomFSHeader)) {
return nullptr;
} }
if (header.header_size != sizeof(RomFSHeader)) { if (ctx.header.header_size != sizeof(RomFSHeader)) {
return root_container; return nullptr;
} }
const u64 file_offset = header.file_meta.offset; ctx.file = file;
const u64 dir_offset = header.directory_meta.offset; ctx.directory_meta =
file->ReadBytes(ctx.header.directory_meta.size, ctx.header.directory_meta.offset);
ctx.file_meta = file->ReadBytes(ctx.header.file_meta.size, ctx.header.file_meta.offset);
ProcessDirectory(file, dir_offset, file_offset, header.data_offset, 0, root_container); ProcessDirectory(ctx, 0, root_container);
if (auto root = root_container->GetSubdirectory(""); root) { if (auto root = root_container->GetSubdirectory(""); root) {
return std::make_shared<CachedVfsDirectory>(std::move(root)); return root;
} }
ASSERT(false); ASSERT(false);