From 26abccabf35e76e7d3dd57cdf82c5e3986309041 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 12 Sep 2024 12:36:58 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=A7=84=E5=88=99=E7=BB=84?= =?UTF-8?q?=E9=80=82=E7=94=A8=E5=AA=92=E4=BD=93=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filter/__init__.py | 5 +++++ app/schemas/rule.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/modules/filter/__init__.py b/app/modules/filter/__init__.py index 75115b13..3caa2aa1 100644 --- a/app/modules/filter/__init__.py +++ b/app/modules/filter/__init__.py @@ -182,6 +182,11 @@ class FilterModule(_ModuleBase): continue if rule_group.media_type and rule_group.media_type != mediainfo.type.value: # 规则组不适用当前媒体类型 + logger.debug(f"规则组 {group_name} 不适用于 {mediainfo.type.value}") + continue + if rule_group.catetory and mediainfo.category and mediainfo.category != rule_group.catetory: + # 规则组不适用于当前媒体类别 + logger.debug(f"规则组 {group_name} 不适用于 {mediainfo.category}") continue # 过滤种子 torrent_list = self.__filter_torrents( diff --git a/app/schemas/rule.py b/app/schemas/rule.py index bec7c265..ea86c098 100644 --- a/app/schemas/rule.py +++ b/app/schemas/rule.py @@ -31,5 +31,7 @@ class FilterRuleGroup(BaseModel): name: Optional[str] = None # 规则串 rule_string: Optional[str] = None - # 适用类媒体类别 None-全部 电影/电视剧 + # 适用类媒体类型 None-全部 电影/电视剧 media_type: Optional[str] = None + # 适用媒体类别 None-全部 对应二级分类 + catetory: Optional[str] = None