github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-07 12:05:46 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Minor Tgz implementation tweaks

Browse Source
This commit is contained in:
João M. Bezerra 2021-10-14 16:52:00 -03:00
parent 745ab8610d
commit 48f4f32300
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands.rs
View File

@ -176,10 +176,9 @@ fn compress_files(
bufwriter.flush()?; bufwriter.flush()?;
} }
Tgz => { Tgz => {
let mut bufwriter = archive::tar::build_archive_from_paths( // Wrap it into an gz_decoder, and pass to the tar archive builder
&files, let gz_decoder = flate2::write::GzEncoder::new(file_writer, Default::default());
flate2::write::GzEncoder::new(file_writer, Default::default()), let mut bufwriter = archive::tar::build_archive_from_paths(&files, gz_decoder)?;
)?;
bufwriter.flush()?; bufwriter.flush()?;
} }
Zip => { Zip => {
@ -224,10 +223,9 @@ fn compress_files(
writer.flush()?; writer.flush()?;
} }
Tgz => { Tgz => {
let mut writer = archive::tar::build_archive_from_paths( // Wrap it into an gz_decoder, and pass to the tar archive builder
&files, let gz_decoder = flate2::write::GzEncoder::new(writer, Default::default());
flate2::write::GzEncoder::new(writer, Default::default()), let mut writer = archive::tar::build_archive_from_paths(&files, gz_decoder)?;
)?;
writer.flush()?; writer.flush()?;
} }
Zip => { Zip => {
@ -324,7 +322,8 @@ fn decompress_file(
} }
Tgz => { Tgz => {
utils::create_dir_if_non_existent(output_folder)?; utils::create_dir_if_non_existent(output_folder)?;
let _ = crate::archive::tar::unpack_archive(chain_reader_decoder(&Gzip, reader)?, output_folder, flags)?; let reader = chain_reader_decoder(&Gzip, reader)?;
let _ = crate::archive::tar::unpack_archive(reader, output_folder, flags)?;
info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder)); info!("Successfully uncompressed archive in '{}'.", to_utf(output_folder));
} }
Zip => { Zip => {