Leahnaya/kbinxml-rs
1
0
Fork 0
mirror of https://github.com/mbilker/kbinxml-rs.git synced 2026-09-10 03:25:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: use encoding specified in options

Browse Source
This commit is contained in:
Matt Bilker
2018-06-12 20:05:10 +00:00
parent 9d3848eff1
commit 92d2573336
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib.rs
View File

@@ -120,10 +120,10 @@ impl KbinXml {
encoding.decode_bytes(data)
}
fn data_buf_write_str(&mut self, data_buf: &mut Cursor<Vec<u8>>, data: &str, encoding: EncodingType) -> Result<()> {
trace!("data_buf_write_str => input: {}", data);
fn data_buf_write_str(&mut self, data_buf: &mut Cursor<Vec<u8>>, data: &str) -> Result<()> {
trace!("data_buf_write_str => input: {}, data: 0x{:02x?}", data, data.as_bytes());
let bytes = encoding.encode_bytes(data)?;
let bytes = self.options.encoding.encode_bytes(data)?;
self.data_buf_write(data_buf, &bytes)?;
Ok(())
@@ -438,7 +438,6 @@ impl KbinXml {
}
fn write_node(&mut self, node_buf: &mut Cursor<Vec<u8>>, data_buf: &mut Cursor<Vec<u8>>, input: &Element) -> Result<()> {
let encoding = EncodingType::SHIFT_JIS;
let text = input.text();
let node_type = match input.attr("__type") {
Some(name) => StandardType::from_name(name),
@@ -487,7 +486,7 @@ impl KbinXml {
self.data_buf_realign_writes(data_buf, None)?;
},
StandardType::String => {
self.data_buf_write_str(data_buf, &text, encoding)?;
self.data_buf_write_str(data_buf, &text)?;
},
_ => {
@@ -513,7 +512,7 @@ impl KbinXml {
trace!("write_node => attr: {}, value: {}", key, value);
self.data_buf_write_str(data_buf, value, encoding)?;
self.data_buf_write_str(data_buf, value)?;
let node_type = StandardType::Attribute;
node_buf.write_u8(node_type.id).context(KbinErrorKind::DataWrite(node_type.name))?;