diff --git a/Cargo.lock b/Cargo.lock index 525674c..93f968e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -315,7 +315,7 @@ dependencies = [ [[package]] name = "tmux-thumbs" -version = "0.2.1" +version = "0.2.2" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index bf9aa24..dc2a07a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tmux-thumbs" -version = "0.2.1" +version = "0.2.2" authors = ["Ferran Basora "] edition = "2018" description = "A lightning fast version of tmux-fingers, copy/pasting tmux like vimium/vimperator" diff --git a/README.md b/README.md index 542a785..224980f 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ You can review all available options executing: ``` > tmux-thumbs --help -tmux-thumbs 0.1.0 +tmux-thumbs 0.2.2 A lightning fast version of tmux-fingers, copy/pasting tmux like vimium/vimperator USAGE: @@ -70,6 +70,7 @@ OPTIONS: --hint-bg-color Sets the background color for hints [default: black] --hint-fg-color Sets the foregroud color for hints [default: yellow] -p, --position Hint position [default: left] + -x, --regexp ... Use this regexp as extra pattern to match --select-fg-color Sets the foregroud color for selection [default: blue] --upcase-command Upcase command [default: tmux paste-buffer] @@ -81,6 +82,7 @@ OPTIONS: - **reverse:** Choose in which direction you want to assign hints. Useful to get shorter hints closer. - **unique:** Choose if you want to assign the same hint for the same matched strings. - **position:** Choose where do you want to show the hint in the matched string. Options (left, right). Default [left] +- **regexp:** Add extra pattern to match. This paramenter can have multiple instances. - **command:** Choose whish command execute when you press a hint - **upcase-command:** Choose which command execute when you press a upcase hint diff --git a/src/main.rs b/src/main.rs index 6972eb7..f1e4dca 100644 --- a/src/main.rs +++ b/src/main.rs @@ -73,6 +73,12 @@ fn app_args<'a> () -> clap::ArgMatches<'a> { .help("Upcase command") .long("upcase-command") .default_value("tmux paste-buffer")) + .arg(Arg::with_name("regexp") + .help("Use this regexp as extra pattern to match") + .long("regexp") + .short("x") + .takes_value(true) + .multiple(true)) .get_matches(); } @@ -82,6 +88,11 @@ fn main() { let position = args.value_of("position").unwrap(); let reverse = args.is_present("reverse"); let unique = args.is_present("unique"); + let regexp = if let Some(items) = args.values_of("regexp") { + items.collect::>() + } else { + [].to_vec() + }; let foreground_color = colors::get_color(args.value_of("foreground_color").unwrap()); let background_color = colors::get_color(args.value_of("background_color").unwrap()); @@ -101,7 +112,7 @@ fn main() { let output = String::from_utf8_lossy(&execution.stdout); let lines = output.split("\n").collect::>(); - let mut state = state::State::new(&lines, alphabet); + let mut state = state::State::new(&lines, alphabet, ®exp); let selected = { let mut viewbox = view::View::new( diff --git a/src/state.rs b/src/state.rs index c490387..5fb92c4 100644 --- a/src/state.rs +++ b/src/state.rs @@ -2,8 +2,11 @@ use std::collections::HashMap; use regex::Regex; use std::fmt; -const PATTERNS: [(&'static str, &'static str); 11] = [ +const EXCLUDE_PATTERNS: [(&'static str, &'static str); 1] = [ ("bash", r"[[:cntrl:]]\[([0-9]{1,2};)?([0-9]{1,2})?m"), +]; + +const PATTERNS: [(&'static str, &'static str); 10] = [ ("url", r"((https?://|git@|git://|ssh://|ftp://|file:///)[\w?=%/_.:,;~@!#$&()*+-]*)"), ("diff_a", r"--- a/([^ ]+)"), ("diff_b", r"\+\+\+ b/([^ ]+)"), @@ -39,29 +42,41 @@ impl<'a> PartialEq for Match<'a> { pub struct State<'a> { pub lines: &'a Vec<&'a str>, alphabet: &'a str, + regexp: &'a Vec<&'a str>, } impl<'a> State<'a> { - pub fn new(lines: &'a Vec<&'a str>, alphabet: &'a str) -> State<'a> { + pub fn new(lines: &'a Vec<&'a str>, alphabet: &'a str, regexp: &'a Vec<&'a str>) -> State<'a> { State{ lines: lines, - alphabet: alphabet + alphabet: alphabet, + regexp: regexp } } pub fn matches(&self, reverse: bool, unique: bool) -> Vec> { let mut matches = Vec::new(); + let exclude_patterns = EXCLUDE_PATTERNS.iter().map(|tuple| + (tuple.0, Regex::new(tuple.1).unwrap()) + ).collect::>(); + + let custom_patterns = self.regexp.iter().map(|regexp| + ("custom", Regex::new(regexp).expect("Invalid custom regexp")) + ).collect::>(); + let patterns = PATTERNS.iter().map(|tuple| (tuple.0, Regex::new(tuple.1).unwrap()) ).collect::>(); + let all_patterns = [exclude_patterns, custom_patterns, patterns].concat(); + for (index, line) in self.lines.iter().enumerate() { let mut chunk: &str = line; let mut offset: i32 = 0; loop { - let submatches = patterns.iter().filter_map(|tuple| + let submatches = all_patterns.iter().filter_map(|tuple| match tuple.1.find_iter(chunk).nth(0) { Some(m) => Some((tuple.0, tuple.1.clone(), m)), None => None @@ -151,7 +166,8 @@ mod tests { #[test] fn match_reverse () { let lines = split("lorem 127.0.0.1 lorem 255.255.255.255 lorem 127.0.0.1 lorem"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 3); assert_eq!(results.first().unwrap().hint.clone().unwrap(), "a"); @@ -161,7 +177,8 @@ mod tests { #[test] fn match_unique () { let lines = split("lorem 127.0.0.1 lorem 255.255.255.255 lorem 127.0.0.1 lorem"); - let results = State::new(&lines, "abcd").matches(false, true); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, true); assert_eq!(results.len(), 3); assert_eq!(results.first().unwrap().hint.clone().unwrap(), "a"); @@ -171,7 +188,8 @@ mod tests { #[test] fn match_bash () { let lines = split("path: /var/log/nginx.log\npath: test/log/nginx.log"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 2); } @@ -179,7 +197,8 @@ mod tests { #[test] fn match_paths () { let lines = split("Lorem /tmp/foo/bar lorem\n Lorem /var/log/bootstrap.log lorem ../log/kern.log lorem"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 3); } @@ -187,7 +206,8 @@ mod tests { #[test] fn match_uids () { let lines = split("Lorem ipsum 123e4567-e89b-12d3-a456-426655440000 lorem\n Lorem lorem lorem"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 1); } @@ -195,7 +215,8 @@ mod tests { #[test] fn match_shas () { let lines = split("Lorem fd70b5695 5246ddf f924213 lorem\n Lorem 973113963b491874ab2e372ee60d4b4cb75f717c lorem"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 4); } @@ -203,7 +224,8 @@ mod tests { #[test] fn match_ips () { let lines = split("Lorem ipsum 127.0.0.1 lorem\n Lorem 255.255.10.255 lorem 127.0.0.1 lorem"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 3); } @@ -211,7 +233,8 @@ mod tests { #[test] fn match_urls () { let lines = split("Lorem ipsum https://www.rust-lang.org/tools lorem\n Lorem https://crates.io lorem https://github.io lorem ssh://github.io"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 4); } @@ -219,7 +242,8 @@ mod tests { #[test] fn match_addresses () { let lines = split("Lorem 0xfd70b5695 0x5246ddf lorem\n Lorem 0x973113 lorem"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 3); } @@ -227,7 +251,8 @@ mod tests { #[test] fn match_hex_colors () { let lines = split("Lorem #fd7b56 lorem #FF00FF\n Lorem #00fF05 lorem #abcd00 lorem #afRR00"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 4); } @@ -235,7 +260,8 @@ mod tests { #[test] fn match_process_port () { let lines = split("Lorem 5695 52463 lorem\n Lorem 973113 lorem 99999 lorem 8888 lorem\n 23456 lorem 5432 lorem 23444"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 8); } @@ -243,7 +269,8 @@ mod tests { #[test] fn match_diff_a () { let lines = split("Lorem lorem\n--- a/src/main.rs"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 1); assert_eq!(results.first().unwrap().text.clone(), "src/main.rs"); @@ -252,7 +279,8 @@ mod tests { #[test] fn match_diff_b () { let lines = split("Lorem lorem\n+++ b/src/main.rs"); - let results = State::new(&lines, "abcd").matches(false, false); + let custom = [].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); assert_eq!(results.len(), 1); assert_eq!(results.first().unwrap().text.clone(), "src/main.rs"); @@ -260,16 +288,21 @@ mod tests { #[test] fn priority () { - let lines = split("Lorem /var/fd70b569/9999.log 52463 lorem\n Lorem 973113 lorem 123e4567-e89b-12d3-a456-426655440000 lorem 8888 lorem\n https://crates.io/23456/fd70b569 lorem"); - let results = State::new(&lines, "abcd").matches(false, false); + let lines = split("Lorem CUSTOM-52463 lorem ISSUE-123 lorem\nLorem /var/fd70b569/9999.log 52463 lorem\n Lorem 973113 lorem 123e4567-e89b-12d3-a456-426655440000 lorem 8888 lorem\n https://crates.io/23456/fd70b569 lorem"); + let custom = ["CUSTOM-[0-9]{4,}", "ISSUE-[0-9]{3}"].to_vec(); + let results = State::new(&lines, "abcd", &custom).matches(false, false); // Matches + // CUSTOM-52463 + // ISSUE-123 // /var/fd70b569/9999.log // 52463 // 973113 // 123e4567-e89b-12d3-a456-426655440000 // 8888 // https://crates.io/23456/fd70b569 - assert_eq!(results.len(), 6); + assert_eq!(results.len(), 8); + assert_eq!(results.get(0).unwrap().text.clone(), "CUSTOM-52463"); + assert_eq!(results.get(1).unwrap().text.clone(), "ISSUE-123"); } }