From b435b847822bbc296da8d8faa49ab95437721c0e Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 24 Aug 2023 09:11:02 +0800 Subject: [PATCH] fix bug --- app/chain/__init__.py | 2 +- app/chain/transfer.py | 2 +- app/modules/qbittorrent/__init__.py | 5 +++-- app/modules/transmission/__init__.py | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/chain/__init__.py b/app/chain/__init__.py index 672b66b9..8a4e9192 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -287,7 +287,7 @@ class ChainBase(metaclass=ABCMeta): return self.run_module("transfer", path=path, mediainfo=mediainfo, transfer_type=transfer_type, target=target, meta=meta) - def transfer_completed(self, hashs: Union[str, list], transinfo: TransferInfo) -> None: + def transfer_completed(self, hashs: Union[str, list], transinfo: TransferInfo = None) -> None: """ 转移完成后的处理 :param hashs: 种子Hash diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 9040647d..6edbbce7 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -102,7 +102,7 @@ class TransferChain(ChainBase): f"回复:```\n/redo {his.id} [tmdbid]|[类型]\n``` 手动识别转移。" )) # 设置种子状态,避免一直报错 - self.transfer_completed(hashs=torrent.hash, transinfo=transferinfo) + self.transfer_completed(hashs=torrent.hash) continue logger.info(f"{torrent.title} 识别为:{mediainfo.type.value} {mediainfo.title_year}") diff --git a/app/modules/qbittorrent/__init__.py b/app/modules/qbittorrent/__init__.py index 12785915..fb288fd4 100644 --- a/app/modules/qbittorrent/__init__.py +++ b/app/modules/qbittorrent/__init__.py @@ -155,7 +155,8 @@ class QbittorrentModule(_ModuleBase): return None return ret_torrents - def transfer_completed(self, hashs: Union[str, list], transinfo: TransferInfo) -> None: + def transfer_completed(self, hashs: Union[str, list], + transinfo: TransferInfo = None) -> None: """ 转移完成后的处理 :param hashs: 种子Hash @@ -167,7 +168,7 @@ class QbittorrentModule(_ModuleBase): if self.remove_torrents(hashs): logger.info(f"移动模式删除种子成功:{hashs} ") # 删除残留文件 - if transinfo.path and transinfo.path.exists(): + if transinfo and transinfo.path and transinfo.path.exists(): files = SystemUtils.list_files(transinfo.path, settings.RMT_MEDIAEXT) if not files: logger.warn(f"删除残留文件夹:{transinfo.path}") diff --git a/app/modules/transmission/__init__.py b/app/modules/transmission/__init__.py index 6ab78133..b4f5845b 100644 --- a/app/modules/transmission/__init__.py +++ b/app/modules/transmission/__init__.py @@ -138,7 +138,8 @@ class TransmissionModule(_ModuleBase): return None return ret_torrents - def transfer_completed(self, hashs: Union[str, list], transinfo: TransferInfo) -> None: + def transfer_completed(self, hashs: Union[str, list], + transinfo: TransferInfo = None) -> None: """ 转移完成后的处理 :param hashs: 种子Hash @@ -151,7 +152,7 @@ class TransmissionModule(_ModuleBase): if self.remove_torrents(hashs): logger.info(f"移动模式删除种子成功:{hashs} ") # 删除残留文件 - if transinfo.path and transinfo.path.exists(): + if transinfo and transinfo.path and transinfo.path.exists(): files = SystemUtils.list_files(transinfo.path, settings.RMT_MEDIAEXT) if not files: logger.warn(f"删除残留文件夹:{transinfo.path}")