refactor(nosapi_data): remove FileParser trait

crates/nosapi_data/src/nos/text.rs

@@ -1,4 +1,4 @@
-use std::io::{Read, Seek, SeekFrom};
+use std::io::{Cursor, Read, Seek, SeekFrom};
 
 use byteorder::{LittleEndian, ReadBytesExt};
 use chrono::{DateTime, TimeZone, Utc};
@@ -7,7 +7,7 @@ use derivative::Derivative;
 use crate::nos::decrypt::{NOSFileDecryptor, NOSTextFileDataDecryptor, NOSTextFileSimpleDecryptor};
 use crate::nos::error::NOSFileError;
 use crate::nos::NOSFileType;
-use crate::traits::{FileParser, ReadExt};
+use crate::traits::ReadExt;
 
 static OLE_TIME_CHECK: [u8; 4] = [0xEE, 0x3E, 0x32, 0x01];
 
@@ -35,13 +35,12 @@ pub struct NOSTextFileEntry {
   pub raw_content: Vec<u8>,
 }
 
-impl FileParser for NOSTextFile {
-  type Error = NOSFileError;
+impl NOSTextFile {
+  pub fn from_bytes<T: AsRef<[u8]> + ?Sized>(bytes: &T) -> Result<Self, NOSFileError> {
+    Self::from_reader(&mut Cursor::new(bytes.as_ref()))
+  }
 
-  fn from_reader<T: Read + Seek>(reader: &mut T) -> Result<Self, Self::Error>
-  where
-    Self: Sized,
-  {
+  fn from_reader<T: Read + Seek>(reader: &mut T) -> Result<Self, NOSFileError> {
     let file_type = NOSFileType::from_reader(reader)?;
 
     if file_type != NOSFileType::Text {
@@ -81,13 +80,12 @@ impl FileParser for NOSTextFile {
   }
 }
 
-impl FileParser for NOSTextFileEntry {
-  type Error = NOSFileError;
+impl NOSTextFileEntry {
+  pub fn from_bytes<T: AsRef<[u8]> + ?Sized>(bytes: &T) -> Result<Self, NOSFileError> {
+    Self::from_reader(&mut Cursor::new(bytes.as_ref()))
+  }
 
-  fn from_reader<T: Read + Seek>(reader: &mut T) -> Result<Self, Self::Error>
-  where
-    Self: Sized,
-  {
+  pub fn from_reader<T: Read + Seek>(reader: &mut T) -> Result<Self, NOSFileError> {
     let file_number = reader.read_i32::<LittleEndian>()?;
     let name_size = reader.read_i32::<LittleEndian>()? as usize;
     let name = reader.read_to_utf8_sized(name_size)?;

crates/nosapi_data/src/nos/type.rs

@@ -1,7 +1,6 @@
 use std::io::{Read, Seek};
 
 use crate::nos::error::NOSFileHeaderError;
-use crate::traits::FileParser;
 
 static DATA_FILE_HEADER: [&str; 3] = ["NT Data", "32GBS V1.0", "ITEMS V1.0"];
 static CCINF_FILE_HEADER: &str = "CCINF V1.20";
@@ -13,13 +12,8 @@ pub enum NOSFileType {
   CCInf,
 }
 
-impl FileParser for NOSFileType {
-  type Error = NOSFileHeaderError;
-
-  fn from_bytes<T: AsRef<[u8]> + ?Sized>(bytes: &T) -> Result<Self, Self::Error>
-  where
-    Self: Sized,
-  {
+impl NOSFileType {
+  pub fn from_bytes<T: AsRef<[u8]> + ?Sized>(bytes: &T) -> Result<Self, NOSFileHeaderError> {
     let bytes = bytes.as_ref();
 
     if bytes.len() != 0x0B {
@@ -42,10 +36,7 @@ impl FileParser for NOSFileType {
     })
   }
 
-  fn from_reader<T: Read + Seek>(reader: &mut T) -> Result<Self, Self::Error>
-  where
-    Self: Sized,
-  {
+  pub fn from_reader<T: Read + Seek>(reader: &mut T) -> Result<Self, NOSFileHeaderError> {
     let mut buf = [0u8; 0x0B];
     reader
       .read_exact(&mut buf)

crates/nosapi_data/src/prelude.rs

@@ -1 +1,2 @@
-pub use crate::traits::FileParser;
+pub use crate::client::error::*;
+pub use crate::nos::error::*;

crates/nosapi_data/src/traits.rs

@@ -1,6 +1,5 @@
-use std::error::Error;
 use std::io;
-use std::io::{Cursor, Read, Seek};
+use std::io::Read;
 
 pub(crate) trait ReadExt: Read {
   fn read_to_utf8_sized(&mut self, size: usize) -> io::Result<String> {
@@ -11,19 +10,4 @@ pub(crate) trait ReadExt: Read {
   }
 }
 
-pub trait FileParser {
-  type Error: Error;
-
-  fn from_bytes<T: AsRef<[u8]> + ?Sized>(bytes: &T) -> Result<Self, Self::Error>
-  where
-    Self: Sized,
-  {
-    Self::from_reader(&mut Cursor::new(bytes.as_ref()))
-  }
-
-  fn from_reader<T: Read + Seek>(reader: &mut T) -> Result<Self, Self::Error>
-  where
-    Self: Sized;
-}
-
 impl<T> ReadExt for T where T: Read {}

crates/nosapi_data/tests/nos/text.rs

@@ -6,7 +6,6 @@ use sha1_smol::Sha1;
 
 use nosapi_data::nos::error::NOSFileError;
 use nosapi_data::nos::{NOSTextFile, NOSTextFileEntry};
-use nosapi_data::prelude::*;
 
 static FILE_PATH: &str = "./tests/fixtures/NSgtdData.NOS";
 static LST_FILE_SHA1: &str = "da39a3ee5e6b4b0d3255bfef95601890afd80709";

crates/nosapi_data/tests/nos/type.rs

@@ -1,6 +1,5 @@
 use nosapi_data::nos::error::NOSFileHeaderError;
 use nosapi_data::nos::{NOSDataType, NOSFileType};
-use nosapi_data::prelude::*;
 
 #[test]
 fn handles_invalid_header_size() {