From 616ba01be0804b62918e4d3ea49695beb81ed784 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Sun, 2 Feb 2020 23:23:39 -0500 Subject: [PATCH] Added flag functionality, made case insensitive default from now on --- README.md | 2 +- src/app.rs | 2 +- src/main.rs | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index de928f29..8bbebbc1 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Run using `btm`. - `-g`, `--group` will group together processes with the same name by default (equivalent to pressing `Tab`). -- `-i`, `--case_insensitive` will default to not matching case. +- `-s`, `--case_sensitive` will default to matching case. - `-w`, `--whole` will default to searching for the world word. diff --git a/src/app.rs b/src/app.rs index 455b3437..f33125f2 100644 --- a/src/app.rs +++ b/src/app.rs @@ -62,7 +62,7 @@ impl Default for AppSearchState { AppSearchState { current_search_query: String::default(), searching_pid: false, - ignore_case: false, + ignore_case: true, current_regex: BASE_REGEX.clone(), current_cursor_position: 0, match_word: false, diff --git a/src/main.rs b/src/main.rs index 54bb5f9f..9fb6b4c6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -74,7 +74,7 @@ fn main() -> error::Result<()> { //(@arg CONFIG_LOCATION: -co --config +takes_value "Sets the location of the config file. Expects a config file in the JSON format.") //(@arg BASIC_MODE: -b --basic "Sets bottom to basic mode, not showing graphs and only showing basic tables.") (@arg GROUP_PROCESSES: -g --group "Groups processes with the same name together on launch.") - (@arg CASE_INSENSITIVE: -i --case_insensitive "Do not match case when searching by default.") + (@arg CASE_SENSITIVE: -s --case_sensitive "Match case when searching by default.") (@arg WHOLE_WORD: -w --whole "Match whole word when searching by default.") (@arg REGEX_DEFAULT: -x --regex "Use regex in searching by default.") ) @@ -134,10 +134,18 @@ fn main() -> error::Result<()> { } // Set default search method - if matches.is_present("CASE_INSENSITIVE") { + if matches.is_present("CASE_SENSITIVE") { app.search_state.toggle_ignore_case(); } + if matches.is_present("WHOLE_WORD") { + app.search_state.toggle_search_whole_word(); + } + + if matches.is_present("REGEX_DEFAULT") { + app.search_state.toggle_search_regex(); + } + // Set up up tui and crossterm let mut stdout_val = stdout(); enable_raw_mode()?;