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

Optimize fetch_crate_cratesio using ManifestVisitor

Browse source 
and `download_tar_based_and_visit`.

By using these two items, we avoid any I/O altogether.
Everything happens in memory, thus there will be no i/o related errors
or cost.

This commit does not regress anything because
`helpers::load_manifest_path` calls `Manifest::from_path_with_metadata`,
which read in the whole `Cargo.toml` file at once.

Thus this commit would not cause any OOM when the the original code
would not.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-12 16:37:53 +10:00
parent f3d3c488e3
commit 5bb5d12949
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
2 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/drivers/cratesio.rs
View file

@ -1,19 +1,20 @@
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::time::Duration; use std::time::Duration;
use cargo_toml::Manifest;
use crates_io_api::AsyncClient; use crates_io_api::AsyncClient;
use log::debug; use log::debug;
use url::Url; use url::Url;
use super::find_version; use super::{find_version, ManifestVisitor};
use crate::{helpers::*, BinstallError, TarBasedFmt}; use crate::{helpers::*, BinstallError, Meta, TarBasedFmt};
/// Fetch a crate Cargo.toml by name and version from crates.io /// Fetch a crate Cargo.toml by name and version from crates.io
pub async fn fetch_crate_cratesio( pub async fn fetch_crate_cratesio(
name: &str, name: &str,
version_req: &str, version_req: &str,
temp_dir: &Path, temp_dir: &Path,
) -> Result<PathBuf, BinstallError> { ) -> Result<Manifest<Meta>, BinstallError> {
// Fetch / update index // Fetch / update index
debug!("Looking up crate information"); debug!("Looking up crate information");
@ -59,22 +60,14 @@ pub async fn fetch_crate_cratesio(
debug!("Fetching crate from: {crate_url} and extracting Cargo.toml from it"); debug!("Fetching crate from: {crate_url} and extracting Cargo.toml from it");
let crate_dir: PathBuf = format!("{name}-{version_name}").into(); let manifest_dir_path: PathBuf = format!("{name}-{version_name}").into();
let crate_path = temp_dir.join(&crate_dir);
let cargo_toml = crate_dir.join("Cargo.toml"); download_tar_based_and_visit(
let src = crate_dir.join("src");
let main = src.join("main.rs");
let bin = src.join("bin");
download_and_extract_with_filter(
Url::parse(&crate_url)?, Url::parse(&crate_url)?,
TarBasedFmt::Tgz, TarBasedFmt::Tgz,
&temp_dir, &temp_dir,
move |path: &Path| path == cargo_toml || path == main || path.starts_with(&bin), ManifestVisitor::new(manifest_dir_path),
) )
.await?; .await?
.load_manifest()
// Return crate directory
Ok(crate_path)
} }

9
src/main.rs
View file

@ -210,13 +210,14 @@ async fn entry() -> Result<()> {
// Fetch crate via crates.io, git, or use a local manifest path // Fetch crate via crates.io, git, or use a local manifest path
// TODO: work out which of these to do based on `opts.name` // TODO: work out which of these to do based on `opts.name`
// TODO: support git-based fetches (whole repo name rather than just crate name) // TODO: support git-based fetches (whole repo name rather than just crate name)
let manifest_path = match opts.manifest_path.clone() { let manifest = match opts.manifest_path.clone() {
Some(p) => p, Some(manifest_path) => {
debug!("Reading manifest: {}", manifest_path.display());
load_manifest_path(manifest_path.join("Cargo.toml"))?
}
None => fetch_crate_cratesio(&opts.name, &opts.version, temp_dir.path()).await?, None => fetch_crate_cratesio(&opts.name, &opts.version, temp_dir.path()).await?,
}; };
debug!("Reading manifest: {}", manifest_path.display());
let manifest = load_manifest_path(manifest_path.join("Cargo.toml"))?;
let package = manifest.package.unwrap(); let package = manifest.package.unwrap();
let is_plain_version = semver::Version::from_str(&opts.version).is_ok(); let is_plain_version = semver::Version::from_str(&opts.version).is_ok();