From be09d5e65d034767f4ab1eb9452d4c666ad9a537 Mon Sep 17 00:00:00 2001 From: thsrite Date: Tue, 22 Oct 2024 16:47:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A7=84=E5=88=99=E5=8C=85=E5=90=AB=E3=80=81=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filter/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/modules/filter/__init__.py b/app/modules/filter/__init__.py index a87b167d..8646f312 100644 --- a/app/modules/filter/__init__.py +++ b/app/modules/filter/__init__.py @@ -346,9 +346,9 @@ class FilterModule(_ModuleBase): if match_content: content = " ".join(match_content) # 包含规则项 - includes = self.rule_set[rule_name].get("include") or [] + includes = self.rule_set[rule_name].get("include").split("|") if self.rule_set[rule_name].get("include") else [] # 排除规则项 - excludes = self.rule_set[rule_name].get("exclude") or [] + excludes = self.rule_set[rule_name].get("exclude").split("|") if self.rule_set[rule_name].get("exclude") else [] # 大小范围规则项 size_range = self.rule_set[rule_name].get("size_range") # 做种人数规则项 From 72b955ebaeb9cf0a48b570d1057b97eee7939583 Mon Sep 17 00:00:00 2001 From: thsrite Date: Tue, 22 Oct 2024 16:53:17 +0800 Subject: [PATCH 2/2] fix --- app/modules/filter/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/modules/filter/__init__.py b/app/modules/filter/__init__.py index 8646f312..e3983ea7 100644 --- a/app/modules/filter/__init__.py +++ b/app/modules/filter/__init__.py @@ -346,9 +346,13 @@ class FilterModule(_ModuleBase): if match_content: content = " ".join(match_content) # 包含规则项 - includes = self.rule_set[rule_name].get("include").split("|") if self.rule_set[rule_name].get("include") else [] + includes = self.rule_set[rule_name].get("include") or [] + if isinstance(includes, str): + includes = includes.split("|") # 排除规则项 - excludes = self.rule_set[rule_name].get("exclude").split("|") if self.rule_set[rule_name].get("exclude") else [] + excludes = self.rule_set[rule_name].get("exclude") or [] + if isinstance(excludes, str): + excludes = excludes.split("|") # 大小范围规则项 size_range = self.rule_set[rule_name].get("size_range") # 做种人数规则项