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

Same for cmd::remove

This commit is contained in:
Alexis Bourget 2020-11-23 14:18:14 +01:00
parent 26596712e8
commit 85444426d8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/remove.rs
View File

@ -1,6 +1,6 @@
use super::Cmd; use super::Cmd;
use crate::config; use crate::config;
use crate::fzf::Fzf; use crate::fuzzy_finder::FuzzyFinder;
use crate::store::Query; use crate::store::Query;
use crate::store::Store; use crate::store::Store;
use crate::util; use crate::util;
@ -33,17 +33,18 @@ impl Cmd for Remove {
let query = Query::new(keywords); let query = Query::new(keywords);
let now = util::current_time()?; let now = util::current_time()?;
let mut fzf = Fzf::new()?; let mut fuzzy_finder = FuzzyFinder::new()?;
let handle = fzf.stdin(); let fuzzy_finder_cmd = fuzzy_finder.cmd_name();
let handle = fuzzy_finder.stdin();
for dir in store.iter_matches(&query, now) { for dir in store.iter_matches(&query, now) {
writeln!(handle, "{}", dir.display_score(now)) writeln!(handle, "{}", dir.display_score(now))
.context("could not write to fzf")?; .with_context(|| format!("could not write to {}", fuzzy_finder_cmd))?;
} }
selection = fzf.wait_select()?; selection = fuzzy_finder.wait_select()?;
selection selection
.get(5..selection.len().saturating_sub(1)) .get(5..selection.len().saturating_sub(1))
.context("fzf returned invalid output")? .with_context(|| format!("{} returned invalid output", fuzzy_finder_cmd))?
} }
None => self.path.as_ref().unwrap(), None => self.path.as_ref().unwrap(),
}; };