gered/pso_gc_tools
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add helper trait for reading fixed-length byte arrays

Browse source 
a minor thing, but helps turn this pattern into a nice 1-liner
This commit is contained in:
Gered 2021-05-17 13:57:08 -04:00
parent f2ec776d3f
commit c59d115aba
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
psoutils/src/bytes.rs
View file

@ -1,3 +1,6 @@
use byteorder::ReadBytesExt;
use std::io::Error;
pub trait FixedLengthByteArrays { pub trait FixedLengthByteArrays {
fn as_unpadded_slice(&self) -> &[u8]; fn as_unpadded_slice(&self) -> &[u8];
fn to_fixed_length(&self, length: usize) -> Vec<u8>; fn to_fixed_length(&self, length: usize) -> Vec<u8>;
@ -30,6 +33,19 @@ impl<T: AsRef<[u8]> + ?Sized> FixedLengthByteArrays for T {
} }
} }
pub trait ReadFixedLengthByteArray {
fn read_bytes<const N: usize>(&mut self) -> Result<[u8; N], std::io::Error>;
}
impl<T: ReadBytesExt> ReadFixedLengthByteArray for T {
fn read_bytes<const N: usize>(&mut self) -> Result<[u8; N], Error> {
assert_ne!(N, 0);
let mut array = [0u8; N];
self.read_exact(&mut array)?;
Ok(array)
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

11
psoutils/src/quest/bin.rs
View file

@ -113,8 +113,7 @@ impl QuestBin {
number: quest_number_and_episode, number: quest_number_and_episode,
}; };
let mut name_bytes = [0u8; QUEST_BIN_NAME_LENGTH]; let name_bytes: [u8; QUEST_BIN_NAME_LENGTH] = reader.read_bytes()?;
reader.read_exact(&mut name_bytes)?;
let name = match language.decode_text(name_bytes.as_unpadded_slice()) { let name = match language.decode_text(name_bytes.as_unpadded_slice()) {
Err(e) => { Err(e) => {
return Err(QuestBinError::DataFormatError(format!( return Err(QuestBinError::DataFormatError(format!(
@ -125,8 +124,8 @@ impl QuestBin {
Ok(value) => value, Ok(value) => value,
}; };
let mut short_description_bytes = [0u8; QUEST_BIN_SHORT_DESCRIPTION_LENGTH]; let short_description_bytes: [u8; QUEST_BIN_SHORT_DESCRIPTION_LENGTH] =
reader.read_exact(&mut short_description_bytes)?; reader.read_bytes()?;
let short_description = let short_description =
match language.decode_text(short_description_bytes.as_unpadded_slice()) { match language.decode_text(short_description_bytes.as_unpadded_slice()) {
Err(e) => { Err(e) => {
@ -138,8 +137,8 @@ impl QuestBin {
Ok(value) => value, Ok(value) => value,
}; };
let mut long_description_bytes = [0u8; QUEST_BIN_LONG_DESCRIPTION_LENGTH]; let long_description_bytes: [u8; QUEST_BIN_LONG_DESCRIPTION_LENGTH] =
reader.read_exact(&mut long_description_bytes)?; reader.read_bytes()?;
let long_description = let long_description =
match language.decode_text(long_description_bytes.as_unpadded_slice()) { match language.decode_text(long_description_bytes.as_unpadded_slice()) {
Err(e) => { Err(e) => {