redstrate/physis
1
Fork 0
mirror of https://github.com/redstrate/Physis.git synced 2025-04-26 14:17:45 +00:00
Code Activity

Properly propagate errors up the stack for game_data::extract

Browse source
This commit is contained in:
Joshua Goins 2022-08-09 22:43:04 -04:00
parent 22569cf09d
commit e094742690
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gamedata.rs
View file

@ -152,8 +152,7 @@ impl GameData {
pub fn extract(&self, path: &str) -> Option<MemoryBuffer> { pub fn extract(&self, path: &str) -> Option<MemoryBuffer> {
let hash = calculate_hash(path); let hash = calculate_hash(path);
let index_file = self.get_index_file(path) let index_file = self.get_index_file(path)?;
.expect("Failed to find index file.");
let slice = index_file.entries.iter().find(|s| s.hash == hash); let slice = index_file.entries.iter().find(|s| s.hash == hash);
match slice { match slice {
@ -162,10 +161,7 @@ impl GameData {
dat_file.read_from_offset(entry.bitfield.offset()) dat_file.read_from_offset(entry.bitfield.offset())
} }
None => { None => None
println!("Entry not found.");
None
}
} }
} }
@ -188,9 +184,9 @@ impl GameData {
} }
pub fn read_excel_sheet_header(&self, name : &str) -> Option<EXH> { pub fn read_excel_sheet_header(&self, name : &str) -> Option<EXH> {
let root_exl_file = self.extract("exd/root.exl").unwrap(); let root_exl_file = self.extract("exd/root.exl")?;
let root_exl = EXL::from_existing(&root_exl_file).unwrap(); let root_exl = EXL::from_existing(&root_exl_file)?;
for (row, _) in root_exl.entries { for (row, _) in root_exl.entries {
if row == name { if row == name {
@ -198,7 +194,7 @@ impl GameData {
let path = format!("exd/{new_filename}.exh"); let path = format!("exd/{new_filename}.exh");
return EXH::from_existing(&self.extract(&path).unwrap()) return EXH::from_existing(&self.extract(&path)?)
} }
} }

3
src/index.rs
View file

@ -74,8 +74,7 @@ pub struct IndexFile {
impl IndexFile { impl IndexFile {
/// Creates a new reference to an existing index file, this reads both an index and index2 file. /// Creates a new reference to an existing index file, this reads both an index and index2 file.
pub fn from_existing(path: &str) -> Option<IndexFile> { pub fn from_existing(path: &str) -> Option<IndexFile> {
let mut index_file = std::fs::File::open(path) let mut index_file = std::fs::File::open(path).ok()?;
.expect("Failed to read index file.");
IndexFile::read(&mut index_file).ok() IndexFile::read(&mut index_file).ok()
} }