paramdef: better pretty-print

src/parsers/paramdef.rs

@@ -10,24 +10,24 @@ pub struct ParamdefHeader {
     pub file_size: u32,
     pub header_size: u16,
     pub data_version: u16,
-    pub num_entries: u16,
+    pub num_fields: u16,
-    pub entry_size: u16,
+    pub field_size: u16,
     pub param_name: String,
     pub endianness: u8,
     pub unicode: u8,
     pub format_version: u16,
-    pub ofs_entries: u64,
+    pub ofs_fields: u64,
 }
 
 impl ParamdefHeader {
     pub fn use_be(&self) -> bool { use_be(self.endianness) }
-    pub fn has_ofs_entries(&self) -> bool { has_ofs_entries(self.format_version) }
+    pub fn has_ofs_fields(&self) -> bool { has_ofs_fields(self.format_version) }
     pub fn has_64b_ofs_desc(&self) -> bool { self.format_version >= 201 }
 }
 
 fn use_be(endianness: u8) -> bool { endianness == 0xFF }
 
-fn has_ofs_entries(format_version: u16) -> bool { format_version >= 201 }
+fn has_ofs_fields(format_version: u16) -> bool { format_version >= 201 }
 
 fn parse_header(i: &[u8]) -> IResult<&[u8], ParamdefHeader> {
     let p_u32 = if use_be(i[0x2C]) { be_u32 } else { le_u32 };
@@ -38,32 +38,31 @@ fn parse_header(i: &[u8]) -> IResult<&[u8], ParamdefHeader> {
     let (i, (endianness, unicode, format_version)) =
         tuple((le_u8, le_u8, p_u16))(i)?;
 
-    let (i, ofs_entries) = if has_ofs_entries(format_version) {
+    let (i, ofs_entries) = if has_ofs_fields(format_version) {
         let p_u64 = if use_be(i[0x2C]) { be_u64 } else { le_u64 };
         p_u64(i)?
     } else {
         (i, 0)
     };
 
-
     Ok((
         i,
         ParamdefHeader {
             file_size,
             header_size,
             data_version,
-            num_entries,
+            num_fields: num_entries,
-            entry_size,
+            field_size: entry_size,
             param_name: String::from_utf8_lossy(param_name).to_string(),
             endianness,
             unicode,
             format_version,
-            ofs_entries,
+            ofs_fields: ofs_entries,
         }
     ))
 }
 
-pub struct ParamdefEntry {
+pub struct ParamdefField {
     pub display_name: String,
     pub display_type: String,
     pub display_format: String,
@@ -73,7 +72,7 @@ pub struct ParamdefEntry {
     pub increment: f32,
     pub edit_flags: u32,
     pub byte_count: u32,
-    pub ofs_desc: ParamdefEntryDescOffset,
+    pub ofs_desc: ParamdefFieldDescOffset,
     pub internal_type: String,
     pub internal_name: Option<String>,
     pub sort_id: u32,
@@ -86,7 +85,7 @@ pub union ParamdefEntryDescOffset {
     ofs64: u64,
 }
 
-fn parse_entry<'a>(i: &'a[u8], header: &ParamdefHeader) -> IResult<&'a[u8], ParamdefEntry> {
+fn parse_field<'a>(i: &'a[u8], header: &ParamdefHeader) -> IResult<&'a[u8], ParamdefField> {
     let (i, display_name) = take_cstring_from(i, 0x40)?;
     let (i, display_type) = take_cstring_from(i, 0x8)?;
     let (i, display_format) = take_cstring_from(i, 0x8)?;
@@ -100,10 +99,10 @@ fn parse_entry<'a>(i: &'a[u8], header: &ParamdefHeader) -> IResult<&'a[u8], Para
 
     let (i, ofs_desc) = if header.format_version < 201 {
         let (i, o) = p_u32(i)?;
-        (i, ParamdefEntryDescOffset { ofs32: o })
+        (i, ParamdefFieldDescOffset { ofs32: o })
     } else {
         let (i, o) = p_u64(i)?;
-        (i, ParamdefEntryDescOffset { ofs64: o })
+        (i, ParamdefFieldDescOffset { ofs64: o })
     };
 
     let (i, internal_type) = take_cstring_from(i, 0x20)?;
@@ -118,7 +117,7 @@ fn parse_entry<'a>(i: &'a[u8], header: &ParamdefHeader) -> IResult<&'a[u8], Para
 
     Ok((
         i,
-        ParamdefEntry {
+        ParamdefField {
             display_name: sjis_to_string_lossy(display_name),
             display_type: sjis_to_string_lossy(display_type),
             display_format: sjis_to_string_lossy(display_format),
@@ -140,32 +139,32 @@ fn parse_entry<'a>(i: &'a[u8], header: &ParamdefHeader) -> IResult<&'a[u8], Para
 
 pub struct Paramdef {
     pub header: ParamdefHeader,
-    pub entries: Vec<ParamdefEntry>,
+    pub fields: Vec<ParamdefField>,
 }
 
 pub fn parse(i: &[u8]) -> IResult<&[u8], Paramdef> {
     let full_file = i;
     let (i, header) = parse_header(i)?;
-    let i = if header.has_ofs_entries() {
+    let i = if header.has_ofs_fields() {
-        let ofs_entries = header.ofs_entries as usize;
+        let ofs_fields = header.ofs_fields as usize;
-        &full_file[ofs_entries..]
+        &full_file[ofs_fields..]
     } else {
         i  // Unsure if header.header_size has to be used here, pray there never is padding.
     };
-    let (i, mut entries) = count(|i| parse_entry(i, &header), header.num_entries as usize)(i)?;
+    let (i, mut fields) = count(|i| parse_field(i, &header), header.num_fields as usize)(i)?;
 
-    for entry in &mut entries {
+    for field in &mut fields {
         let ofs: usize = if header.has_64b_ofs_desc() {
-            unsafe { entry.ofs_desc.ofs64 as usize }
+            unsafe { field.ofs_desc.ofs64 as usize }
         } else {
-            unsafe { entry.ofs_desc.ofs32 as usize }
+            unsafe { field.ofs_desc.ofs32 as usize }
         };
         if ofs == 0 {
             continue
         }
         let (_, sjis_desc) = take_cstring(&full_file[ofs..])?;
-        entry.description = Some(sjis_to_string_lossy(sjis_desc));
+        field.description = Some(sjis_to_string_lossy(sjis_desc));
     }
 
-    Ok((i, Paramdef { header, entries }))
+    Ok((i, Paramdef { header, fields: fields }))
 }

src/unpackers/paramdef.rs

@@ -20,17 +20,21 @@ pub fn load_paramdef(paramdef_data: &[u8]) -> Result<paramdef::Paramdef, UnpackE
 }
 
 pub fn print_paramdef(paramdef: &paramdef::Paramdef) {
-    println!("{} -- {} entries", paramdef.header.param_name, paramdef.header.num_entries);
+    println!("{} -- ver. {} -- format ver. {} -- {} fields",
-    println!("Data version: {}", paramdef.header.data_version);
+        paramdef.header.param_name,
-    println!("Format version: {}", paramdef.header.format_version);
+        paramdef.header.data_version, paramdef.header.format_version,
+        paramdef.header.num_fields);
 
-    for entry in &paramdef.entries {
+    for field in &paramdef.fields {
-        println!("  - {} ({})", entry.display_name, entry.display_type);
+        println!("  - [{}] {} ({}) {} ({}, {} bytes)",
-        if let Some(name) = &entry.internal_name {
+            field.sort_id, field.display_name,
-            println!("    Internal name and type: {}, {}", name, entry.internal_type);
+            field.internal_name.as_ref().unwrap_or(&String::from("<noname>")),
-        }
+            field.display_type, field.internal_type, field.byte_count);
-        if let Some(desc) = &entry.description {
+        println!("    Values: default {}, range [{}, {}], inc {}",
+            field.default_value, field.min_value, field.max_value, field.increment);
+        if let Some(desc) = &field.description {
             println!("    Description: {}", desc);
         }
+        println!("    Edit flags: {:X}", field.edit_flags);
     }
 }