tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-20 20:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue introduced with last commit on searching.

Browse Source
This commit is contained in:
ClementTsang 2020-02-17 17:53:49 -05:00
parent 4485d1b380
commit b3eafe711e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -15,8 +15,8 @@ name = "btm"
path = "src/main.rs" path = "src/main.rs"
[profile.release] [profile.release]
# debug = true debug = true
debug = 1 # debug = 1
opt-level = 'z' # Optimize for size. opt-level = 'z' # Optimize for size.
# opt-level = 3 # Optimize for speed. # opt-level = 3 # Optimize for speed.
lto = true lto = true

8
src/app.rs
View File

@ -475,12 +475,12 @@ impl App {
let final_regex_string = &format!( let final_regex_string = &format!(
"{}{}{}", "{}{}{}",
if self.process_search_state.is_searching_whole_word { if self.process_search_state.is_searching_whole_word {
"^{}$" "^$"
} else { } else {
"" ""
}, },
if self.process_search_state.is_ignoring_case { if self.process_search_state.is_ignoring_case {
"(?i){}" "(?i)"
} else { } else {
"" ""
}, },
@ -492,9 +492,9 @@ impl App {
} }
); );
self.process_search_state.search_state.is_blank_search = false; debug!("FINAL: {}", final_regex_string);
let new_regex = regex::Regex::new(final_regex_string); let new_regex = regex::Regex::new(final_regex_string);
self.process_search_state.search_state.is_blank_search = false;
self.process_search_state.search_state.is_invalid_search = new_regex.is_err(); self.process_search_state.search_state.is_invalid_search = new_regex.is_err();
self.process_search_state.search_state.current_regex = Some(new_regex); self.process_search_state.search_state.current_regex = Some(new_regex);

2
src/canvas.rs
View File

@ -231,7 +231,7 @@ impl Painter {
) )
.split(vertical_dialog_chunk[1]); .split(vertical_dialog_chunk[1]);
if let Some(dd_err) = app_state.dd_err.clone() { if let Some(dd_err) = &app_state.dd_err {
let dd_text = [Text::raw(format!( let dd_text = [Text::raw(format!(
"\nFailure to properly kill the process - {}", "\nFailure to properly kill the process - {}",
dd_err dd_err