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

Refactor: Use binstall_v1::MetaData in mod binstall

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-27 19:44:16 +10:00
parent 05c0d5fcae
commit 2f27a5fd93
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
6 changed files with 51 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/binstall/install.rs
View file

@ -1,12 +1,13 @@
use std::{path::PathBuf, process, sync::Arc};
use cargo_toml::Package;
use compact_str::CompactString;
use log::{debug, error, info};
use miette::{miette, IntoDiagnostic, Result, WrapErr};
use tokio::{process::Command, task::block_in_place};
use super::{MetaData, Options, Resolution};
use crate::{bins, fetchers::Fetcher, *};
use crate::{bins, fetchers::Fetcher, metafiles::binstall_v1::Source, *};
pub async fn install(
resolution: Resolution,
@ -22,13 +23,21 @@ pub async fn install(
bin_path,
bin_files,
} => {
let cvs = metafiles::CrateVersionSource {
name,
version: package.version.parse().into_diagnostic()?,
source: metafiles::Source::cratesio_registry(),
};
let current_version = package.version.parse().into_diagnostic()?;
let target = fetcher.target().into();
install_from_package(fetcher, opts, cvs, version, bin_path, bin_files).await
install_from_package(fetcher, opts, bin_path, bin_files)
.await
.map(|option| {
option.map(|bins| MetaData {
name: name.into(),
version_req: version.into(),
current_version,
source: Source::cratesio_registry(),
target,
bins,
})
})
}
Resolution::InstallFromSource { package } => {
let desired_targets = opts.desired_targets.get().await;
@ -54,11 +63,9 @@ pub async fn install(
async fn install_from_package(
fetcher: Arc<dyn Fetcher>,
opts: Arc<Options>,
cvs: metafiles::CrateVersionSource,
version: String,
bin_path: PathBuf,
bin_files: Vec<bins::BinFile>,
) -> Result<Option<MetaData>> {
) -> Result<Option<Vec<CompactString>>> {
// Download package
if opts.dry_run {
info!("Dry run, not downloading package");
@ -108,12 +115,9 @@ async fn install_from_package(
}
}
Ok(Some(MetaData {
bins: bin_files.into_iter().map(|bin| bin.base_name).collect(),
cvs,
version_req: version,
target: fetcher.target().to_string(),
}))
Ok(Some(
bin_files.into_iter().map(|bin| bin.base_name).collect(),
))
})
}