fix #1553

fix #1496

app/chain/search.py

@@ -3,7 +3,7 @@ import re
 import traceback
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import datetime
-from typing import Dict, Tuple
+from typing import Dict
 from typing import List, Optional
 
 from app.chain import ChainBase
@@ -352,102 +352,13 @@ class SearchChain(ChainBase):
             filter_rule = self.systemconfig.get(SystemConfigKey.DefaultSearchFilterRules)
         if not filter_rule:
             return torrents
-        # 包含
-        include = filter_rule.get("include")
-        # 排除
-        exclude = filter_rule.get("exclude")
-        # 质量
-        quality = filter_rule.get("quality")
-        # 分辨率
-        resolution = filter_rule.get("resolution")
-        # 特效
-        effect = filter_rule.get("effect")
-        # 电影大小
-        movie_size = filter_rule.get("movie_size")
-        # 剧集单集大小
-        tv_size = filter_rule.get("tv_size")
-
-        def __get_size_range(size_str: str) -> Tuple[float, float]:
-            """
-            获取大小范围
-            """
-            if not size_str:
-                return 0, 0
-            try:
-                size_range = size_str.split("-")
-                if len(size_range) == 1:
-                    return 0, float(size_range[0])
-                elif len(size_range) == 2:
-                    return float(size_range[0]), float(size_range[1])
-            except Exception as e:
-                logger.error(f"解析大小范围失败：{str(e)} - {traceback.format_exc()}")
-            return 0, 0
-
-        def __filter_torrent(t: TorrentInfo) -> bool:
-            """
-            过滤种子
-            """
-            # 包含
-            if include:
-                if not re.search(r"%s" % include,
-                                 f"{t.title} {t.description}", re.I):
-                    logger.info(f"{t.title} 不匹配包含规则 {include}")
-                    return False
-            # 排除
-            if exclude:
-                if re.search(r"%s" % exclude,
-                             f"{t.title} {t.description}", re.I):
-                    logger.info(f"{t.title} 匹配排除规则 {exclude}")
-                    return False
-            # 质量
-            if quality:
-                if not re.search(r"%s" % quality, t.title, re.I):
-                    logger.info(f"{t.title} 不匹配质量规则 {quality}")
-                    return False
-
-            # 分辨率
-            if resolution:
-                if not re.search(r"%s" % resolution, t.title, re.I):
-                    logger.info(f"{t.title} 不匹配分辨率规则 {resolution}")
-                    return False
-
-            # 特效
-            if effect:
-                if not re.search(r"%s" % effect, t.title, re.I):
-                    logger.info(f"{t.title} 不匹配特效规则 {effect}")
-                    return False
-
-            # 大小
-            if movie_size or tv_size:
-                if mediainfo.type == MediaType.TV:
-                    size = tv_size
-                else:
-                    size = movie_size
-                # 大小范围
-                begin_size, end_size = __get_size_range(size)
-                if begin_size or end_size:
-                    meta = MetaInfo(title=t.title, subtitle=t.description)
-                    # 集数
-                    if mediainfo.type == MediaType.TV:
-                        # 电视剧
-                        season = meta.begin_season or 1
-                        if meta.total_episode:
-                            # 识别的总集数
-                            episodes_num = meta.total_episode
-                        else:
-                            # 整季集数
-                            episodes_num = len(mediainfo.seasons.get(season) or [1])
-                        # 比较大小
-                        if not (begin_size * 1024 ** 3 <= (t.size / episodes_num) <= end_size * 1024 ** 3):
-                            logger.info(f"{t.title} {StringUtils.str_filesize(t.size)} "
-                                        f"共{episodes_num}集，不匹配大小规则 {size}")
-                            return False
-                    else:
-                        # 电影比较大小
-                        if not (begin_size * 1024 ** 3 <= t.size <= end_size * 1024 ** 3):
-                            logger.info(f"{t.title} {StringUtils.str_filesize(t.size)} 不匹配大小规则 {size}")
-                            return False
-            return True
 
         # 使用默认过滤规则再次过滤
-        return list(filter(lambda t: __filter_torrent(t), torrents))
+        return list(filter(
+            lambda t: self.torrenthelper.filter_torrent(
+                torrent_info=t,
+                filter_rule=filter_rule,
+                mediainfo=mediainfo
+            ),
+            torrents
+        ))