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 DeflateEncoder { 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 DeflateEncoder { 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;