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

Refactor: Rm extract_impl

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-18 18:37:50 +10:00
parent db22d7d041
commit 784a24577b
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/helpers/async_extracter.rs
View file

@ -28,22 +28,13 @@ use tokio::task::block_in_place;
use super::{extracter::*, stream_readable::StreamReadable}; use super::{extracter::*, stream_readable::StreamReadable};
use crate::{BinstallError, TarBasedFmt}; use crate::{BinstallError, TarBasedFmt};
async fn extract_impl<T, S, F, E>(stream: S, f: F) -> Result<T, BinstallError>
where
S: Stream<Item = Result<Bytes, E>> + Unpin,
F: FnOnce(StreamReadable<S>) -> Result<T, BinstallError>,
BinstallError: From<E>,
{
let readable = StreamReadable::new(stream).await;
block_in_place(move || f(readable))
}
pub async fn extract_bin<S, E>(stream: S, path: &Path) -> Result<(), BinstallError> pub async fn extract_bin<S, E>(stream: S, path: &Path) -> Result<(), BinstallError>
where where
S: Stream<Item = Result<Bytes, E>> + Unpin + 'static, S: Stream<Item = Result<Bytes, E>> + Unpin + 'static,
BinstallError: From<E>, BinstallError: From<E>,
{ {
extract_impl(stream, move |mut reader| { let mut reader = StreamReadable::new(stream).await;
block_in_place(move || {
fs::create_dir_all(path.parent().unwrap())?; fs::create_dir_all(path.parent().unwrap())?;
let mut file = fs::File::create(&path)?; let mut file = fs::File::create(&path)?;
@ -62,7 +53,6 @@ where
Ok(()) Ok(())
}) })
.await
} }
pub async fn extract_zip<S, E>(stream: S, path: &Path) -> Result<(), BinstallError> pub async fn extract_zip<S, E>(stream: S, path: &Path) -> Result<(), BinstallError>
@ -70,7 +60,8 @@ where
S: Stream<Item = Result<Bytes, E>> + Unpin + 'static, S: Stream<Item = Result<Bytes, E>> + Unpin + 'static,
BinstallError: From<E>, BinstallError: From<E>,
{ {
extract_impl(stream, move |mut reader| { let mut reader = StreamReadable::new(stream).await;
block_in_place(move || {
fs::create_dir_all(path.parent().unwrap())?; fs::create_dir_all(path.parent().unwrap())?;
let mut file = tempfile()?; let mut file = tempfile()?;
@ -82,7 +73,6 @@ where
unzip(file, path) unzip(file, path)
}) })
.await
} }
pub async fn extract_tar_based_stream<S, E>( pub async fn extract_tar_based_stream<S, E>(
@ -94,7 +84,8 @@ where
S: Stream<Item = Result<Bytes, E>> + Unpin + 'static, S: Stream<Item = Result<Bytes, E>> + Unpin + 'static,
BinstallError: From<E>, BinstallError: From<E>,
{ {
extract_impl(stream, move |reader| { let reader = StreamReadable::new(stream).await;
block_in_place(move || {
fs::create_dir_all(path.parent().unwrap())?; fs::create_dir_all(path.parent().unwrap())?;
debug!("Extracting from {fmt} archive to {path:#?}"); debug!("Extracting from {fmt} archive to {path:#?}");
@ -103,7 +94,6 @@ where
Ok(()) Ok(())
}) })
.await
} }
/// Visitor must iterate over all entries. /// Visitor must iterate over all entries.
@ -128,12 +118,12 @@ where
V: TarEntriesVisitor + Debug + Send + 'static, V: TarEntriesVisitor + Debug + Send + 'static,
BinstallError: From<E>, BinstallError: From<E>,
{ {
extract_impl(stream, move |reader| { let reader = StreamReadable::new(stream).await;
block_in_place(move || {
debug!("Extracting from {fmt} archive to process it in memory"); debug!("Extracting from {fmt} archive to process it in memory");
let mut tar = create_tar_decoder(reader, fmt)?; let mut tar = create_tar_decoder(reader, fmt)?;
visitor.visit(tar.entries()?)?; visitor.visit(tar.entries()?)?;
Ok(visitor) Ok(visitor)
}) })
.await
} }