From 2de20f601b14db4d801db8c4ffe35d3741b8ec5f Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 13 Sep 2023 12:23:32 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=80=E5=85=B3=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/__init__.py | 17 +++++------------ app/chain/transfer.py | 6 ++++-- app/modules/subtitle/__init__.py | 3 +++ app/plugins/dirmonitor/__init__.py | 8 +++++--- app/plugins/libraryscraper/__init__.py | 3 ++- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/chain/__init__.py b/app/chain/__init__.py index 8de3b680..45eeaf2a 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -257,10 +257,8 @@ class ChainBase(metaclass=ABCMeta): :param download_dir: 下载目录 :return: None，该方法可被多个模块同时处理 """ - if settings.DOWNLOAD_SUBTITLE: - return self.run_module("download_added", context=context, torrent_path=torrent_path, - download_dir=download_dir) - return None + return self.run_module("download_added", context=context, torrent_path=torrent_path, + download_dir=download_dir) def list_torrents(self, status: TorrentStatus = None, hashs: Union[list, str] = None) -> Optional[List[Union[TransferTorrent, DownloadingTorrent]]]: @@ -342,9 +340,7 @@ class ChainBase(metaclass=ABCMeta): :param file_path: 文件路径 :return: 成功或失败 """ - if settings.REFRESH_MEDIASERVER: - return self.run_module("refresh_mediaserver", mediainfo=mediainfo, file_path=file_path) - return None + return self.run_module("refresh_mediaserver", mediainfo=mediainfo, file_path=file_path) def post_message(self, message: Notification) -> None: """ @@ -385,17 +381,14 @@ class ChainBase(metaclass=ABCMeta): """ return self.run_module("post_torrents_message", message=message, torrents=torrents) - def scrape_metadata(self, path: Path, mediainfo: MediaInfo, scrap: bool = settings.SCRAP_METADATA) -> None: + def scrape_metadata(self, path: Path, mediainfo: MediaInfo) -> None: """ 刮削元数据 :param path: 媒体文件路径 :param mediainfo: 识别的媒体信息 - :param scrap: 是否刮削 :return: 成功或失败 """ - if scrap: - return self.run_module("scrape_metadata", path=path, mediainfo=mediainfo) - return None + return self.run_module("scrape_metadata", path=path, mediainfo=mediainfo) def register_commands(self, commands: Dict[str, dict]) -> None: """ diff --git a/app/chain/transfer.py b/app/chain/transfer.py index e2126b39..e31cefc6 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -349,7 +349,8 @@ class TransferChain(ChainBase): transferinfo=transferinfo ) # 刮削单个文件 - self.scrape_metadata(path=transferinfo.target_path, mediainfo=file_mediainfo) + if settings.SCRAP_METADATA: + self.scrape_metadata(path=transferinfo.target_path, mediainfo=file_mediainfo) # 更新进度 processed_num += 1 self.progress.update(value=processed_num / total_num * 100, @@ -369,7 +370,8 @@ class TransferChain(ChainBase): if transfer_info.target_path.is_file(): transfer_info.target_path = transfer_info.target_path.parent # 刷新媒体库，根目录或季目录 - self.refresh_mediaserver(mediainfo=media, file_path=transfer_info.target_path) + if settings.REFRESH_MEDIASERVER: + self.refresh_mediaserver(mediainfo=media, file_path=transfer_info.target_path) # 发送通知 se_str = None if media.type == MediaType.TV: diff --git a/app/modules/subtitle/__init__.py b/app/modules/subtitle/__init__.py index 973172b4..da8b3c8d 100644 --- a/app/modules/subtitle/__init__.py +++ b/app/modules/subtitle/__init__.py @@ -42,6 +42,9 @@ class SubtitleModule(_ModuleBase): :param download_dir: 下载目录 :return: None，该方法可被多个模块同时处理 """ + if not settings.DOWNLOAD_SUBTITLE: + return None + # 种子信息 torrent = context.torrent_info if not torrent.page_url: diff --git a/app/plugins/dirmonitor/__init__.py b/app/plugins/dirmonitor/__init__.py index bc4cacd2..79195e43 100644 --- a/app/plugins/dirmonitor/__init__.py +++ b/app/plugins/dirmonitor/__init__.py @@ -323,8 +323,9 @@ class DirMonitor(_PluginBase): ) # 刮削单个文件 - self.chain.scrape_metadata(path=transferinfo.target_path, - mediainfo=mediainfo) + if settings.SCRAP_METADATA: + self.chain.scrape_metadata(path=transferinfo.target_path, + mediainfo=mediainfo) """ { @@ -386,7 +387,8 @@ class DirMonitor(_PluginBase): self._medias[mediainfo.title_year + " " + meta.season] = media_list # 汇总刷新媒体库 - self.chain.refresh_mediaserver(mediainfo=mediainfo, file_path=transferinfo.target_path) + if settings.REFRESH_MEDIASERVER: + self.chain.refresh_mediaserver(mediainfo=mediainfo, file_path=transferinfo.target_path) # 广播事件 self.eventmanager.send_event(EventType.TransferComplete, { 'meta': file_meta, diff --git a/app/plugins/libraryscraper/__init__.py b/app/plugins/libraryscraper/__init__.py index ea81ca1a..f935a7f6 100644 --- a/app/plugins/libraryscraper/__init__.py +++ b/app/plugins/libraryscraper/__init__.py @@ -384,7 +384,8 @@ class LibraryScraper(_PluginBase): print(str(err)) # 刮削单个文件 - self.chain.scrape_metadata(path=file, mediainfo=mediainfo, scrap=scrap_metadata) + if scrap_metadata: + self.chain.scrape_metadata(path=file, mediainfo=mediainfo) @staticmethod def __get_tmdbid_from_nfo(file_path: Path):