diff --git a/app/chain/media.py b/app/chain/media.py index 323f550d..b2771884 100644 --- a/app/chain/media.py +++ b/app/chain/media.py @@ -334,7 +334,7 @@ class MediaChain(ChainBase, metaclass=Singleton): return None def manual_scrape(self, storage: str, fileitem: schemas.FileItem, - meta: MetaBase, mediainfo: MediaInfo, init_folder: bool = True): + meta: MetaBase = None, mediainfo: MediaInfo = None, init_folder: bool = True): """ 手动刮削媒体信息 """ @@ -399,7 +399,12 @@ class MediaChain(ChainBase, metaclass=Singleton): if fileitem.type == "file" \ and (not filepath.suffix or filepath.suffix.lower() not in settings.RMT_MEDIAEXT): return + if not meta: + meta = MetaInfoPath(filepath) if not mediainfo: + mediainfo = self.recognize_by_meta(meta) + if not mediainfo: + logger.warn(f"{filepath} 无法识别文件媒体信息!") return logger.info(f"开始刮削:{filepath} ...") if mediainfo.type == MediaType.MOVIE: diff --git a/app/chain/transfer.py b/app/chain/transfer.py index cff9e4ca..0f8a4ea6 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -905,6 +905,7 @@ class TransferChain(ChainBase): season=season, epformat=epformat, min_filesize=min_filesize, + scrape=scrape, force=force) return state, errmsg