langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix quotation of "and" and "or" in search (#1463)

Browse Source
This commit is contained in:
RumovZ 2021-10-28 11:23:56 +02:00 committed by GitHub
parent 3ab9712c18
commit 7e23c9fe4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rslib/src/search/writer.rs
View File

@ -3,6 +3,9 @@
use std::mem; use std::mem;
use lazy_static::lazy_static;
use regex::Regex;
use crate::{ use crate::{
decks::DeckId as DeckIdType, decks::DeckId as DeckIdType,
notetype::NotetypeId as NotetypeIdType, notetype::NotetypeId as NotetypeIdType,
@ -116,8 +119,13 @@ fn maybe_quote(txt: &str) -> String {
} }
} }
/// Checks for the reserved keywords "and" and "or", a prepended hyphen,
/// whitespace and brackets.
fn needs_quotation(txt: &str) -> bool { fn needs_quotation(txt: &str) -> bool {
txt.len() > 1 && txt.starts_with('-') || txt.chars().any(|c| " \u{3000}()".contains(c)) lazy_static! {
static ref RE: Regex = Regex::new("(?i)^and$|^or$|^-.| |\u{3000}|\\(|\\)").unwrap();
}
RE.is_match(txt)
} }
fn write_single_field(field: &str, text: &str, is_re: bool) -> String { fn write_single_field(field: &str, text: &str, is_re: bool) -> String {
@ -220,6 +228,8 @@ mod test {
// ANDs are implicit, ORs in upper case // ANDs are implicit, ORs in upper case
assert_eq!("1 2 OR 3", normalize_search(r"1 and 2 or 3").unwrap()); assert_eq!("1 2 OR 3", normalize_search(r"1 and 2 or 3").unwrap());
assert_eq!(r#""f o o" bar"#, normalize_search(r#""f o o"bar"#).unwrap()); assert_eq!(r#""f o o" bar"#, normalize_search(r#""f o o"bar"#).unwrap());
// AND and OR must be escaped regardless of case
assert_eq!(r#""aNd" "oR""#, normalize_search(r#""aNd" "oR""#).unwrap());
// normalize numbers // normalize numbers
assert_eq!("prop:ease>1", normalize_search("prop:ease>1.0").unwrap()); assert_eq!("prop:ease>1", normalize_search("prop:ease>1.0").unwrap());
} }