From b54b98e1c378c2aad32c5ce1b5cae7b4a375ae05 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 7 Jun 2023 21:43:07 +0800 Subject: [PATCH] fix ruleparser --- app/modules/filter/RuleParser.py | 4 ++-- app/modules/filter/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/modules/filter/RuleParser.py b/app/modules/filter/RuleParser.py index 2e81b556..c063c517 100644 --- a/app/modules/filter/RuleParser.py +++ b/app/modules/filter/RuleParser.py @@ -41,7 +41,7 @@ class RuleParser: if __name__ == '__main__': # 测试代码 - expression = "!BLU & 4K & CN > !BLU & 1080P & CN > !BLU & 4K > !BLU & 1080P" - for exp in expression.split('>'): + expression_str = "!BLU & 4K & CN > !BLU & 1080P & CN > !BLU & 4K > !BLU & 1080P" + for exp in expression_str.split('>'): parsed_expr = RuleParser().parse(exp) print(parsed_expr.as_list()) diff --git a/app/modules/filter/__init__.py b/app/modules/filter/__init__.py index 0417262f..53766da0 100644 --- a/app/modules/filter/__init__.py +++ b/app/modules/filter/__init__.py @@ -94,7 +94,7 @@ class FilterModule(_ModuleBase): for rule_group in rule_groups: # 解析规则组 parsed_group = self.parser.parse(rule_group.strip()) - if self.__match_group(torrent, parsed_group.as_list()): + if self.__match_group(torrent, parsed_group.as_list()[0]): # 出现匹配时中断 matched = True torrent.pri_order = res_order