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

Merge pull request #1029 from abdnh/tag-repl-fix

Browse Source 
Fix tag replacement matching substrings
This commit is contained in:
Damien Elmes 2021-02-17 15:54:57 +10:00 committed by GitHub
commit 4130e9fc68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rslib/src/tags.rs
View File

@ -334,7 +334,7 @@ impl Collection {
let tags = split_tags(tags) let tags = split_tags(tags)
.map(|tag| { .map(|tag| {
let tag = if regex { tag.into() } else { to_re(tag) }; let tag = if regex { tag.into() } else { to_re(tag) };
Regex::new(&format!("(?i)^{}(::.*)?", tag)) Regex::new(&format!("(?i)^{}(::.*)?$", tag))
.map_err(|_| AnkiError::invalid_input("invalid regex")) .map_err(|_| AnkiError::invalid_input("invalid regex"))
}) })
.collect::<Result<Vec<Regex>>>()?; .collect::<Result<Vec<Regex>>>()?;
@ -566,6 +566,14 @@ mod test {
let note = col.storage.get_note(note.id)?.unwrap(); let note = col.storage.get_note(note.id)?.unwrap();
assert_eq!(&note.tags, &["foo::bar", "foo::bar::bar", "foo::bar::foo",]); assert_eq!(&note.tags, &["foo::bar", "foo::bar::bar", "foo::bar::foo",]);
// ensure replacements fully match
let mut note = col.storage.get_note(note.id)?.unwrap();
note.tags = vec!["foobar".into(), "barfoo".into(), "foo".into()];
col.update_note(&mut note)?;
col.replace_tags_for_notes(&[note.id], "foo", "", false)?;
let note = col.storage.get_note(note.id)?.unwrap();
assert_eq!(&note.tags, &["barfoo", "foobar"]);
// tag children are also cleared when clearing their parent // tag children are also cleared when clearing their parent
col.storage.clear_tags()?; col.storage.clear_tags()?;
for name in vec!["a", "a::b", "A::b::c"] { for name in vec!["a", "a::b", "A::b::c"] {