[pbs-devel] [PATCH proxmox v3 1/5] compression: deflate: Move encoder into a mod
Maximiliano Sandoval
m.sandoval at proxmox.com
Wed Apr 10 16:30:32 CEST 2024
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 at 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 1fcfb977..239de623 100644
--- a/proxmox-compression/src/lib.rs
+++ b/proxmox-compression/src/lib.rs
@@ -1,6 +1,6 @@
-mod compression;
-pub use compression::*;
+pub use deflate::{DeflateEncoder, Level};
+pub(crate) 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;
--
2.39.2
More information about the pbs-devel
mailing list