diff --git a/Cargo.toml b/Cargo.toml index f2e503d..6cf2f30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ resolver = "2" [dependencies] anyhow = "1.0.92" +badge-maker = "0.3.1" clap = { version = "4.5.31", features = ["derive"] } console = "0.15.11" indicatif = "0.17.11" diff --git a/src/utils.rs b/src/utils.rs index c7ad52b..001c070 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -7,6 +7,7 @@ use std::{ }; use anyhow::Context; +use badge_maker::BadgeBuilder; use indicatif::{MultiProgress, ProgressBar}; use xshell::Shell; @@ -30,10 +31,10 @@ pub fn load_status(args: &CLIArgs) -> LastRuns { let _ = args; // Always try to load from disk if let Ok(mut f) = File::open(".run_status.toml") { let mut content = String::new(); - if f.read_to_string(&mut content).is_ok() { - if let Ok(deserde) = toml::from_str(&content) { - return deserde; - } + if f.read_to_string(&mut content).is_ok() + && let Ok(deserde) = toml::from_str(&content) + { + return deserde; } } LastRuns::default() @@ -181,12 +182,17 @@ pub fn write_badge( test_name: &str, args: &CLIArgs, ) -> Result<(), anyhow::Error> { - let output = std::process::Command::new("badge-maker") - .args(vec!["-s", "plastic", name, value, "-c", color]) - .output() - .context("Running badge-maker to export the badge")?; + let svg = BadgeBuilder::new() + .label(name) + .message(value) + .color_parse(color) + .style(badge_maker::Style::Plastic) + .build() + .context("Running badge-maker to export the badge")? + .svg(); + let mut f = File::create(format!("{}/{}.svg", args.output, test_name)).unwrap(); - f.write_all(&output.stdout)?; + write!(f, "{}", svg).context("Writing badge")?; Ok(()) }