Skip to content

Commit

Permalink
Fix delimiter (#239)
Browse files Browse the repository at this point in the history
Fixes #230
  • Loading branch information
denisidoro authored Mar 12, 2020
1 parent 8d0c82c commit e32e0f1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "navi"
version = "2.0.7"
version = "2.0.8"
authors = ["Denis Isidoro <[email protected]>"]
edition = "2018"

Expand Down
17 changes: 12 additions & 5 deletions src/cheat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ fn gen_snippet(snippet: &str, line: &str) -> String {
}
}

fn remove_quote(txt: &str) -> String {
txt.replace('"', "").replace('\'', "")
}

fn parse_opts(text: &str) -> SuggestionOpts {
let mut header_lines: u8 = 0;
let mut column: Option<u8> = None;
Expand All @@ -36,10 +40,10 @@ fn parse_opts(text: &str) -> SuggestionOpts {
match p {
"--multi" => multi = true,
"--header" | "--headers" | "--header-lines" => {
header_lines = parts.next().unwrap().parse::<u8>().unwrap()
header_lines = remove_quote(parts.next().unwrap()).parse::<u8>().unwrap()
}
"--column" => column = Some(parts.next().unwrap().parse::<u8>().unwrap()),
"--delimiter" => delimiter = Some(parts.next().unwrap().to_string()),
"--column" => column = Some(remove_quote(parts.next().unwrap()).parse::<u8>().unwrap()),
"--delimiter" => delimiter = Some(remove_quote(parts.next().unwrap()).to_string()),
_ => (),
}
}
Expand Down Expand Up @@ -134,8 +138,11 @@ fn read_file(
pub fn read_all(config: &Config, stdin: &mut std::process::ChildStdin) -> HashMap<String, Value> {
let mut variables: HashMap<String, Value> = HashMap::new();

let fallback = filesystem::pathbuf_to_string(filesystem::cheat_pathbuf().unwrap());
let folders_str = config.path.as_ref().unwrap_or(&fallback);
let mut fallback: String = String::from("");
let folders_str = config.path.as_ref().unwrap_or_else(|| {
fallback = filesystem::pathbuf_to_string(filesystem::cheat_pathbuf().unwrap());
&fallback
});
let folders = folders_str.split(':');

for folder in folders {
Expand Down

0 comments on commit e32e0f1

Please sign in to comment.