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

Refactor: Abstract away AsyncExtracter by new fn

Browse source 
`extract_archive_stream`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-09 22:28:48 +10:00
parent 00242a40c6
commit cadf045d0a
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
2 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/helpers.rs
View file

@ -5,7 +5,6 @@ use std::{
};
use cargo_toml::Manifest;
use futures_util::stream::StreamExt;
use log::{debug, info};
use reqwest::Method;
use serde::Serialize;
@ -15,7 +14,7 @@ use url::Url;
use crate::{BinstallError, Meta, PkgFmt};
mod async_extracter;
pub use async_extracter::AsyncExtracter;
pub use async_extracter::extract_archive_stream;
mod auto_abort_join_handle;
pub use auto_abort_join_handle::AutoAbortJoinHandle;
@ -70,14 +69,7 @@ pub async fn download_and_extract<P: AsRef<Path>, const N: usize>(
let path = path.as_ref();
debug!("Downloading to file: '{}'", path.display());
let mut bytes_stream = resp.bytes_stream();
let mut extracter = AsyncExtracter::new(path, fmt, desired_outputs);
while let Some(res) = bytes_stream.next().await {
extracter.feed(res?).await?;
}
extracter.done().await?;
extract_archive_stream(resp.bytes_stream(), path, fmt, desired_outputs).await?;
debug!("Download OK, written to file: '{}'", path.display());

35
src/helpers/async_extracter.rs
View file

@ -4,6 +4,7 @@ use std::io::{self, Seek, Write};
use std::path::Path;
use bytes::Bytes;
use futures_util::stream::{Stream, StreamExt};
use scopeguard::{guard, Always, ScopeGuard};
use tempfile::tempfile;
use tokio::{sync::mpsc, task::spawn_blocking};
@ -173,7 +174,7 @@ impl AsyncExtracterInner {
/// extract the whole crate and write them to disk, it now only extract the
/// relevant part (`Cargo.toml`) out to disk and open it.
#[derive(Debug)]
pub struct AsyncExtracter(ScopeGuard<AsyncExtracterInner, fn(AsyncExtracterInner), Always>);
struct AsyncExtracter(ScopeGuard<AsyncExtracterInner, fn(AsyncExtracterInner), Always>);
impl AsyncExtracter {
/// * `path` - If `fmt` is `PkgFmt::Bin`, then this is the filename
@ -184,7 +185,7 @@ impl AsyncExtracter {
/// only extract files specified in it.
/// Note that this is a best-effort and it only works when `fmt`
/// is not `PkgFmt::Bin` or `PkgFmt::Zip`.
pub fn new<const N: usize>(
fn new<const N: usize>(
path: &Path,
fmt: PkgFmt,
desired_outputs: Option<[Cow<'static, Path>; N]>,
@ -195,11 +196,37 @@ impl AsyncExtracter {
/// Upon error, this extracter shall not be reused.
/// Otherwise, `Self::done` would panic.
pub async fn feed(&mut self, bytes: Bytes) -> Result<(), BinstallError> {
async fn feed(&mut self, bytes: Bytes) -> Result<(), BinstallError> {
self.0.feed(bytes).await
}
pub async fn done(self) -> Result<(), BinstallError> {
async fn done(self) -> Result<(), BinstallError> {
ScopeGuard::into_inner(self.0).done().await
}
}
/// * `output` - If `fmt` is `PkgFmt::Bin`, then this is the filename
/// for the bin.
/// Otherwise, it is the directory where the extracted content will be put.
/// * `fmt` - The format of the archive to feed in.
/// * `desired_outputs - If Some(_), then it will filter the tar and
/// only extract files specified in it.
/// Note that this is a best-effort and it only works when `fmt`
/// is not `PkgFmt::Bin` or `PkgFmt::Zip`.
pub async fn extract_archive_stream<E, const N: usize>(
mut stream: impl Stream<Item = Result<Bytes, E>> + Unpin,
output: &Path,
fmt: PkgFmt,
desired_outputs: Option<[Cow<'static, Path>; N]>,
) -> Result<(), BinstallError>
where
BinstallError: From<E>,
{
let mut extracter = AsyncExtracter::new(output, fmt, desired_outputs);
while let Some(res) = stream.next().await {
extracter.feed(res?).await?;
}
extracter.done().await
}