Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add raw level arg #372

Merged
merged 9 commits into from
Mar 19, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/cli/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ pub struct CliArgs {
/// Ouch and claps subcommands
#[command(subcommand)]
pub cmd: Subcommand,

/// Compression raw level as each algo has
#[arg(short = 'r', long, global = true, default_value_t = u32::MAX)]
pub raw_level: u32,
xgdgsc marked this conversation as resolved.
Show resolved Hide resolved
}

#[derive(Parser, PartialEq, Eq, Debug)]
Expand Down
72 changes: 63 additions & 9 deletions src/commands/compress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub fn compress_files(
quiet: bool,
question_policy: QuestionPolicy,
file_visibility_policy: FileVisibilityPolicy,
raw_level: u32,
) -> crate::Result<bool> {
// If the input files contain a directory, then the total size will be underestimated
let file_writer = BufWriter::with_capacity(BUFFER_CAPACITY, output_file);
Expand All @@ -43,20 +44,73 @@ pub fn compress_files(
Gzip => Box::new(
// by default, ParCompress uses a default compression level of 3
// instead of the regular default that flate2 uses
gzp::par::compress::ParCompress::<gzp::deflate::Gzip>::builder()
.compression_level(Default::default())
.from_writer(encoder),
if raw_level == u32::MAX {
gzp::par::compress::ParCompress::<gzp::deflate::Gzip>::builder()
.compression_level(Default::default())
.from_writer(encoder)
} else {
gzp::par::compress::ParCompress::<gzp::deflate::Gzip>::builder()
.compression_level(gzp::par::compress::Compression::new(raw_level))
.from_writer(encoder)
},
),
Bzip => Box::new(bzip2::write::BzEncoder::new(encoder, Default::default())),
Lz4 => Box::new(lzzzz::lz4f::WriteCompressor::new(encoder, Default::default())?),
Lzma => Box::new(xz2::write::XzEncoder::new(encoder, 6)),
Snappy => Box::new(gzp::par::compress::ParCompress::<gzp::snap::Snap>::builder().from_writer(encoder)),
Bzip => {
if raw_level == u32::MAX {
Box::new(bzip2::write::BzEncoder::new(encoder, Default::default()))
} else {
Box::new(bzip2::write::BzEncoder::new(
encoder,
bzip2::Compression::new(raw_level),
))
}
}
Lz4 => {
if raw_level == u32::MAX {
Box::new(lzzzz::lz4f::WriteCompressor::new(encoder, Default::default())?)
} else {
Box::new(lzzzz::lz4f::WriteCompressor::new(
encoder,
lzzzz::lz4f::PreferencesBuilder::new()
.compression_level(raw_level as i32)
.build(),
)?)
}
}
Lzma => {
if raw_level == u32::MAX {
Box::new(xz2::write::XzEncoder::new(encoder, 6))
} else {
Box::new(xz2::write::XzEncoder::new(encoder, raw_level))
}
}
Snappy => {
if raw_level == u32::MAX {
Box::new(gzp::par::compress::ParCompress::<gzp::snap::Snap>::builder().from_writer(encoder))
} else {
Box::new(
gzp::par::compress::ParCompress::<gzp::snap::Snap>::builder()
.compression_level(gzp::par::compress::Compression::new(raw_level))
.from_writer(encoder),
)
}
}
Zstd => {
let zstd_encoder = zstd::stream::write::Encoder::new(encoder, Default::default());
if raw_level == u32::MAX {
Box::new(
zstd::stream::write::Encoder::new(encoder, Default::default())
.unwrap()
.auto_finish(),
)
} else {
Box::new(
zstd::stream::write::Encoder::new(encoder, raw_level as i32)
.unwrap()
.auto_finish(),
)
}
// Safety:
xgdgsc marked this conversation as resolved.
Show resolved Hide resolved
// Encoder::new() can only fail if `level` is invalid, but Default::default()
// is guaranteed to be valid
xgdgsc marked this conversation as resolved.
Show resolved Hide resolved
Box::new(zstd_encoder.unwrap().auto_finish())
}
Tar | Zip => unreachable!(),
};
Expand Down
1 change: 1 addition & 0 deletions src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ pub fn run(
args.quiet,
question_policy,
file_visibility_policy,
args.raw_level,
);

if let Ok(true) = compress_result {
Expand Down