From 3943a7a79327aa8e64a38474d1abc6c74dc44cc2 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 31 Aug 2023 14:47:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=20NAStool=E6=95=B0=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/plugins/nastoolsync/__init__.py | 43 +++++++++++++++-------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/app/plugins/nastoolsync/__init__.py b/app/plugins/nastoolsync/__init__.py index d268e236..3c47e530 100644 --- a/app/plugins/nastoolsync/__init__.py +++ b/app/plugins/nastoolsync/__init__.py @@ -255,29 +255,32 @@ class NAStoolSync(_PluginBase): # 转种后种子hash transfer_hash = [] + qb_torrents = [] + tr_torrents = [] + tr_torrents_all = [] + if self._supp: + # 获取所有的转种数据 + transfer_datas = self._plugindata.get_data_all("TorrentTransfer") + if transfer_datas: + if not isinstance(transfer_datas, list): + transfer_datas = [transfer_datas] - # 获取所有的转种数据 - transfer_datas = self._plugindata.get_data_all("TorrentTransfer") - if transfer_datas: - if not isinstance(transfer_datas, list): - transfer_datas = [transfer_datas] - - for transfer_data in transfer_datas: - if not transfer_data or not isinstance(transfer_data, PluginData): - continue - # 转移后种子hash - transfer_value = transfer_data.value - transfer_value = json.loads(transfer_value) - if not isinstance(transfer_value, dict): + for transfer_data in transfer_datas: + if not transfer_data or not isinstance(transfer_data, PluginData): + continue + # 转移后种子hash + transfer_value = transfer_data.value transfer_value = json.loads(transfer_value) - to_hash = transfer_value.get("to_download_id") - # 转移前种子hash - transfer_hash.append(to_hash) + if not isinstance(transfer_value, dict): + transfer_value = json.loads(transfer_value) + to_hash = transfer_value.get("to_download_id") + # 转移前种子hash + transfer_hash.append(to_hash) - # 获取tr、qb所有种子 - qb_torrents, _ = self.qb.get_torrents() - tr_torrents, _ = self.tr.get_torrents(ids=transfer_hash) - tr_torrents_all, _ = self.tr.get_torrents() + # 获取tr、qb所有种子 + qb_torrents, _ = self.qb.get_torrents() + tr_torrents, _ = self.tr.get_torrents(ids=transfer_hash) + tr_torrents_all, _ = self.tr.get_torrents() # 处理数据,存入mp数据库 for history in transfer_history: