RomanNum3ral
/
zoxide
mirror of https://github.com/ajeetdsouza/zoxide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: make empty interactive selections exit silently

This commit is contained in:
Kaiiiiiiiii 2026-03-07 16:18:13 +08:00
parent 018299fb48
commit d9494204ac
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cmd/query.rs
View File

@ -1,11 +1,11 @@
use std::io::{self, Write}; use std::io::{self, Write};
use anyhow::{Context, Result}; use anyhow::{Context, Result, bail};
use crate::cmd::{Query, Run}; use crate::cmd::{Query, Run};
use crate::config; use crate::config;
use crate::db::{Database, Epoch, Stream, StreamOptions}; use crate::db::{Database, Epoch, Stream, StreamOptions};
use crate::error::BrokenPipeHandler; use crate::error::{BrokenPipeHandler, SilentExit};
use crate::util::{self, Fzf, FzfChild}; use crate::util::{self, Fzf, FzfChild};
impl Run for Query { impl Run for Query {
@ -31,16 +31,23 @@ impl Query {
fn query_interactive(&self, stream: &mut Stream, now: Epoch) -> Result<()> { fn query_interactive(&self, stream: &mut Stream, now: Epoch) -> Result<()> {
let mut fzf = Self::get_fzf()?; let mut fzf = Self::get_fzf()?;
let selection = loop { let selection = match (|| -> Result<String> {
match stream.next() { loop {
Some(dir) if Some(dir.path.as_ref()) == self.exclude.as_deref() => continue, match stream.next() {
Some(dir) => { Some(dir) if Some(dir.path.as_ref()) == self.exclude.as_deref() => continue,
if let Some(selection) = fzf.write(dir, now)? { Some(dir) => {
break selection; if let Some(selection) = fzf.write(dir, now)? {
break Ok(selection);
}
} }
None => break fzf.wait(),
} }
None => break fzf.wait()?,
} }
})() {
Ok(selection) if selection.is_empty() => bail!(SilentExit { code: 1 }),
Ok(selection) => selection,
Err(err) if err.to_string() == "no match found" => bail!(SilentExit { code: 1 }),
Err(err) => return Err(err),
}; };
if self.score { if self.score {