hatter/tiny-encrypt-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: optimize code

Browse Source
This commit is contained in:
Hatter Jiang
2023-10-28 17:59:35 +08:00
parent 231bf28240
commit e478e43e12
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compress.rs
View File

@@ -2,7 +2,9 @@ use std::io::Write;
use flate2::Compression; use flate2::Compression;
use flate2::write::{GzDecoder, GzEncoder}; use flate2::write::{GzDecoder, GzEncoder};
use rust_util::{simple_error, XResult}; use rust_util::{opt_result, XResult};
const BUFFER_SIZE: usize = 8 * 1024;
pub fn compress_default(message: &[u8]) -> XResult<Vec<u8>> { pub fn compress_default(message: &[u8]) -> XResult<Vec<u8>> {
compress(Compression::default(), message) compress(Compression::default(), message)
@@ -32,13 +34,13 @@ impl GzStreamEncoder {
} }
pub fn new(compression: Compression) -> Self { pub fn new(compression: Compression) -> Self {
let buffer = Vec::with_capacity(1024 * 8); let buffer = Vec::with_capacity(BUFFER_SIZE);
let gz_encoder = GzEncoder::new(buffer, compression); let gz_encoder = GzEncoder::new(buffer, compression);
Self { gz_encoder } Self { gz_encoder }
} }
pub fn update(&mut self, buff: &[u8]) -> XResult<Vec<u8>> { pub fn update(&mut self, buff: &[u8]) -> XResult<Vec<u8>> {
self.gz_encoder.write_all(buff)?; opt_result!(self.gz_encoder.write_all(buff), "Encode Gz stream failed: {}");
let inner = self.gz_encoder.get_mut(); let inner = self.gz_encoder.get_mut();
let result = inner.clone(); let result = inner.clone();
inner.clear(); inner.clear();
@@ -46,10 +48,7 @@ impl GzStreamEncoder {
} }
pub fn finalize(self) -> XResult<Vec<u8>> { pub fn finalize(self) -> XResult<Vec<u8>> {
match self.gz_encoder.finish() { Ok(opt_result!(self.gz_encoder.finish(), "Encode Gz stream failed: {}"))
Ok(last_buffer) => Ok(last_buffer),
Err(e) => simple_error!("Encode Gz stream failed: {}", e),
}
} }
} }
@@ -59,13 +58,13 @@ pub struct GzStreamDecoder {
impl GzStreamDecoder { impl GzStreamDecoder {
pub fn new() -> Self { pub fn new() -> Self {
let buffer = Vec::with_capacity(1024 * 8); let buffer = Vec::with_capacity(BUFFER_SIZE);
let gz_decoder = GzDecoder::new(buffer); let gz_decoder = GzDecoder::new(buffer);
Self { gz_decoder } Self { gz_decoder }
} }
pub fn update(&mut self, buff: &[u8]) -> XResult<Vec<u8>> { pub fn update(&mut self, buff: &[u8]) -> XResult<Vec<u8>> {
self.gz_decoder.write_all(buff)?; opt_result!(self.gz_decoder.write_all(buff), "Decode Gz stream failed: {}");
let inner = self.gz_decoder.get_mut(); let inner = self.gz_decoder.get_mut();
let result = inner.clone(); let result = inner.clone();
inner.clear(); inner.clear();
@@ -73,10 +72,7 @@ impl GzStreamDecoder {
} }
pub fn finalize(self) -> XResult<Vec<u8>> { pub fn finalize(self) -> XResult<Vec<u8>> {
match self.gz_decoder.finish() { Ok(opt_result!(self.gz_decoder.finish(), "Decode Gz stream failed: {}"))
Ok(last_buffer) => Ok(last_buffer),
Err(e) => simple_error!("Decode Gz stream failed: {}", e),
}
} }
} }
@@ -100,7 +96,8 @@ fn test_gzip_compress() {
#[test] #[test]
fn test_gzip_compress_multi_blocks() { fn test_gzip_compress_multi_blocks() {
let compressed = hex::decode("1f8b0800000000000000f348cdc9c95708cf2fca49f12081090044f4575937000000").unwrap(); let compressed = hex::decode(
"1f8b0800000000000000f348cdc9c95708cf2fca49f12081090044f4575937000000").unwrap();
let decompressed = "Hello WorldHello WorldHello WorldHello WorldHello World"; let decompressed = "Hello WorldHello WorldHello WorldHello WorldHello World";
let mut decoder = GzStreamDecoder::new(); let mut decoder = GzStreamDecoder::new();
let mut decompressed_bytes = vec![]; let mut decompressed_bytes = vec![];