Mirrors/navi
2
0
Fork 0
mirror of https://github.com/denisidoro/navi synced 2024-11-25 13:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix best command (#210)

Browse source
This commit is contained in:
Denis Isidoro 2020-03-05 17:40:14 -03:00 committed by GitHub
parent fe26b00953
commit dc4fe98f56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cmds/best.rs
View file

@ -8,6 +8,6 @@ pub fn main(query: String, args: Vec<String>, config: Config) -> Result<(), Box<
if !args.is_empty() {
cmds::aux::abort("passing arguments to 'navi best'", 201)
} else {
cmds::core::main(Variant::Filter(query), config)
cmds::core::main(Variant::Filter(query), config, false)
}
}

12
src/cmds/core.rs
View file

@ -36,9 +36,13 @@ fn gen_core_fzf_opts(variant: Variant, config: &Config) -> fzf::Opts {
opts
}
fn extract_from_selections(raw_output: &str) -> (&str, &str, &str) {
fn extract_from_selections(raw_output: &str, contains_key: bool) -> (&str, &str, &str) {
let mut lines = raw_output.split('\n');
let key = lines.next().unwrap();
let key = if contains_key {
lines.next().unwrap()
} else {
"enter"
};
let mut parts = lines.next().unwrap().split('\t');
parts.next();
parts.next();
@ -127,7 +131,7 @@ fn replace_variables_from_snippet(
interpolated_snippet
}
pub fn main(variant: Variant, config: Config) -> Result<(), Box<dyn Error>> {
pub fn main(variant: Variant, config: Config, contains_key: bool) -> Result<(), Box<dyn Error>> {
let (output, variables) = fzf::call(gen_core_fzf_opts(variant, &config), |stdin| {
Some(cheat::read_all(&config, stdin))
});
@ -135,7 +139,7 @@ pub fn main(variant: Variant, config: Config) -> Result<(), Box<dyn Error>> {
match output.status.code() {
Some(0) => {
let raw_output = String::from_utf8(output.stdout)?;
let (key, tags, snippet) = extract_from_selections(&raw_output[..]);
let (key, tags, snippet) = extract_from_selections(&raw_output[..], contains_key);
let interpolated_snippet =
replace_variables_from_snippet(snippet, tags, variables.unwrap(), &config);

2
src/cmds/query.rs
View file

@ -5,5 +5,5 @@ use crate::cmds::core::Variant;
use crate::option::Config;
pub fn main(query: String, config: Config) -> Result<(), Box<dyn Error>> {
cmds::core::main(Variant::Query(query), config)
cmds::core::main(Variant::Query(query), config, true)
}

2
src/main.rs
View file

@ -19,7 +19,7 @@ fn main() -> Result<(), Box<dyn Error>> {
_ => {
let mut config = option::parse();
match config.cmd.as_mut() {
None => cmds::core::main(Variant::Core, config),
None => cmds::core::main(Variant::Core, config, true),
Some(c) => match c {
Command::Query { query } => cmds::query::main(query.clone(), config),
Command::Best { query, args } => {