diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 868409a7..cd4357d1 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -242,7 +242,11 @@ class TransferChain(ChainBase): f"回复:```\n/redo {his.id} [tmdbid]|[类型]\n``` 手动识别转移。" )) continue - + # 如果未开启新增已入库媒体是否跟随TMDB信息变化则根据tmdbid查询之前的title + if not settings.SCRAP_FOLLOW_TMDB: + transfer_historys = self.transferhis.get_by(tmdbid=str(mediainfo.tmdb_id)) + if transfer_historys: + mediainfo.title = transfer_historys[0].title logger.info(f"{file_path.name} 识别为:{file_mediainfo.type.value} {file_mediainfo.title_year}") # 电视剧没有集无法转移 @@ -351,11 +355,6 @@ class TransferChain(ChainBase): # 媒体目录 if transfer_info.target_path.is_file(): transfer_info.target_path = transfer_info.target_path.parent - # 如果未开启新增已入库媒体是否跟随TMDB信息变化则根据tmdbid查询之前的title - if not settings.SCRAP_FOLLOW_TMDB: - transfer_historys = self.transferhis.get_by(tmdbid=str(mediainfo.tmdb_id)) - if not transfer_historys: - mediainfo.title = transfer_historys[0].title # 刮削 self.scrape_metadata(path=transfer_info.target_path, mediainfo=media) # 刷新媒体库,根目录或季目录 diff --git a/app/plugins/dirmonitor/__init__.py b/app/plugins/dirmonitor/__init__.py index 4fa70664..5f7f8671 100644 --- a/app/plugins/dirmonitor/__init__.py +++ b/app/plugins/dirmonitor/__init__.py @@ -260,6 +260,12 @@ class DirMonitor(_PluginBase): meta=file_meta ) return + + # 如果未开启新增已入库媒体是否跟随TMDB信息变化则根据tmdbid查询之前的title + if not settings.SCRAP_FOLLOW_TMDB: + transfer_historys = self.transferhis.get_by(tmdbid=str(mediainfo.tmdb_id)) + if transfer_historys: + mediainfo.title = transfer_historys[0].title logger.info(f"{file_path.name} 识别为:{mediainfo.type.value} {mediainfo.title_year}") # 更新媒体图片 @@ -308,12 +314,6 @@ class DirMonitor(_PluginBase): transferinfo=transferinfo ) - # 如果未开启新增已入库媒体是否跟随TMDB信息变化则根据tmdbid查询之前的title - if not settings.SCRAP_FOLLOW_TMDB: - transfer_historys = self.transferhis.get_by(tmdbid=str(mediainfo.tmdb_id)) - if not transfer_historys: - mediainfo.title = transfer_historys[0].title - # 刮削元数据,根目录或季目录 self.chain.scrape_metadata(path=transferinfo.target_path.parent, mediainfo=mediainfo) diff --git a/app/plugins/libraryscraper/__init__.py b/app/plugins/libraryscraper/__init__.py index ee104260..f963a152 100644 --- a/app/plugins/libraryscraper/__init__.py +++ b/app/plugins/libraryscraper/__init__.py @@ -310,7 +310,7 @@ class LibraryScraper(_PluginBase): # 如果未开启新增已入库媒体是否跟随TMDB信息变化则根据tmdbid查询之前的title if not settings.SCRAP_FOLLOW_TMDB: transfer_historys = self.transferhis.get_by(tmdbid=str(mediainfo.tmdb_id)) - if not transfer_historys: + if transfer_historys: mediainfo.title = transfer_historys[0].title # 开始刮削 self.chain.scrape_metadata(path=file, mediainfo=mediainfo)