feat(decompression-plz): changed decompression_multi to accept generic iterator

Author: darkseid-is

decompression-plz/src/decompression/multi/mod.rs

@@ -11,16 +11,18 @@ use crate::{
 pub mod error;
 use error::*;
 
-pub fn decompress_multi(
+pub fn decompress_multi<'a, T>(
     mut compressed: &[u8],
     mut writer: &mut Writer<&mut BytesMut>,
-    encoding_info: &[EncodingInfo],
-) -> Result<BytesMut, MultiDecompressError> {
+    encoding_info: T,
+) -> Result<BytesMut, MultiDecompressError>
+where
+    T: Iterator<Item = &'a EncodingInfo> + std::iter::DoubleEndedIterator,
+{
     let mut input: &[u8] = compressed;
     let mut output: BytesMut = writer.get_mut().split();
 
-    for (header_index, encoding_info) in encoding_info.iter().rev().enumerate()
-    {
+    for (header_index, encoding_info) in encoding_info.rev().enumerate() {
         for (compression_index, encoding) in
             encoding_info.encodings().iter().rev().enumerate()
         {
@@ -77,7 +79,8 @@ mod tests {
             ],
         )];
         let result =
-            decompress_multi(&input, &mut writer, &einfo_list).unwrap();
+            decompress_multi(&input, &mut writer, &mut einfo_list.iter())
+                .unwrap();
         assert_eq!(result, INPUT);
     }
 
@@ -95,7 +98,8 @@ mod tests {
         ];
 
         let result =
-            decompress_multi(&input, &mut writer, &einfo_list).unwrap();
+            decompress_multi(&input, &mut writer, &mut einfo_list.iter())
+                .unwrap();
         assert_eq!(result, INPUT);
     }
 
@@ -120,7 +124,8 @@ mod tests {
         ];
 
         let result =
-            decompress_multi(&input, &mut writer, &einfo_list).unwrap();
+            decompress_multi(&input, &mut writer, &mut einfo_list.iter())
+                .unwrap();
         assert_eq!(result, INPUT);
     }
 
@@ -134,7 +139,8 @@ mod tests {
             vec![ContentEncoding::Deflate, ContentEncoding::Brotli],
         )];
         let result =
-            decompress_multi(&input, &mut writer, &einfo_list).unwrap_err();
+            decompress_multi(&input, &mut writer, &mut einfo_list.iter())
+                .unwrap_err();
         if let MultiDecompressErrorReason::Partial {
             partial_body,
             header_index,
@@ -164,7 +170,8 @@ mod tests {
             ],
         )];
         let result =
-            decompress_multi(&input, &mut writer, &einfo_list).unwrap_err();
+            decompress_multi(&input, &mut writer, &mut einfo_list.iter())
+                .unwrap_err();
         if let MultiDecompressErrorReason::Partial {
             partial_body,
             header_index,
@@ -187,7 +194,8 @@ mod tests {
             EncodingInfo::new(4, vec![ContentEncoding::Brotli]),
         ];
         let result =
-            decompress_multi(&input, &mut writer, &einfo_list).unwrap_err();
+            decompress_multi(&input, &mut writer, &mut einfo_list.iter())
+                .unwrap_err();
         if let MultiDecompressErrorReason::Partial {
             partial_body,
             header_index,
@@ -214,7 +222,8 @@ mod tests {
             EncodingInfo::new(5, vec![ContentEncoding::Identity]),
         ];
         let result =
-            decompress_multi(&input, &mut writer, &einfo_list).unwrap_err();
+            decompress_multi(&input, &mut writer, &mut einfo_list.iter())
+                .unwrap_err();
         if let MultiDecompressErrorReason::Partial {
             partial_body,
             header_index,
@@ -234,7 +243,8 @@ mod tests {
         let einfo_list =
             vec![EncodingInfo::new(0, vec![ContentEncoding::Zstd])];
         let result =
-            decompress_multi(INPUT, &mut writer, &einfo_list).unwrap_err();
+            decompress_multi(INPUT, &mut writer, &mut einfo_list.iter())
+                .unwrap_err();
         assert!(matches!(result.reason, MultiDecompressErrorReason::Corrupt));
     }
 
@@ -248,7 +258,8 @@ mod tests {
         ];
 
         let result =
-            decompress_multi(INPUT, &mut writer, &einfo_list).unwrap_err();
+            decompress_multi(INPUT, &mut writer, &mut einfo_list.iter())
+                .unwrap_err();
         assert!(matches!(result.reason, MultiDecompressErrorReason::Corrupt));
     }
 }

decompression-plz/src/dstruct.rs

@@ -97,7 +97,7 @@ impl<'a> DecompressionStruct<'a> {
         decompress_multi(
             self.extra.as_ref().unwrap().as_ref(),
             &mut self.writer,
-            &self.encoding_info,
+            &mut self.encoding_info.iter(),
         )
     }
 
@@ -107,7 +107,7 @@ impl<'a> DecompressionStruct<'a> {
         decompress_multi(
             self.main.as_ref(),
             &mut self.writer,
-            &self.encoding_info,
+            &mut self.encoding_info.iter(),
         )
     }
 
@@ -171,22 +171,25 @@ impl<'a> DecompressionStruct<'a> {
         mut input: BytesMut,
         last_encoding: ContentEncoding,
     ) -> Result<BytesMut, MultiDecompressError> {
-        decompress_multi(&input, &mut self.writer, &self.encoding_info)
-            .map_err(|e| {
-                self.push_last_encoding(last_encoding);
-                if e.is_corrupt() {
-                    // when index = 0
-                    let header_index = self.encoding_info.len() - 1;
-                    let compression_index = self.last_compression_index() - 1;
-                    let partial_error = e.from_corrupt_to_partial(
-                        input,
-                        header_index,
-                        compression_index,
-                    );
-                    return partial_error;
-                }
-                e
-            })
+        let iter = &mut self
+            .encoding_info
+            .iter()
+            .filter(|einfo| !einfo.encodings().is_empty());
+        decompress_multi(&input, &mut self.writer, iter).map_err(|e| {
+            self.push_last_encoding(last_encoding);
+            if e.is_corrupt() {
+                // when index = 0
+                let header_index = self.encoding_info.len() - 1;
+                let compression_index = self.last_compression_index() - 1;
+                let partial_error = e.from_corrupt_to_partial(
+                    input,
+                    header_index,
+                    compression_index,
+                );
+                return partial_error;
+            }
+            e
+        })
     }
 }