feat: improve search parser for packages + options

- move searchers into separate modules
- pass fully qualified flake identifier to the eval script
- don't search empty queries

benchmark.yml

@@ -4,14 +4,18 @@ iterations: 5000
 rampup: 2
 
 plan:
-  - name: Fetch overview
-    request:
-      url: /
-
   - name: Search options
     request:
       url: /search/options?q=nginx
 
+  - name: Search short option
+    request:
+      url: /search/options?q=nix
+
   - name: Search packages
     request:
       url: /search/packages?q=nginx
+
+  - name: Search short package
+    request:
+      url: /search/packages?q=nix

nix/eval.nix

@@ -1,6 +1,6 @@
-{branch}: let
+{flake}: let
   system = builtins.currentSystem;
-  fc-nixos = builtins.getFlake "github:flyingcircusio/fc-nixos/${branch}";
+  fc-nixos = builtins.getFlake flake;
 
   versions_json =
     if builtins.pathExists "${fc-nixos}/release/versions.json"

src/backend.rs

@@ -71,17 +71,22 @@ impl AppState {
             let branch_path = state_dir.join(branchname.clone());
 
             debug!("starting searcher for branch {}", &branchname);
-            let searcher = ChannelSearcher::new(&branch_path, &flake);
+            let searcher = ChannelSearcher::new(&branch_path, flake);
 
             // attempt not to (re)build multiple channels at the same time by spreading them 5
             // minutes apart
-            let freq = Duration::from_hours(5);
             let weak = if start_timers {
+                let freq = Duration::from_hours(5);
                 let start_time = tokio::time::Instant::now() + Duration::from_mins(i as u64 * 5);
                 let interval = interval_at(start_time, freq);
                 searcher.start_timer(interval)
             } else {
-                let start_time = tokio::time::Instant::now() + Duration::from_days(100_000);
+                let start_time = if !searcher.active() {
+                    tokio::time::Instant::now()
+                } else {
+                    tokio::time::Instant::now() + Duration::from_days(100_000)
+                };
+                let freq = Duration::from_days(100_000);
                 let interval = interval_at(start_time, freq);
                 searcher.start_timer(interval)
             };
@@ -172,7 +177,12 @@ async fn search_options_handler<'a>(
     headers: HeaderMap,
     form: axum::extract::Form<SearchForm>,
 ) -> impl IntoResponse {
-    let search_results = search_with_channel(&state, &form.channel, |c| c.search_options(&form.q));
+    let search_results = if !form.q.is_empty() {
+        search_with_channel(&state, &form.channel, |c| c.search_options(&form.q))
+    } else {
+        Vec::new()
+    };
+
     if headers.contains_key("HX-Request") {
         let template = OptionItemTemplate {
             results: search_results,
@@ -194,7 +204,11 @@ async fn search_packages_handler<'a>(
     headers: HeaderMap,
     form: axum::extract::Form<SearchForm>,
 ) -> impl IntoResponse {
-    let search_results = search_with_channel(&state, &form.channel, |c| c.search_packages(&form.q));
+    let search_results = if !form.q.is_empty() {
+        search_with_channel(&state, &form.channel, |c| c.search_packages(&form.q))
+    } else {
+        Vec::new()
+    };
 
     if headers.contains_key("HX-Request") {
         let template = PackageItemTemplate {

src/bin/simple-tantivy.rs

@@ -3,7 +3,7 @@ use fc_search::option_to_naive;
 use std::collections::HashMap;
 use tempfile::TempDir;
 
-use fc_search::search::{OptionsSearcher, Searcher};
+use fc_search::search::{options::OptionsSearcher, Searcher};
 
 fn main() -> anyhow::Result<()> {
     let index_path = TempDir::new()?;

src/lib.rs

@@ -134,7 +134,10 @@ impl Flake {
     }
 
     pub fn flake_uri(&self) -> String {
-        format!("github:{}/{}/{}", self.owner, self.name, self.branch)
+        match &self.rev {
+            FlakeRev::Specific(r) => format!("github:{}/{}?rev={r}", self.owner, self.name),
+            _ => format!("github:{}/{}/{}", self.owner, self.name, self.branch),
+        }
     }
 
     pub fn github_base_url(&self) -> String {
@@ -353,3 +356,13 @@ pub fn load_packages_and_options(
     let packages = serde_json::from_str(&packages_raw)?;
     Ok((options, packages))
 }
+
+pub trait LogError<T> {
+    fn log_to_option(self, context: &str) -> Option<T>;
+}
+
+impl<T, E: Display> LogError<T> for Result<T, E> {
+    fn log_to_option(self, context: &str) -> Option<T> {
+        self.map_err(|e| error!("{}: {e}", context)).ok()
+    }
+}

src/nix.rs

@@ -99,9 +99,6 @@ pub fn build_options_for_fcio_branch(
     HashMap<String, NaiveNixosOption>,
     HashMap<String, NixPackage>,
 )> {
-    anyhow::ensure!(flake.owner == "flyingcircusio");
-    anyhow::ensure!(flake.name == "fc-nixos");
-
     let eval_nixfile = {
         let data = NixFiles::get("eval.nix").unwrap().data;
         let mut tmp = tempfile::NamedTempFile::new()?;
@@ -112,7 +109,7 @@ pub fn build_options_for_fcio_branch(
     debug!("starting nix-instantiate");
     let derivation_cmd = Command::new("nix-instantiate")
         .arg(eval_nixfile.path())
-        .args(["--argstr", "branch", &flake.branch])
+        .args(["--argstr", "flake", &flake.flake_uri()])
         .output()?;
 
     drop(eval_nixfile);