mirror of
https://github.com/cargo-bins/cargo-binstall.git
synced 2025-05-02 02:00:03 +00:00
Refactor: Call create_tar_decoder
directly
in `extract_tar_based_stream*`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
parent
9584c8d35e
commit
467f7f6834
2 changed files with 10 additions and 61 deletions
|
@ -21,6 +21,7 @@ use std::path::Path;
|
|||
|
||||
use bytes::Bytes;
|
||||
use futures_util::stream::{Stream, StreamExt};
|
||||
use log::debug;
|
||||
use scopeguard::{guard, ScopeGuard};
|
||||
use tar::Entries;
|
||||
use tempfile::tempfile;
|
||||
|
@ -222,11 +223,10 @@ where
|
|||
Box::new(move |rx| {
|
||||
fs::create_dir_all(path.parent().unwrap())?;
|
||||
|
||||
extract_compressed_from_readable::<DummyVisitor, _>(
|
||||
ReadableRx::new(rx),
|
||||
fmt,
|
||||
Op::UnpackToPath(&path),
|
||||
)
|
||||
debug!("Extracting from {fmt} archive to {path:#?}");
|
||||
create_tar_decoder(ReadableRx::new(rx), fmt)?.unpack(path)?;
|
||||
|
||||
Ok(())
|
||||
}),
|
||||
)
|
||||
.await
|
||||
|
@ -243,8 +243,11 @@ where
|
|||
extract_impl(
|
||||
stream,
|
||||
Box::new(move |rx| {
|
||||
extract_compressed_from_readable(ReadableRx::new(rx), fmt, Op::Visit(&mut visitor))
|
||||
.map(|_| visitor)
|
||||
debug!("Extracting from {fmt} archive to process it in memory");
|
||||
|
||||
let mut tar = create_tar_decoder(ReadableRx::new(rx), fmt)?;
|
||||
visitor.visit(tar.entries()?)?;
|
||||
Ok(visitor)
|
||||
}),
|
||||
)
|
||||
.await
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue