fix torrents match

app/chain/search.py

@@ -1,5 +1,4 @@
 import pickle
-import re
 import traceback
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import datetime
@@ -18,7 +17,6 @@ from app.helper.torrent import TorrentHelper
 from app.log import logger
 from app.schemas import NotExistMediaInfo
 from app.schemas.types import MediaType, ProgressKey, SystemConfigKey, EventType
-from app.utils.string import StringUtils
 
 
 class SearchChain(ChainBase):
@@ -179,73 +177,12 @@ class SearchChain(ChainBase):
                 torrent_meta = MetaInfo(title=torrent.title, subtitle=torrent.description)
                 if torrent.title != torrent_meta.org_string:
                     logger.info(f"种子名称应用识别词后发生改变：{torrent.title} => {torrent_meta.org_string}")
-                # 比对种子识别类型
-                if torrent_meta.type == MediaType.TV and mediainfo.type != MediaType.TV:
-                    logger.warn(f'{torrent.site_name} - {torrent.title} 种子标题类型为 {torrent_meta.type.value}，'
-                                f'不匹配 {mediainfo.type.value}')
-                    continue
-                # 比对种子在站点中的类型
-                if torrent.category == MediaType.TV.value and mediainfo.type != MediaType.TV:
-                    logger.warn(f'{torrent.site_name} - {torrent.title} 种子在站点中归类为 {torrent.category}，'
-                                f'不匹配 {mediainfo.type.value}')
-                    continue
-                # 比对年份
-                if mediainfo.year:
-                    if mediainfo.type == MediaType.TV:
-                        # 剧集年份，每季的年份可能不同
-                        if torrent_meta.year and torrent_meta.year not in [year for year in
-                                                                           mediainfo.season_years.values()]:
-                            logger.warn(f'{torrent.site_name} - {torrent.title} 年份不匹配 {mediainfo.season_years}')
-                            continue
-                    else:
-                        # 电影年份，上下浮动1年
-                        if torrent_meta.year not in [str(int(mediainfo.year) - 1),
-                                                     mediainfo.year,
-                                                     str(int(mediainfo.year) + 1)]:
-                            logger.warn(f'{torrent.site_name} - {torrent.title} 年份不匹配 {mediainfo.year}')
-                            continue
-                # 识别的中英文名
-                meta_names = {
-                                 StringUtils.clear_upper(torrent_meta.cn_name),
-                                 StringUtils.clear_upper(torrent_meta.en_name)
-                             } - {""}
-                # 媒体标题、原标题
-                media_titles = {
-                                   StringUtils.clear_upper(mediainfo.title),
-                                   StringUtils.clear_upper(mediainfo.original_title)
-                               } - {""}
-                # 比对标题和原语种标题
-                if meta_names.intersection(media_titles):
-                    logger.info(f'{mediainfo.title} 通过标题匹配到资源：{torrent.site_name} - {torrent.title}')
+                # 比对种子
+                if self.torrenthelper.match_torrent(mediainfo=mediainfo,
+                                                    torrent_meta=torrent_meta,
+                                                    torrent=torrent):
+                    # 匹配成功
                     _match_torrents.append(torrent)
-                    continue
-                # 比对别名和译名
-                media_names = {StringUtils.clear_upper(name) for name in mediainfo.names if name}
-                if media_names:
-                    if meta_names.intersection(media_names):
-                        logger.info(f'{mediainfo.title} 通过别名或译名匹配到资源：{torrent.site_name} - {torrent.title}')
-                        _match_torrents.append(torrent)
-                        continue
-                # 标题拆分
-                titles = [StringUtils.clear_upper(t) for t in re.split(r'[\s/【】.\[\]\-]+',
-                                                                       torrent_meta.org_string) if t]
-                # 在标题中判断是否存在标题、原语种标题、别名、译名
-                if meta_names.intersection(titles) or media_names.intersection(titles):
-                    logger.info(f'{mediainfo.title} 通过标题匹配到资源：{torrent.site_name} - {torrent.title}，'
-                                f'标题：{torrent.title}')
-                    _match_torrents.append(torrent)
-                    continue
-                # 在副标题中判断是否存在标题、原语种标题、别名、译名
-                if torrent.description:
-                    subtitles = {StringUtils.clear_upper(t) for t in re.split(r'[\s/|]+',
-                                                                              torrent.description) if t}
-                    if meta_names.intersection(subtitles) or media_names.intersection(subtitles):
-                        logger.info(f'{mediainfo.title} 通过副标题匹配到资源：{torrent.site_name} - {torrent.title}，'
-                                    f'副标题：{torrent.description}')
-                        _match_torrents.append(torrent)
-                        continue
-                # 未匹配
-                logger.warn(f'{torrent.site_name} - {torrent.title} 标题不匹配，识别名称：{meta_names}')
             # 匹配完成
             logger.info(f"匹配完成，共匹配到 {len(_match_torrents)} 个资源")
             self.progress.update(value=97,