feat(decompress-plz): changed ContentEncoding argument to EncodingInfo

Author: darkseid-is

decompression-plz/src/decompression/mod.rs

@@ -2,14 +2,26 @@ use std::io::{Read, Write, copy};
 
 use brotli::Decompressor;
 use bytes::{BufMut, BytesMut, buf::Writer};
-use header_plz::body_headers::content_encoding::ContentEncoding;
+use header_plz::body_headers::{content_encoding::ContentEncoding, encoding_info::EncodingInfo};
 
 mod decompressors;
 mod magic_bytes;
 use decompressors::*;
 
-use crate::decompression::error::DecompressError;
-mod error;
+use crate::{decompression::error::DecompressError, error::DecompressErrorStruct};
+pub mod error;
+
+pub fn decompress_all<R, W>(
+    compressed: R,
+    writer: W,
+    encoding_info: &[EncodingInfo],
+) -> Result<BytesMut, DecompressErrorStruct>
+where
+    R: Read,
+    W: Write,
+{
+    todo!()
+}
 
 pub fn decompress<R, W>(
     mut input: R,

decompression-plz/src/dstruct.rs

@@ -1,24 +1,24 @@
 use bytes::BytesMut;
-use header_plz::body_headers::content_encoding::ContentEncoding;
+use header_plz::body_headers::{content_encoding::ContentEncoding, encoding_info::EncodingInfo};
 
 pub struct DecompressionStruct<'a> {
     main: BytesMut,
     pub extra: Option<BytesMut>,
-    encodings: &'a [ContentEncoding],
+    encoding_info: &'a [EncodingInfo],
     buf: &'a mut BytesMut,
 }
 
 impl<'a> DecompressionStruct<'a> {
     pub fn new(
         main: BytesMut,
         extra: Option<BytesMut>,
-        encodings: &'a [ContentEncoding],
+        encoding_info: &'a [EncodingInfo],
         buf: &'a mut BytesMut,
     ) -> Self {
         Self {
             main,
             extra,
-            encodings,
+            encoding_info,
             buf,
         }
     }

decompression-plz/src/lib.rs

@@ -1,4 +1,5 @@
 #![allow(warnings)]
-mod decompression;
+pub mod decompression;
 pub mod dstruct;
+mod error;
 mod state;

decompression-plz/src/state.rs

@@ -1,6 +1,25 @@
-use crate::dstruct::DecompressionStruct;
+use crate::{dstruct::DecompressionStruct, error::DecompressErrorStruct};
 use bytes::BytesMut;
-use header_plz::body_headers::content_encoding::ContentEncoding;
+use header_plz::body_headers::{content_encoding::ContentEncoding, encoding_info::EncodingInfo};
+
+/*
+1. Main
+    true    => Main_decompressed + Extra_decompressed
+    false   => Err()
+
+2. Extra
+    true    => Main
+    false   => Main + Extra
+
+3. Main + Extra
+    true    => Main_and_Extra_decompressed
+    false   => Err()
+*/
+
+// 1. Try decompressing extra
+// 2. If success, try decompressing main
+// 2. If failed, try decompressing main + extra
+// 3. If failed, try decompressing main
 
 enum State<'a> {
     // Main
@@ -18,33 +37,22 @@ impl<'a> State<'a> {
     fn start(
         main: BytesMut,
         extra: Option<BytesMut>,
-        encodings: &'a [ContentEncoding],
+        encodings: &'a [EncodingInfo],
         buf: &'a mut BytesMut,
     ) -> Self {
-        let d = DecompressionStruct::new(main, extra, encodings, buf);
-        if d.extra.is_some() {
-            Self::Extra(d)
+        let dstruct = DecompressionStruct::new(main, extra, encodings, buf);
+        if dstruct.extra.is_some() {
+            Self::Extra(dstruct)
         } else {
-            Self::MainOnly(d)
+            Self::MainOnly(dstruct)
         }
     }
-}
 
-/*
-1. Extra
-    true    => Main
-    false   => Main + Extra
-
-2. Main
-    true    => Main_decompressed + Extra_decompressed
-    false   => Err()
-
-3. Main + Extra
-    true    => Main_and_Extra_decompressed
-    false   => Err()
-*/
+    fn try_next(self) -> Result<Self, DecompressErrorStruct> {
+        todo!()
+    }
 
-// 1. Try decompressing extra
-// 2. If success, try decompressing main
-// 2. If failed, try decompressing main + extra
-// 3. If failed, try decompressing main
+    fn ended(self) -> bool {
+        matches!(self, Self::EndMainOnly(_)) || matches!(self, Self::EndMainOnyDecompressed(_))
+    }
+}