redstrate/ireko
1
Fork 0
Code Activity Actions

Replace manual string parsing/old property-magic system in Entry

Browse source
This commit is contained in:
Joshua Goins 2025-02-23 16:00:35 -05:00
parent fe2cb4e624
commit ef0f4adb6f
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/lib.rs
View file

@ -20,6 +20,7 @@ use crate::set_property::SetProperty;
use crate::str_property::StrProperty; use crate::str_property::StrProperty;
use crate::struct_property::StructProperty; use crate::struct_property::StructProperty;
use binrw::binrw; use binrw::binrw;
use crate::common::read_string_with_length;
#[binrw] #[binrw]
#[derive(Debug)] #[derive(Debug)]
@ -61,6 +62,8 @@ pub enum StringBasedProperty {
Bool(BoolProperty), Bool(BoolProperty),
#[br(pre_assert("IntProperty" == magic))] #[br(pre_assert("IntProperty" == magic))]
Int(IntProperty), Int(IntProperty),
#[br(pre_assert("ArrayProperty" == magic))]
Array(ArrayProperty),
#[br(pre_assert("MapProperty" == magic))] #[br(pre_assert("MapProperty" == magic))]
Map(MapProperty), Map(MapProperty),
#[br(pre_assert("SetProperty" == magic))] #[br(pre_assert("SetProperty" == magic))]
@ -70,19 +73,17 @@ pub enum StringBasedProperty {
#[binrw] #[binrw]
#[derive(Debug)] #[derive(Debug)]
pub struct Entry { pub struct Entry {
#[br(temp)] #[br(parse_with = read_string_with_length)]
#[bw(ignore)] #[bw(ignore)]
pub name_length: u32,
#[br(count = name_length)]
#[bw(map = |x : &String | x.as_bytes())]
#[br(map = | x: Vec<u8> | String::from_utf8(x).unwrap().trim_matches(char::from(0)).to_string())]
pub name: String, pub name: String,
#[br(temp)]
#[br(parse_with = read_string_with_length)]
#[bw(ignore)] #[bw(ignore)]
#[br(if(name != "None"))] #[br(temp, if(name != "None"))]
pub type_length: Option<u32>, pub type_name: String,
#[br(if(name != "None"))]
pub r#type: Option<Property>, #[br(if(name != "None"), args { magic: &type_name })]
pub r#type: Option<StringBasedProperty>,
} }
#[binrw] #[binrw]