-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Speed up regex filtering by compiling it only once
Also send a new value of a property in Toggled event.
- Loading branch information
1 parent
09e559d
commit 421b868
Showing
10 changed files
with
142 additions
and
70 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| use anyhow::{bail, Result}; | ||
| use regex::{Regex, RegexBuilder}; | ||
|
|
||
|
|
||
| pub(crate) struct TextFilter | ||
| { | ||
| regexState: RegexState | ||
| } | ||
|
|
||
| enum RegexState | ||
| { | ||
| Disabled{text: String}, | ||
| Invalid{text: String}, | ||
| Valid{regex: Regex} | ||
| } | ||
|
|
||
| impl TextFilter | ||
| { | ||
| pub(crate) fn new() -> Self | ||
| { | ||
| Self{regexState: RegexState::Disabled{text: String::new()}} | ||
| } | ||
|
|
||
| pub(crate) fn setText(&mut self, newText: &str) -> Result<()> | ||
| { | ||
| match &mut self.regexState { | ||
| RegexState::Disabled{text} => *text = newText.into(), | ||
| RegexState::Invalid{text} => { | ||
| match RegexBuilder::new(newText).case_insensitive(true).build() { | ||
| Ok(newRegex) => self.regexState = RegexState::Valid{regex: newRegex}, | ||
| Err(e) => { | ||
| *text = newText.into(); | ||
| bail!(e) | ||
| } | ||
| } | ||
| }, | ||
| RegexState::Valid{regex} => { | ||
| match RegexBuilder::new(newText).case_insensitive(true).build() { | ||
| Ok(newRegex) => *regex = newRegex, | ||
| Err(e) => { | ||
| self.regexState = RegexState::Invalid{text: newText.into()}; | ||
| bail!(e) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| pub(crate) fn enableRegex(&mut self, shouldEnable: bool) -> Result<()> | ||
| { | ||
| if shouldEnable { | ||
| match &mut self.regexState { | ||
| RegexState::Disabled{text} => { | ||
| match RegexBuilder::new(&text).case_insensitive(true).build() { | ||
| Ok(regex) => self.regexState = RegexState::Valid{regex}, | ||
| Err(e) => { | ||
| self.regexState = RegexState::Invalid{text: text.clone()}; | ||
| bail!(e) | ||
| } | ||
| } | ||
| }, | ||
| RegexState::Invalid{..} => (), | ||
| RegexState::Valid{..} => () | ||
| } | ||
| } else { | ||
| match &mut self.regexState { | ||
| RegexState::Disabled{..} => (), | ||
| RegexState::Invalid{text} => self.regexState = RegexState::Disabled{text: text.clone()}, | ||
| RegexState::Valid{regex} => self.regexState = RegexState::Disabled{text: regex.as_str().into()} | ||
| } | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| pub(crate) fn isEmpty(&self) -> bool | ||
| { | ||
| match &self.regexState { | ||
| RegexState::Disabled{text} => text.is_empty(), | ||
| RegexState::Invalid{..} => true, | ||
| RegexState::Valid{regex} => regex.as_str().is_empty() | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn isMatch(&self, input: &str) -> bool | ||
| { | ||
| match &self.regexState { | ||
| RegexState::Disabled{text} => input.to_lowercase().contains(text), | ||
| RegexState::Invalid{..} => false, | ||
| RegexState::Valid{regex} => regex.is_match(input) | ||
| } | ||
| } | ||
| } |