diff --git a/app/chain/media.py b/app/chain/media.py index 649f5b36..12c22187 100644 --- a/app/chain/media.py +++ b/app/chain/media.py @@ -31,8 +31,6 @@ class MediaChain(ChainBase, metaclass=Singleton): 根据主副标题识别媒体信息 """ title = metainfo.title - subtitle = metainfo.subtitle - logger.info(f'开始识别媒体信息,标题:{title},副标题:{subtitle} ...') # 识别媒体信息 mediainfo: MediaInfo = self.recognize_media(meta=metainfo) if not mediainfo: diff --git a/app/chain/torrents.py b/app/chain/torrents.py index 142076bf..760b4311 100644 --- a/app/chain/torrents.py +++ b/app/chain/torrents.py @@ -4,6 +4,7 @@ from typing import Dict, List, Union from cachetools import cached, TTLCache from app.chain import ChainBase +from app.chain.media import MediaChain from app.core.config import settings from app.core.context import TorrentInfo, Context, MediaInfo from app.core.metainfo import MetaInfo @@ -32,6 +33,7 @@ class TorrentsChain(ChainBase, metaclass=Singleton): self.siteoper = SiteOper() self.rsshelper = RssHelper() self.systemconfig = SystemConfigOper() + self.mediachain = MediaChain() def remote_refresh(self, channel: MessageChannel, userid: Union[str, int] = None): """ @@ -166,7 +168,7 @@ class TorrentsChain(ChainBase, metaclass=Singleton): # 识别 meta = MetaInfo(title=torrent.title, subtitle=torrent.description) # 识别媒体信息 - mediainfo: MediaInfo = self.recognize_media(meta=meta) + mediainfo: MediaInfo = self.mediachain.recognize_by_meta(meta) if not mediainfo: logger.warn(f'未识别到媒体信息,标题:{torrent.title}') # 存储空的媒体信息 diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 5c86a2b8..b8a11bf6 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -244,7 +244,7 @@ class TransferChain(ChainBase): if not mediainfo: # 识别媒体信息 - file_mediainfo = self.recognize_media(meta=file_meta) + file_mediainfo = self.mediachain.recognize_by_meta(file_meta) else: file_mediainfo = mediainfo @@ -508,7 +508,7 @@ class TransferChain(ChainBase): doubanid=mediaid) else: meta = MetaInfoPath(src_path) - mediainfo = self.recognize_media(meta=meta) + mediainfo = self.mediachain.recognize_by_meta(meta) if not mediainfo: return False, f"未识别到媒体信息,类型:{mtype.value},id:{mediaid}" # 重新执行转移