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

Refactor: Extract new crate binstalk-{signal, downloader} (#518)

Browse source 
* Refactor: Extract new crate binstalk-downloader
* Re-export `PkgFmt` from `binstalk_manifests`
* Update release-pr.yml
* Update dependabot

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-11-11 15:02:54 +11:00 • committed by GitHub
parent 3841762a5b
commit 89fa5b1769
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 456 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/binstalk/src/drivers/crates_io.rs
View file

@ -10,6 +10,7 @@ use crate::{
helpers::{
download::Download,
remote::{Client, Url},
signal::wait_on_cancellation_signal,
},
manifests::cargo_toml_binstall::{Meta, TarBasedFmt},
};
@ -53,7 +54,11 @@ pub async fn fetch_crate_cratesio(
let manifest_dir_path: PathBuf = format!("{name}-{version_name}").into();
Download::new(client, Url::parse(&crate_url)?)
.and_visit_tar(TarBasedFmt::Tgz, ManifestVisitor::new(manifest_dir_path))
.await
Ok(Download::new(client, Url::parse(&crate_url)?)
.and_visit_tar(
TarBasedFmt::Tgz,
ManifestVisitor::new(manifest_dir_path),
Some(Box::pin(wait_on_cancellation_signal())),
)
.await?)
}

34
crates/binstalk/src/drivers/crates_io/visitor.rs
View file

@ -1,16 +1,16 @@
use std::{
io::Read,
io::{self, Read},
path::{Path, PathBuf},
};
use cargo_toml::Manifest;
use log::debug;
use normalize_path::NormalizePath;
use tar::Entries;
use super::vfs::Vfs;
use crate::{
errors::BinstallError, helpers::download::TarEntriesVisitor,
errors::BinstallError,
helpers::download::{DownloadError, Entries, TarEntriesVisitor},
manifests::cargo_toml_binstall::Meta,
};
@ -37,7 +37,7 @@ impl ManifestVisitor {
impl TarEntriesVisitor for ManifestVisitor {
type Target = Manifest<Meta>;
fn visit<R: Read>(&mut self, entries: Entries<'_, R>) -> Result<(), BinstallError> {
fn visit<R: Read>(&mut self, entries: Entries<'_, R>) -> Result<(), DownloadError> {
for res in entries {
let mut entry = res?;
let path = entry.path()?;
@ -71,16 +71,20 @@ impl TarEntriesVisitor for ManifestVisitor {
}
/// Load binstall metadata using the extracted information stored in memory.
fn finish(self) -> Result<Self::Target, BinstallError> {
debug!("Loading manifest directly from extracted file");
// Load and parse manifest
let mut manifest = Manifest::from_slice_with_metadata(&self.cargo_toml_content)?;
// Checks vfs for binary output names
manifest.complete_from_abstract_filesystem(&self.vfs)?;
// Return metadata
Ok(manifest)
fn finish(self) -> Result<Self::Target, DownloadError> {
Ok(load_manifest(&self.cargo_toml_content, &self.vfs).map_err(io::Error::from)?)
}
}
fn load_manifest(slice: &[u8], vfs: &Vfs) -> Result<Manifest<Meta>, BinstallError> {
debug!("Loading manifest directly from extracted file");
// Load and parse manifest
let mut manifest = Manifest::from_slice_with_metadata(slice)?;
// Checks vfs for binary output names
manifest.complete_from_abstract_filesystem(vfs)?;
// Return metadata
Ok(manifest)
}