Implement deserialize

Remove bincode crate and replace it by own written serializer

2 files changed, 36 insertions, 28 deletions

diff --git a/src/zip/driver.rs b/src/zip/driver.rs
index d575509..e5aa58d 100644
--- a/src/zip/driver.rs
+++ b/src/zip/driver.rs
@@ -1,6 +1,6 @@
 use crate::driver::{ArchiveRead, ArchiveWrite, Driver};
 use crate::zip::error::{ZipError, ZipResult};
-use crate::zip::structs::{EOCDR64Locator, CDR, EOCDR, EOCDR64};
+use crate::zip::structs::{deserialize, EOCDR64Locator, CDR, EOCDR, EOCDR64};
 use crate::zip::ZipFile;
 use std::collections::HashMap as Map;
 use std::fs::File;
@@ -41,7 +41,7 @@ impl<IO: Read + Seek> ArchiveRead for Zip<IO> {
             io.read(&mut buf)?;
             buf
         };
-        let eocdr: EOCDR = bincode::deserialize(&buf).map_err(|_| ZipError::InvalidEOCDR)?;
+        let eocdr: EOCDR = deserialize(&buf).map_err(|_| ZipError::InvalidEOCDR)?;
         let comment = {
             let mut buf: Vec<u8> = vec![0; eocdr.comment_len as usize];
             io.read(&mut buf)?;
@@ -55,31 +55,31 @@ impl<IO: Read + Seek> ArchiveRead for Zip<IO> {
             io.read(&mut buf)?;
             buf
         };
-        let (cd_pointer, cd_size, cd_records) =
-            if u32::from_le_bytes(buf[0..4].try_into().unwrap()) == 0x07064b50 {
-                let eocdr64locator: EOCDR64Locator =
-                    bincode::deserialize(&buf[4..]).map_err(|_| ZipError::InvalidEOCDR64Locator)?;
-
-                io.seek(SeekFrom::Start(eocdr64locator.eocdr64_pointer))?;
-                let buf = {
-                    let mut buf = [0; 56];
-                    io.read(&mut buf)?;
-                    buf
-                };
-                if u32::from_le_bytes(buf[0..4].try_into().unwrap()) != 0x06064b50 {
-                    return Err(ZipError::InvalidEOCDR64Signature.into());
-                }
-                let eocdr64: EOCDR64 =
-                    bincode::deserialize(&buf[4..]).map_err(|_| ZipError::InvalidEOCDR64)?;
-
-                (eocdr64.cd_pointer, eocdr64.cd_size, eocdr64.cd_records)
-            } else {
-                (
-                    eocdr.cd_pointer as u64,
-                    eocdr.cd_size as u64,
-                    eocdr.cd_records as u64,
-                )
+        let (cd_pointer, cd_size, cd_records) = if u32::from_le_bytes(buf[0..4].try_into().unwrap())
+            == 0x07064b50
+        {
+            let eocdr64locator: EOCDR64Locator =
+                deserialize(&buf[4..]).map_err(|_| ZipError::InvalidEOCDR64Locator)?;
+
+            io.seek(SeekFrom::Start(eocdr64locator.eocdr64_pointer))?;
+            let buf = {
+                let mut buf = [0; 56];
+                io.read(&mut buf)?;
+                buf
             };
+            if u32::from_le_bytes(buf[0..4].try_into().unwrap()) != 0x06064b50 {
+                return Err(ZipError::InvalidEOCDR64Signature.into());
+            }
+            let eocdr64: EOCDR64 = deserialize(&buf[4..]).map_err(|_| ZipError::InvalidEOCDR64)?;
+
+            (eocdr64.cd_pointer, eocdr64.cd_size, eocdr64.cd_records)
+        } else {
+            (
+                eocdr.cd_pointer as u64,
+                eocdr.cd_size as u64,
+                eocdr.cd_records as u64,
+            )
+        };
 
         // Read cd records
         let mut files = Map::with_capacity(cd_records as usize);
@@ -96,8 +96,7 @@ impl<IO: Read + Seek> ArchiveRead for Zip<IO> {
                 return Err(ZipError::InvalidCDRSignature.into());
             }
             p += 4;
-            let cdr: CDR =
-                bincode::deserialize(&buf[p..p + 42]).map_err(|_| ZipError::InvalidCDR)?;
+            let cdr: CDR = deserialize(&buf[p..p + 42]).map_err(|_| ZipError::InvalidCDR)?;
             p += 42;
             let name = String::from_utf8(buf[p..p + cdr.name_len as usize].into()).unwrap();
             p += cdr.name_len as usize;
diff --git a/src/zip/structs.rs b/src/zip/structs.rs
index e38f9f0..0f9579e 100644
--- a/src/zip/structs.rs
+++ b/src/zip/structs.rs
@@ -1,3 +1,4 @@
+use crate::structs::{Settings, StructResult};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
@@ -50,3 +51,11 @@ pub struct CDR {
     pub external_attributes: u32,
     pub header_pointer: u32,
 }
+
+pub fn serialize<T: Serialize>(object: &mut T) -> StructResult<Vec<u8>> {
+    Settings::default().serialize(object)
+}
+
+pub fn deserialize<'de, T: Deserialize<'de>>(object: &'de [u8]) -> StructResult<T> {
+    Settings::default().deserialize(object)
+}