From 70a71e0c8e989e2fb592d411ec14a6ac87533aa7 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
Date: Fri, 5 Jul 2024 15:04:28 +0200
Subject: [PATCH] compression: deflate: move encoder into a mod

This allows to add a decompression mod inside the deflate mod. This does
not touch the public API.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Max Carrara <m.carrara@proxmox.com>
---
 proxmox-compression/src/{ => deflate}/compression.rs | 6 ++----
 proxmox-compression/src/deflate/mod.rs               | 5 +++++
 proxmox-compression/src/lib.rs                       | 4 ++--
 proxmox-compression/src/zip.rs                       | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)
 rename proxmox-compression/src/{ => deflate}/compression.rs (97%)
 create mode 100644 proxmox-compression/src/deflate/mod.rs

diff --git a/proxmox-compression/src/compression.rs b/proxmox-compression/src/deflate/compression.rs
similarity index 97%
rename from proxmox-compression/src/compression.rs
rename to proxmox-compression/src/deflate/compression.rs
index 632a5991..6e6a151d 100644
--- a/proxmox-compression/src/compression.rs
+++ b/proxmox-compression/src/deflate/compression.rs
@@ -12,8 +12,6 @@ use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 use proxmox_io::ByteBuffer;
 use proxmox_lang::io_format_err;
 
-const BUFFER_SIZE: usize = 8192;
-
 pub enum Level {
     Fastest,
     Best,
@@ -53,7 +51,7 @@ impl<T> DeflateEncoder<T> {
         Self {
             inner,
             compressor: Compress::new(level, false),
-            buffer: ByteBuffer::with_capacity(BUFFER_SIZE),
+            buffer: ByteBuffer::with_capacity(super::BUFFER_SIZE),
             input_buffer: Bytes::new(),
             state: EncoderState::Reading,
         }
@@ -109,7 +107,7 @@ impl<T: AsyncWrite + Unpin> DeflateEncoder<T> {
     where
         R: AsyncRead + Unpin,
     {
-        let mut buffer = ByteBuffer::with_capacity(BUFFER_SIZE);
+        let mut buffer = ByteBuffer::with_capacity(super::BUFFER_SIZE);
         let mut eof = false;
         loop {
             if !eof && !buffer.is_full() {
diff --git a/proxmox-compression/src/deflate/mod.rs b/proxmox-compression/src/deflate/mod.rs
new file mode 100644
index 00000000..514ccbdc
--- /dev/null
+++ b/proxmox-compression/src/deflate/mod.rs
@@ -0,0 +1,5 @@
+mod compression;
+
+pub use compression::{DeflateEncoder, Level};
+
+const BUFFER_SIZE: usize = 8192;
diff --git a/proxmox-compression/src/lib.rs b/proxmox-compression/src/lib.rs
index 7a9837e4..4be643c4 100644
--- a/proxmox-compression/src/lib.rs
+++ b/proxmox-compression/src/lib.rs
@@ -1,8 +1,8 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-mod compression;
-pub use compression::*;
+pub use deflate::{DeflateEncoder, Level};
 
+mod deflate;
 pub mod tar;
 pub mod zip;
 pub mod zstd;
diff --git a/proxmox-compression/src/zip.rs b/proxmox-compression/src/zip.rs
index d2d3fd80..3ccece9b 100644
--- a/proxmox-compression/src/zip.rs
+++ b/proxmox-compression/src/zip.rs
@@ -22,7 +22,7 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, ReadBuf};
 use crc32fast::Hasher;
 use proxmox_time::gmtime;
 
-use crate::compression::{DeflateEncoder, Level};
+use crate::deflate::{DeflateEncoder, Level};
 
 const LOCAL_FH_SIG: u32 = 0x04034B50;
 const LOCAL_FF_SIG: u32 = 0x08074B50;