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

feat: Improve resolution logging and verbose logging (#1341)

Browse source 
* feat: Improve resolution logging

Fixed #1336

Log target of the pre-built binaries which will be installed.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

* Fix args parsing: `quiet` & `verbose` cannot be set at the same time

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

* feat: Implies `--log-level debug` if `--verbose` is set

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

---------

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-09-02 19:38:24 +10:00 • committed by GitHub
parent 214163c434
commit 3c5641610a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/bin/src/args.rs
View file

@ -318,14 +318,15 @@ pub struct Args {
#[clap(help_heading = "Meta", long, value_name = "LEVEL")]
pub log_level: Option<LevelFilter>,
/// Used with `--version` to print out verbose information.
#[clap(help_heading = "Meta", short, long, default_value_t = false)]
/// Implies `--log-level debug` and it can also be used with `--version`
/// to print out verbose information,
#[clap(help_heading = "Meta", short, long)]
pub verbose: bool,
/// Equivalent to setting `log_level` to `off`.
///
/// This would override the `log_level`.
#[clap(help_heading = "Meta", short, long)]
#[clap(help_heading = "Meta", short, long, conflicts_with("verbose"))]
pub(crate) quiet: bool,
}
@ -421,15 +422,17 @@ pub fn parse() -> Args {
// Load options
let mut opts = Args::parse_from(args);
if let (true, Some(log)) = (
opts.log_level.is_none(),
env::var("BINSTALL_LOG_LEVEL")
if opts.log_level.is_none() {
if let Some(log) = env::var("BINSTALL_LOG_LEVEL")
.ok()
.and_then(|s| s.parse().ok()),
) {
opts.log_level = Some(log);
} else if opts.quiet {
opts.log_level = Some(LevelFilter::Off);
.and_then(|s| s.parse().ok())
{
opts.log_level = Some(log);
} else if opts.quiet {
opts.log_level = Some(LevelFilter::Off);
} else if opts.verbose {
opts.log_level = Some(LevelFilter::Debug);
}
}
// Ensure no conflict

6
crates/binstalk/src/ops/resolve/resolution.rs
View file

@ -93,15 +93,15 @@ impl ResolutionFetch {
let bin_files = &self.bin_files;
let name = &self.name;
let new_version = &self.new_version;
let target = fetcher.target();
debug!(
"Found a binary install source: {} ({})",
"Found a binary install source: {} ({target})",
fetcher.source_name(),
fetcher.target()
);
warn!(
"The package {name} v{new_version} will be downloaded from {}{}",
"The package {name} v{new_version} ({target}) has been downloaded from {}{}",
if fetcher.is_third_party() {
"third-party source "
} else {