Merge pull request #2 from acridotheres/1-fix-msbt

1 fix msbt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "acridotheres-3ds"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 description = "Nintendo 3DS-specific file formats for Acridotheres"
 license = "MIT"

src/msbt/create.rs

@@ -1,4 +1,4 @@
-use super::MsbtFileSource;
+use super::{hashtables::padding_len, MsbtFileSource};
 use dh::{recommended::*, Readable, Writable};
 use std::io::Result;
 
@@ -58,7 +58,7 @@ pub fn create<'a>(
     let pos = target.pos()?;
     let labels_size = pos - table_pos;
     target.write_u32le_at(labels_size_pos, labels_size as u32)?;
-    target.write_bytes(&vec![0xab; 16 - pos as usize % 16])?;
+    target.write_bytes(&vec![0xab; padding_len(pos) as usize])?;
 
     // attributes section
     if has_attr_section {
@@ -137,6 +137,6 @@ pub fn create<'a>(
     let pos = target.pos()?;
     let text_size = pos - table_pos;
     target.write_u32le_at(text_size_pos, text_size as u32)?;
-    target.write_bytes(&vec![0xab; 16 - pos as usize % 16])?;
+    target.write_bytes(&vec![0xab; padding_len(pos) as usize])?;
     Ok(())
 }

src/msbt/hashtables.rs

@@ -1,6 +1,15 @@
 use dh::{recommended::*, Readable};
 use std::{collections::HashMap, io::Result};
 
+pub fn padding_len(pos: u64) -> u64 {
+    let res = pos % 16;
+    if res == 0 {
+        0
+    } else {
+        16 - res
+    }
+}
+
 // https://zeldamods.org/wiki/Msbt#Labels_Section
 pub fn parse_label_block(
     reader: &mut dyn Readable,
@@ -33,7 +42,7 @@ pub fn parse_label_block(
 
     reader.to(table_start + size as u64)?;
     let pos = reader.pos()?;
-    reader.jump(16 - pos as i64 % 16)?;
+    reader.jump(padding_len(pos) as i64)?;
 
     Ok(labels)
 }
@@ -45,7 +54,7 @@ pub fn parse_attr_block(reader: &mut dyn Readable, big_endian: bool) -> Result<(
     let start = reader.pos()?;
     reader.jump(size as i64)?;
     let pos = reader.pos()?;
-    reader.jump(16 - pos as i64 % 16)?;
+    reader.jump(padding_len(pos) as i64)?;
 
     Ok((start, size as u64))
 }

tests/msbt.rs

@@ -37,6 +37,18 @@ fn msbt_secretary() {
     assert!(string.starts_with("Sure thing!"));
 }
 
+#[test]
+fn msbt_an_3p_fu() {
+    let mut reader = dh::file::open_r("tests/samples/AN_3P_Fu.msbt").unwrap();
+    let metadata = msbt::metadata(&mut reader).unwrap();
+    assert_eq!(metadata.files.len(), 56);
+
+    let mut target = dh::data::write_empty();
+    msbt::extract(&mut reader, &mut target, &metadata.files[31]).unwrap();
+    let string = String::from_utf8(dh::data::close(target)).unwrap();
+    assert!(string.starts_with("<{0003,0016,}>Oh!<{0007,0000,14000000}> That might work!"));
+}
+
 #[test]
 fn custom_msbt() {
     let mut file0 = dh::data::read_ref(b"Hello, world!");