From 6fb30a4d490a98d08628ed93a90a9d23820ef9c8 Mon Sep 17 00:00:00 2001 From: Fernando Ayats Date: Fri, 14 Jun 2024 10:51:39 +0200 Subject: [PATCH] search channel from flake input --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/interface.rs | 8 +++- src/search.rs | 120 ++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 117 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7134b51..55d47e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "nh" -version = "3.5.16" +version = "3.5.17" dependencies = [ "ambassador", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index a82ae83..d8e7a5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nh" -version = "3.5.16" +version = "3.5.17" edition = "2021" license = "EUPL-1.2" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/interface.rs b/src/interface.rs index 8f8b03f..a215771 100644 --- a/src/interface.rs +++ b/src/interface.rs @@ -155,12 +155,16 @@ pub struct SearchArgs { /// Number of search results to display pub limit: u64, - #[arg(long, short, default_value = "nixos-unstable")] + #[arg(long, short)] /// Name of the channel to query (e.g nixos-23.11, nixos-unstable) - pub channel: String, + pub channel: Option, /// Name of the package to search pub query: String, + + #[arg(short, long, env = "FLAKE", value_hint = clap::ValueHint::DirPath)] + /// Flake to read what nixpkgs channels to search for + pub flake: Option, } // Needed a struct to have multiple sub-subcommands diff --git a/src/search.rs b/src/search.rs index 6705eb5..43b3a0c 100644 --- a/src/search.rs +++ b/src/search.rs @@ -1,12 +1,13 @@ -use crate::*; -use color_eyre::eyre::Context; -use interface::SearchArgs; - -use std::{process::Stdio, time::Instant}; -use tracing::{debug, trace}; +use std::{collections::HashMap, process::Stdio, time::Instant}; +use color_eyre::eyre::{eyre, Context, ContextCompat}; use elasticsearch_dsl::*; +use interface::{FlakeRef, SearchArgs}; +use regex::Regex; use serde::Deserialize; +use tracing::{debug, trace, warn}; + +use crate::*; #[derive(Debug, Deserialize)] #[allow(non_snake_case, dead_code)] @@ -87,10 +88,32 @@ impl NHRunnable for SearchArgs { ), ); - println!( - "Querying search.nixos.org, with channel {}...", - self.channel - ); + let channel: String = match (&self.channel, &self.flake) { + (Some(c), _) => c.clone(), + (None, Some(f)) => { + let c = my_nix_branch(f); + match c { + Ok(s) => s, + Err(err) => { + warn!( + "Failed to read the nixpkgs input for the flake {}", + f.as_str() + ); + for e in err.chain() { + warn!("{}", e); + } + String::from("nixos-unstable") + } + } + } + (None, None) => { + debug!("Using default search channel"); + String::from("nixos-unstable") + } + }; + debug!(?channel); + + println!("Querying search.nixos.org, with channel {}...", channel); let then = Instant::now(); let client = reqwest::blocking::Client::new(); @@ -99,7 +122,7 @@ impl NHRunnable for SearchArgs { // TODO: have a GH action or something check if they updated this thing .post(format!( "https://search.nixos.org/backend/latest-42-{}/_search", - self.channel + channel )) .json(&query) .header("User-Agent", format!("nh/{}", crate::NH_VERSION)) @@ -189,3 +212,78 @@ impl NHRunnable for SearchArgs { Ok(()) } } + +fn my_nix_branch(flake: &FlakeRef) -> Result { + let mut child = std::process::Command::new("nix") + .args(["flake", "metadata", "--json"]) + .arg(flake.as_str()) + .stderr(Stdio::inherit()) + .stdout(Stdio::piped()) + .spawn()?; + + child.wait()?; + + let stdout = child.stdout.take().wrap_err("Couldn't get stdout")?; + + let mut metadata: FlakeMetadata = serde_json::from_reader(stdout)?; + + let branch = metadata + .locks + .nodes + .remove("nixpkgs") + .wrap_err(r#"Couldn't find input "nixpkgs" on the flake"#)? + .original + .wrap_err("Couldn't find original")? + .r#ref + .wrap_err("Couldn't find ref field")?; + + if supported_branch(&branch) { + Ok(branch) + } else { + Err(eyre!("Branch {} is not supported", &branch)) + } +} + +fn supported_branch>(branch: S) -> bool { + let branch = branch.as_ref(); + + if branch == "nixos-unstable" { + return true; + } + + let re = Regex::new(r"nixos-[0-9]+\.[0-9]+").unwrap(); + return re.is_match(branch); +} + +#[test] +fn test_supported_branch() { + assert_eq!(supported_branch("nixos-unstable"), true); + assert_eq!(supported_branch("nixos-unstable-small"), false); + assert_eq!(supported_branch("nixos-24.05"), true); + assert_eq!(supported_branch("24.05"), false); + assert_eq!(supported_branch("nixpkgs-darwin"), false); + assert_eq!(supported_branch("nixpks-21.11-darwin"), false); +} + +#[derive(Debug, Deserialize, Clone)] +struct FlakeMetadata { + locks: FlakeLocks, +} + +#[derive(Debug, Deserialize, Clone)] +struct FlakeLocks { + nodes: HashMap, +} + +#[derive(Debug, Deserialize, Clone)] +struct FlakeLockedNode { + original: Option, +} + +#[derive(Debug, Deserialize, Clone)] +struct FlakeLockedOriginal { + r#ref: Option, + // owner: String, + // repo: String, + // r#type: String, +}