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

Rm download_and_extract_with_filter

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-12 16:42:32 +10:00
parent e68eea35fe
commit f82890cba3
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
2 changed files with 1 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/helpers.rs
View file

@ -86,36 +86,6 @@ pub async fn download_and_extract<P: AsRef<Path>>(
Ok(()) Ok(())
} }
/// Download a file from the provided URL and extract part of it to
/// the provided path.
///
/// * `filter` - It will pass the path of the file to it
/// and only extract ones which filter returns `true`.
pub async fn download_and_extract_with_filter<
Filter: FnMut(&Path) -> bool + Send + 'static,
P: AsRef<Path>,
>(
url: Url,
fmt: TarBasedFmt,
path: P,
filter: Filter,
) -> Result<(), BinstallError> {
debug!("Downloading from: '{url}'");
let resp = create_request(url).await?;
let path = path.as_ref();
debug!("Downloading to file: '{}'", path.display());
let stream = resp.bytes_stream();
extract_tar_based_stream_with_filter(stream, path, fmt, filter).await?;
debug!("Download OK, written to file: '{}'", path.display());
Ok(())
}
/// Download a file from the provided URL and extract part of it to /// Download a file from the provided URL and extract part of it to
/// the provided path. /// the provided path.
/// ///

53
src/helpers/async_extracter.rs
View file

@ -1,12 +1,10 @@
use std::fmt::Debug; use std::fmt::Debug;
use std::fs; use std::fs;
use std::io::{self, Read, Seek, Write}; use std::io::{self, Read, Seek, Write};
use std::path::{Path, PathBuf}; use std::path::Path;
use std::sync::Arc;
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;
@ -203,55 +201,6 @@ where
.await .await
} }
/// * `filter` - If Some, then it will pass the path of the file to it
/// and only extract ones which filter returns `true`.
pub async fn extract_tar_based_stream_with_filter<
Filter: FnMut(&Path) -> bool + Send + 'static,
E,
>(
stream: impl Stream<Item = Result<Bytes, E>> + Unpin,
output: &Path,
fmt: TarBasedFmt,
filter: Filter,
) -> Result<(), BinstallError>
where
BinstallError: From<E>,
{
struct Visitor<F>(F, Arc<PathBuf>);
impl<F: FnMut(&Path) -> bool + Send + 'static> TarEntriesVisitor for Visitor<F> {
fn visit<R: Read>(&mut self, entries: Entries<'_, R>) -> Result<(), BinstallError> {
for res in entries {
let mut entry = res?;
let entry_path = entry.path()?;
if self.0(&entry_path) {
debug!("Extracting {entry_path:#?}");
let dst = self.1.join(entry_path);
fs::create_dir_all(dst.parent().unwrap())?;
entry.unpack(dst)?;
}
}
Ok(())
}
}
let path = Arc::new(output.to_owned());
let visitor = Visitor(filter, path.clone());
extract_impl(stream, move |mut rx| {
fs::create_dir_all(path.parent().unwrap())?;
extract_compressed_from_readable(ReadableRx::new(&mut rx), fmt, &*path, Some(visitor))
})
.await
}
pub async fn extract_tar_based_stream<E>( pub async fn extract_tar_based_stream<E>(
stream: impl Stream<Item = Result<Bytes, E>> + Unpin, stream: impl Stream<Item = Result<Bytes, E>> + Unpin,
output: &Path, output: &Path,