Skip to content

Commit

Permalink
Clean up VFS error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@encounter
encounter committed Nov 7, 2024
1 parent 9fc56d8 commit 91aa36c
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 38 deletions.
18 changes: 10 additions & 8 deletions src/vfs/disc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use nodtool::{
nod::{Disc, DiscStream, Fst, NodeKind, OwnedFileStream, PartitionBase, PartitionMeta},
};
use typed_path::Utf8UnixPath;
use zerocopy::IntoBytes;
use zerocopy::{FromZeros, IntoBytes};

use super::{
next_non_empty, StaticFile, Vfs, VfsError, VfsFile, VfsFileType, VfsMetadata, VfsResult,
Expand Down Expand Up @@ -252,19 +252,21 @@ impl DiscFile {
Self { inner: DiscFileInner::Stream(file), mtime }
}

fn convert_to_mapped(&mut self) {
fn convert_to_mapped(&mut self) -> io::Result<()> {
match &mut self.inner {
DiscFileInner::Stream(stream) => {
let pos = stream.stream_position().unwrap();
stream.seek(SeekFrom::Start(0)).unwrap();
let mut data = vec![0u8; stream.len() as usize];
stream.read_exact(&mut data).unwrap();
let mut cursor = Cursor::new(Arc::from(data.as_slice()));
let pos = stream.stream_position()?;
stream.seek(SeekFrom::Start(0))?;
let mut data = <[u8]>::new_box_zeroed_with_elems(stream.len() as usize)
.map_err(|_| io::Error::from(io::ErrorKind::OutOfMemory))?;
stream.read_exact(&mut data)?;
let mut cursor = Cursor::new(Arc::from(data));
cursor.set_position(pos);
self.inner = DiscFileInner::Mapped(cursor);
}
DiscFileInner::Mapped(_) => {}
};
Ok(())
}
}

Expand Down Expand Up @@ -304,7 +306,7 @@ impl Seek for DiscFile {

impl VfsFile for DiscFile {
fn map(&mut self) -> io::Result<&[u8]> {
self.convert_to_mapped();
self.convert_to_mapped()?;
match &mut self.inner {
DiscFileInner::Stream(_) => unreachable!(),
DiscFileInner::Mapped(data) => Ok(data.get_ref()),
Expand Down
24 changes: 13 additions & 11 deletions src/vfs/std_fs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ impl StdFile {
pub fn new(path: Utf8NativePathBuf) -> Self { StdFile { path, file: None, mmap: None } }

pub fn file(&mut self) -> io::Result<&mut BufReader<fs::File>> {
if self.file.is_none() {
self.file = Some(BufReader::new(fs::File::open(&self.path)?));
}
Ok(self.file.as_mut().unwrap())
Ok(match self.file {
Some(ref mut file) => file,
None => self.file.insert(BufReader::new(fs::File::open(&self.path)?)),
})
}
}

Expand Down Expand Up @@ -86,13 +86,15 @@ impl Seek for StdFile {

impl VfsFile for StdFile {
fn map(&mut self) -> io::Result<&[u8]> {
if self.file.is_none() {
self.file = Some(BufReader::new(fs::File::open(&self.path)?));
}
if self.mmap.is_none() {
self.mmap = Some(unsafe { memmap2::Mmap::map(self.file.as_ref().unwrap().get_ref())? });
}
Ok(self.mmap.as_ref().unwrap())
let file = match self.file {
Some(ref mut file) => file,
None => self.file.insert(BufReader::new(fs::File::open(&self.path)?)),
};
let mmap = match self.mmap {
Some(ref mmap) => mmap,
None => self.mmap.insert(unsafe { memmap2::Mmap::map(file.get_ref())? }),
};
Ok(mmap)
}

fn metadata(&mut self) -> io::Result<VfsMetadata> {
Expand Down
45 changes: 26 additions & 19 deletions src/vfs/wad.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use crate::{
pub struct WadFs {
file: Box<dyn VfsFile>,
wad: WadFile,
mtime: Option<FileTime>,
}

enum WadFindResult<'a> {
Expand All @@ -34,9 +35,10 @@ enum WadFindResult<'a> {

impl WadFs {
pub fn new(mut file: Box<dyn VfsFile>) -> io::Result<Self> {
let mtime = file.metadata()?.mtime;
let wad = process_wad(file.as_mut())
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
Ok(Self { file, wad })
Ok(Self { file, wad, mtime })
}

fn find(&self, path: &str) -> Option<WadFindResult> {
Expand Down Expand Up @@ -81,7 +83,7 @@ impl Vfs for WadFs {
match result {
WadFindResult::Root => Err(VfsError::IsADirectory),
WadFindResult::Static(data) => {
Ok(Box::new(StaticFile::new(Arc::from(data), self.file.metadata()?.mtime)))
Ok(Box::new(StaticFile::new(Arc::from(data), self.mtime)))
}
WadFindResult::Content(content_index, content) => {
let offset = self.wad.content_offset(content_index);
Expand All @@ -93,7 +95,7 @@ impl Vfs for WadFs {
&self.wad.title_key,
&content.iv(),
),
self.file.metadata()?.mtime,
self.mtime,
)))
}
WadFindResult::Window(offset, len) => {
Expand Down Expand Up @@ -129,20 +131,23 @@ impl Vfs for WadFs {
}

fn metadata(&mut self, path: &Utf8UnixPath) -> VfsResult<VfsMetadata> {
let mtime = self.file.metadata()?.mtime;
if let Some(result) = self.find(path.as_str()) {
match result {
WadFindResult::Root => {
Ok(VfsMetadata { file_type: VfsFileType::Directory, len: 0, mtime })
}
WadFindResult::Static(data) => {
Ok(VfsMetadata { file_type: VfsFileType::File, len: data.len() as u64, mtime })
}
WadFindResult::Content(_, content) => {
Ok(VfsMetadata { file_type: VfsFileType::File, len: content.size.get(), mtime })
Ok(VfsMetadata { file_type: VfsFileType::Directory, len: 0, mtime: self.mtime })
}
WadFindResult::Static(data) => Ok(VfsMetadata {
file_type: VfsFileType::File,
len: data.len() as u64,
mtime: self.mtime,
}),
WadFindResult::Content(_, content) => Ok(VfsMetadata {
file_type: VfsFileType::File,
len: content.size.get(),
mtime: self.mtime,
}),
WadFindResult::Window(_, len) => {
Ok(VfsMetadata { file_type: VfsFileType::File, len, mtime })
Ok(VfsMetadata { file_type: VfsFileType::File, len, mtime: self.mtime })
}
}
} else {
Expand All @@ -168,19 +173,21 @@ impl WadContent {
Self { inner: WadContentInner::Stream(inner), mtime }
}

fn convert_to_mapped(&mut self) {
fn convert_to_mapped(&mut self) -> io::Result<()> {
match &mut self.inner {
WadContentInner::Stream(stream) => {
let pos = stream.stream_position().unwrap();
stream.seek(SeekFrom::Start(0)).unwrap();
let mut data = vec![0u8; stream.len() as usize];
stream.read_exact(&mut data).unwrap();
let mut cursor = Cursor::new(Arc::from(data.as_slice()));
let pos = stream.stream_position()?;
stream.seek(SeekFrom::Start(0))?;
let mut data = <[u8]>::new_box_zeroed_with_elems(stream.len() as usize)
.map_err(|_| io::Error::from(io::ErrorKind::OutOfMemory))?;
stream.read_exact(&mut data)?;
let mut cursor = Cursor::new(Arc::from(data));
cursor.set_position(pos);
self.inner = WadContentInner::Mapped(cursor);
}
WadContentInner::Mapped(_) => {}
};
Ok(())
}
}

Expand Down Expand Up @@ -220,7 +227,7 @@ impl Seek for WadContent {

impl VfsFile for WadContent {
fn map(&mut self) -> io::Result<&[u8]> {
self.convert_to_mapped();
self.convert_to_mapped()?;
match &mut self.inner {
WadContentInner::Stream(_) => unreachable!(),
WadContentInner::Mapped(data) => Ok(data.get_ref()),
Expand Down

0 comments on commit 91aa36c

Please sign in to comment.