parse dry output better

This commit is contained in:
Daylin Morgan 2024-05-13 18:23:46 -05:00
parent 96cf7e126c
commit 6517ac3514
Signed by: daylin
GPG key ID: 950D13E9719334AD
2 changed files with 37 additions and 9 deletions

View file

@ -57,7 +57,7 @@ rec {
oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim { }; oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim { };
oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs { }; oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs { };
oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { }; oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { };
default = oizys-zig; default = oizys-rs;
}); });
devShells = forAllSystems (pkgs: { devShells = forAllSystems (pkgs: {
default = pkgs.mkShell { default = pkgs.mkShell {

View file

@ -1,7 +1,7 @@
use clap::{CommandFactory, Parser, Subcommand}; use clap::{CommandFactory, Parser, Subcommand};
use clap_complete::{generate, Generator, Shell}; use clap_complete::{generate, Generator, Shell};
use std::{env, io, path::PathBuf, process::Command};
use spinoff::{spinners, Color, Spinner}; use spinoff::{spinners, Color, Spinner};
use std::{env, io, path::PathBuf, process::Command};
#[derive(Parser)] #[derive(Parser)]
#[command(version, about, long_about = None)] #[command(version, about, long_about = None)]
@ -62,6 +62,25 @@ struct Oizys {
verbose: u8, verbose: u8,
} }
fn trim_hashes(buf: &str, trim_drv: bool) -> Vec<String> {
buf.lines()
.skip(1)
.map(|line| {
line.split_once('-')
.map(|x| {
format!(" {}", {
if trim_drv {
x.1.replace(".drv", "")
} else {
x.1.to_string()
}
})
})
.expect("failed to trim derivation")
})
.collect()
}
impl Oizys { impl Oizys {
fn from(cli: &Cli) -> Oizys { fn from(cli: &Cli) -> Oizys {
let host = cli let host = cli
@ -94,17 +113,21 @@ impl Oizys {
fn parse_dry_output(self: &Oizys, output: &str) { fn parse_dry_output(self: &Oizys, output: &str) {
let parts: Vec<&str> = output.split("\nthese").collect(); let parts: Vec<&str> = output.split("\nthese").collect();
// TODO: handle more cases of output
// currently fails if nothing to fetch
if parts.len() != 3 { if parts.len() != 3 {
eprintln!("couldn't parse dry output into three parts"); eprintln!("couldn't parse dry output into three parts");
eprintln!("{}", output);
std::process::exit(1); std::process::exit(1);
} }
let to_build: Vec<&str> = parts[1].lines().skip(1).collect(); let to_build: Vec<String> = trim_hashes(parts[1], true);
let to_fetch: Vec<&str> = parts[2].lines().skip(1).collect(); let to_fetch: Vec<String> = trim_hashes(parts[2], false);
println!("To build: {}", to_build.len());
println!("To fetch: {}",to_fetch.len());
if self.verbose > 0 { if self.verbose > 0 {
println!("TO BUILD: \n{}\n", to_build.join("\n")); println!("TO BUILD: {}\n{}\n", to_build.len(), to_build.join("\n"));
println!("TO FETCH: \n{}\n", to_fetch.join("\n")); println!("TO FETCH: {}\n{}\n", to_fetch.len(), to_fetch.join("\n"));
} else {
println!("To build: {}", to_build.len());
println!("To fetch: {}", to_fetch.len());
} }
} }
@ -119,7 +142,12 @@ impl Oizys {
let output = String::from_utf8(cmd.output().expect("failed to run nix build").stderr) let output = String::from_utf8(cmd.output().expect("failed to run nix build").stderr)
.expect("faild to parse nix build --dry-run output"); .expect("faild to parse nix build --dry-run output");
spinner.stop_with_message("evaluating finished"); spinner.stop_with_message("evaluating finished");
if output.contains("derivations will be built") {
self.parse_dry_output(&output); self.parse_dry_output(&output);
} else {
println!("{} up to date", self.host)
}
} }
fn build(self: &Oizys) { fn build(self: &Oizys) {