diff --git a/app/chain/__init__.py b/app/chain/__init__.py index d5591509..c7e42443 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -385,14 +385,15 @@ class ChainBase(metaclass=ABCMeta): """ return self.run_module("post_torrents_message", message=message, torrents=torrents) - def scrape_metadata(self, path: Path, mediainfo: MediaInfo) -> None: + def scrape_metadata(self, path: Path, mediainfo: MediaInfo, scrap_metadata: bool = settings.SCRAP_METADATA) -> None: """ 刮削元数据 :param path: 媒体文件路径 :param mediainfo: 识别的媒体信息 + :param scrap_metadata: 是否刮削 :return: 成功或失败 """ - if settings.SCRAP_METADATA: + if scrap_metadata: return self.run_module("scrape_metadata", path=path, mediainfo=mediainfo) return None diff --git a/app/plugins/libraryscraper/__init__.py b/app/plugins/libraryscraper/__init__.py index 8b61fef7..9738cb94 100644 --- a/app/plugins/libraryscraper/__init__.py +++ b/app/plugins/libraryscraper/__init__.py @@ -321,6 +321,8 @@ class LibraryScraper(_PluginBase): meta_info = MetaInfo(file.name) # 合并 meta_info.merge(dir_meta) + # 是否刮削 + scrap_metadata = settings.SCRAP_METADATA # 识别媒体信息 if not mediainfo: @@ -359,6 +361,7 @@ class LibraryScraper(_PluginBase): # 覆盖模式时,提前删除nfo if self._mode in ["force_all", "force_nfo"]: + scrap_metadata = True nfo_files = SystemUtils.list_files(path, [".nfo"]) for nfo_file in nfo_files: try: @@ -369,6 +372,7 @@ class LibraryScraper(_PluginBase): # 覆盖模式时,提前删除图片文件 if self._mode in ["force_all", "force_image"]: + scrap_metadata = True image_files = SystemUtils.list_files(path, [".jpg", ".png"]) for image_file in image_files: if ".actors" in str(image_file): @@ -380,7 +384,7 @@ class LibraryScraper(_PluginBase): print(str(err)) # 刮削单个文件 - self.chain.scrape_metadata(path=file, mediainfo=mediainfo) + self.chain.scrape_metadata(path=file, mediainfo=mediainfo, scrap_metadata=scrap_metadata) @staticmethod def __get_tmdbid_from_nfo(file_path: Path):