actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-21 13:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: Call create_tar_decoder directly

Browse source 
in `extract_tar_based_stream*`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-13 01:12:21 +10:00
parent 9584c8d35e
commit 467f7f6834
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
2 changed files with 10 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/helpers/async_extracter.rs
View file

@ -21,6 +21,7 @@ use std::path::Path;
use bytes::Bytes; use bytes::Bytes;
use futures_util::stream::{Stream, StreamExt}; use futures_util::stream::{Stream, StreamExt};
use log::debug;
use scopeguard::{guard, ScopeGuard}; use scopeguard::{guard, ScopeGuard};
use tar::Entries; use tar::Entries;
use tempfile::tempfile; use tempfile::tempfile;
@ -222,11 +223,10 @@ where
Box::new(move |rx| { Box::new(move |rx| {
fs::create_dir_all(path.parent().unwrap())?; fs::create_dir_all(path.parent().unwrap())?;
extract_compressed_from_readable::<DummyVisitor, _>( debug!("Extracting from {fmt} archive to {path:#?}");
ReadableRx::new(rx), create_tar_decoder(ReadableRx::new(rx), fmt)?.unpack(path)?;
fmt,
Op::UnpackToPath(&path), Ok(())
)
}), }),
) )
.await .await
@ -243,8 +243,11 @@ where
extract_impl( extract_impl(
stream, stream,
Box::new(move |rx| { Box::new(move |rx| {
extract_compressed_from_readable(ReadableRx::new(rx), fmt, Op::Visit(&mut visitor)) debug!("Extracting from {fmt} archive to process it in memory");
.map(|_| visitor)
let mut tar = create_tar_decoder(ReadableRx::new(rx), fmt)?;
visitor.visit(tar.entries()?)?;
Ok(visitor)
}), }),
) )
.await .await

54
src/helpers/extracter.rs
View file

@ -23,36 +23,6 @@ impl<V: TarEntriesVisitor> TarEntriesVisitor for &mut V {
} }
} }
#[derive(Debug)]
pub(super) enum Op<'a, V: TarEntriesVisitor> {
UnpackToPath(&'a Path),
Visit(V),
}
/// * `f` - If Some, then this function will pass
/// the entries of the `dat` to it and let it decides
/// what to do with the tar.
fn untar<R: Read, V: TarEntriesVisitor>(
mut tar: Archive<R>,
op: Op<'_, V>,
) -> Result<(), BinstallError> {
match op {
Op::Visit(mut visitor) => {
debug!("Untaring with callback");
visitor.visit(tar.entries()?)?;
}
Op::UnpackToPath(path) => {
debug!("Untaring entire tar");
tar.unpack(path)?;
}
}
debug!("Untaring completed");
Ok(())
}
pub(super) fn create_tar_decoder( pub(super) fn create_tar_decoder(
dat: impl BufRead + 'static, dat: impl BufRead + 'static,
fmt: TarBasedFmt, fmt: TarBasedFmt,
@ -75,30 +45,6 @@ pub(super) fn create_tar_decoder(
Ok(Archive::new(r)) Ok(Archive::new(r))
} }
/// Extract files from the specified source onto the specified path.
///
/// * `fmt` - must not be `PkgFmt::Bin` or `PkgFmt::Zip`.
/// * `filter` - If Some, then it will pass the path of the file to it
/// and only extract ones which filter returns `true`.
/// Note that this is a best-effort and it only works when `fmt`
/// is not `PkgFmt::Bin` or `PkgFmt::Zip`.
pub(super) fn extract_compressed_from_readable<V: TarEntriesVisitor, R: BufRead + 'static>(
dat: R,
fmt: TarBasedFmt,
op: Op<'_, V>,
) -> Result<(), BinstallError> {
let msg = if let Op::UnpackToPath(path) = op {
format!("destination: {path:#?}")
} else {
"process in-memory".to_string()
};
debug!("Extracting from {fmt} archive: {msg}");
let tar = create_tar_decoder(dat, fmt)?;
untar(tar, op)
}
pub(super) fn unzip(dat: File, dst: &Path) -> Result<(), BinstallError> { pub(super) fn unzip(dat: File, dst: &Path) -> Result<(), BinstallError> {
debug!("Decompressing from zip archive to `{dst:?}`"); debug!("Decompressing from zip archive to `{dst:?}`");