Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix delimiter #239

Merged
merged 2 commits into from
Mar 12, 2020
Merged

Fix delimiter #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad35bbb
Fix delimiter
denisidoro Mar 12, 2020
a9940a7
wip
denisidoro Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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