lifegpc/pixiv_downloader
1
0
Fork 0
mirror of https://github.com/lifegpc/pixiv_downloader.git synced 2026-07-08 01:32:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix for author-name-filters

Browse Source
This commit is contained in:
lifegpc
2022-03-10 23:50:43 +08:00
parent bf17c29ea1
commit 1f72998b54
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/author_name_filter.rs
View File

@@ -59,13 +59,13 @@ impl AuthorFiler for AuthorNameFilter {
fn filter(&self, author: &str) -> String {
match self {
Self::Simple(s) => {
match author.find(s) {
match author.rfind(s) {
Some(i) => { String::from(&author[..i]) }
None => { String::from(author) }
}
}
Self::Regex(r) => {
r.replace(author, "").to_owned().to_string()
r.replace_all(author, "").to_owned().to_string()
}
}
}
@@ -153,4 +153,6 @@ fn test_author_name_filter() {
let l = AuthorNameFilter::from_json(json::array![{"type": "simple", "rule": "🌸"}, {"type": "regex", "rule": ".?お仕事募集中"}]).unwrap();
assert_eq!(l, vec![AuthorNameFilter::from("🌸"), AuthorNameFilter::from(r)]);
assert_eq!(l.filter("moco<お仕事募集中🌸お仕事募集中"), String::from("moco<お仕事募集中"));
assert_eq!(l.filter("sss@ss@お仕事募集中"), "sss@ss");
assert_eq!(l.filter("sss🌸ss🌸お仕事募集中"), "sss🌸ss");
}