GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

For deck searches, unescape quotes only

Browse source 
For now, revert to the old handling of deck names using text_to_re from
text.rs and have parser.rs only unescape quotes.
This commit is contained in:
RumovZ 2020-11-14 18:32:41 +01:00
parent b186e61e54
commit 3949996728
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rslib/src/search/parser.rs
View file

@ -69,7 +69,7 @@ pub(super) enum SearchNode<'a> {
AddedInDays(u32), AddedInDays(u32),
EditedInDays(u32), EditedInDays(u32),
CardTemplate(TemplateKind<'a>), CardTemplate(TemplateKind<'a>),
Deck(String), Deck(Cow<'a, str>),
DeckID(DeckID), DeckID(DeckID),
NoteTypeID(NoteTypeID), NoteTypeID(NoteTypeID),
NoteType(OptionalRe<'a>), NoteType(OptionalRe<'a>),
@ -280,7 +280,7 @@ fn search_node_for_text_with_argument<'a>(
Ok(match key.to_ascii_lowercase().as_str() { Ok(match key.to_ascii_lowercase().as_str() {
"added" => SearchNode::AddedInDays(val.parse()?), "added" => SearchNode::AddedInDays(val.parse()?),
"edited" => SearchNode::EditedInDays(val.parse()?), "edited" => SearchNode::EditedInDays(val.parse()?),
"deck" => SearchNode::Deck(unescape_to_enforced_re(val)?), "deck" => SearchNode::Deck(unescape_quotes(val)),
"note" => SearchNode::NoteType(unescape_to_re(val)?), "note" => SearchNode::NoteType(unescape_to_re(val)?),
"tag" => SearchNode::Tag(parse_tag(val)?), "tag" => SearchNode::Tag(parse_tag(val)?),
"mid" => SearchNode::NoteTypeID(val.parse()?), "mid" => SearchNode::NoteTypeID(val.parse()?),

1
rslib/src/search/sqlwriter.rs
View file

@ -319,6 +319,7 @@ impl SqlWriter<'_> {
}; };
// convert to a regex that includes child decks // convert to a regex that includes child decks
// fixme: use unescape_to_enforced_re from parser.rs?
let re = text_to_re(&native_deck); let re = text_to_re(&native_deck);
self.args.push(format!("(?i)^{}($|\x1f)", re)); self.args.push(format!("(?i)^{}($|\x1f)", re));
let arg_idx = self.args.len(); let arg_idx = self.args.len();