bitsquid_dt/dtmt
bitsquid_dt/dtmt
2
Fork 0
Code Issues 34 Pull requests 11 Projects 1 Releases 3 Packages 1 Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

refactor: Properly handle unknown field

Browse source
This commit is contained in:
Lucas Schwiderski 2023-01-06 18:55:55 +01:00
parent 0441a0d932
commit db7790ec5b
Signed by: lucas
GPG key ID: AA12679AAA6DF4D8
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/sdk/src/bundle/mod.rs
View file

@ -92,7 +92,6 @@ pub struct Bundle {
_headers: Vec<EntryHeader>, _headers: Vec<EntryHeader>,
files: Vec<BundleFile>, files: Vec<BundleFile>,
name: String, name: String,
unknown_1: u32,
} }
impl Bundle { impl Bundle {
@ -122,14 +121,7 @@ impl Bundle {
return Err(eyre::eyre!("Unknown bundle format: {:?}", format)); return Err(eyre::eyre!("Unknown bundle format: {:?}", format));
} }
let unknown_1 = r.read_u32()?; r.skip_u32(0x3)?;
if unknown_1 != 0x3 {
tracing::warn!(
"Unexpected value for unknown header. Expected {:#08X}, got {:#08X}",
0x3,
unknown_1
);
}
let num_entries = r.read_u32()? as usize; let num_entries = r.read_u32()? as usize;
@ -224,7 +216,6 @@ impl Bundle {
format, format,
_headers: meta, _headers: meta,
files, files,
unknown_1,
properties, properties,
}) })
} }
@ -233,7 +224,8 @@ impl Bundle {
pub fn to_binary(&self, ctx: &crate::Context) -> Result<Vec<u8>> { pub fn to_binary(&self, ctx: &crate::Context) -> Result<Vec<u8>> {
let mut w = Cursor::new(Vec::new()); let mut w = Cursor::new(Vec::new());
w.write_u32(self.format.into())?; w.write_u32(self.format.into())?;
w.write_u32(self.unknown_1)?; // TODO: Find out what this is.
w.write_u32(0x3)?;
w.write_u32(self.files.len() as u32)?; w.write_u32(self.files.len() as u32)?;
for prop in self.properties.iter() { for prop in self.properties.iter() {
@ -331,7 +323,7 @@ where
} }
// Skip unknown 4 bytes // Skip unknown 4 bytes
r.seek(SeekFrom::Current(4))?; r.skip_u32(0x3)?;
let num_entries = r.read_u32()? as i64; let num_entries = r.read_u32()? as i64;
tracing::debug!(num_entries); tracing::debug!(num_entries);