hatter/finding
1
0
Fork 0
mirror of https://github.com/jht5945/finding.git synced 2025-12-28 21:50:04 +08:00
Code Issues Releases Wiki Activity

add --filter-line-content

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-04 23:59:01 +08:00
parent 209963ebb2
commit 2ebcf56b30
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@@ -120,7 +120,13 @@ fn match_lines(tag: &str, content: &String, options: &Options) -> bool {
true => ln.to_lowercase().contains(the_search_text), true => ln.to_lowercase().contains(the_search_text),
false => ln.contains(the_search_text), false => ln.contains(the_search_text),
}; };
if matches { let mut matches_line_content = true;
if options.filter_line_content.len() > 0 {
if ! ln.contains(options.filter_line_content.as_str()) {
matches_line_content = false;
}
}
if matches && matches_line_content {
match_lines_vec.push(MatchLine::new(l_no, ln.to_string())); match_lines_vec.push(MatchLine::new(l_no, ln.to_string()));
} }
l_no += 1; l_no += 1;

3
src/opt.rs
View File

@@ -20,6 +20,7 @@ pub struct Options {
pub skip_dot_dir: bool, pub skip_dot_dir: bool,
pub skip_link_dir: bool, pub skip_link_dir: bool,
pub filter_file_name: String, pub filter_file_name: String,
pub filter_line_content: String,
pub verbose: bool, pub verbose: bool,
pub search_text: String, pub search_text: String,
} }
@@ -43,6 +44,7 @@ impl Options {
skip_dot_dir: false, skip_dot_dir: false,
skip_link_dir: false, skip_link_dir: false,
filter_file_name: String::new(), filter_file_name: String::new(),
filter_line_content: String::new(),
verbose: false, verbose: false,
search_text: String::new(), search_text: String::new(),
} }
@@ -64,6 +66,7 @@ impl Options {
ap.refer(&mut self.skip_dot_dir).add_option(&["--skip-dot-dir"], StoreTrue, "Skipt dot dir [Text Mode]"); ap.refer(&mut self.skip_dot_dir).add_option(&["--skip-dot-dir"], StoreTrue, "Skipt dot dir [Text Mode]");
ap.refer(&mut self.skip_link_dir).add_option(&["--skip-link-dir"], StoreTrue, "Skip link dir"); ap.refer(&mut self.skip_link_dir).add_option(&["--skip-link-dir"], StoreTrue, "Skip link dir");
ap.refer(&mut self.filter_file_name).add_option(&["--filter-file-name"], Store, "Filter file name [Text Mode]"); ap.refer(&mut self.filter_file_name).add_option(&["--filter-file-name"], Store, "Filter file name [Text Mode]");
ap.refer(&mut self.filter_line_content).add_option(&["--filter-line-content"], Store, "Filter line content [Text Mode]");
ap.refer(&mut self.version).add_option(&["-v", "--version"], StoreTrue, "Print version"); ap.refer(&mut self.version).add_option(&["-v", "--version"], StoreTrue, "Print version");
ap.refer(&mut self.verbose).add_option(&["--verbose"], StoreTrue, "Verbose"); ap.refer(&mut self.verbose).add_option(&["--verbose"], StoreTrue, "Verbose");
ap.refer(&mut self.search_text).add_argument("SEARCH TEXT", Store, "Search text"); ap.refer(&mut self.search_text).add_argument("SEARCH TEXT", Store, "Search text");