From ed74a5be7745ba20ea3d33a9f06e13387b8fe04b Mon Sep 17 00:00:00 2001 From: Alex Liu Date: Tue, 27 Aug 2024 10:57:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=BE=85=E7=A7=8D=E4=B8=AD=E8=B7=B3=E8=BF=87=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=90=8E=E4=B8=8D=E4=BC=9A=E6=A3=80=E6=9F=A5=E7=A7=8D?= =?UTF-8?q?=E5=AD=90=E5=AE=8C=E6=95=B4=E5=BA=A6=E7=9B=B4=E6=8E=A5=E5=81=9A?= =?UTF-8?q?=E7=A7=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a90b49a6a1d7a668328d5d80b13e182f92595995. --- package.json | 1 - plugins/iyuuautoseed/__init__.py | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 82cbc86..d0c051a 100644 --- a/package.json +++ b/package.json @@ -288,7 +288,6 @@ "author": "jxxghp", "level": 2, "history": { - "v1.9.5": "修复跳过检验后不会检查种子完整度直接做种", "v1.9.4": "修复qbittorrent 添加种子并跳过检验后会标记为完成不会自动做种", "v1.9.3": "修复Monika因缺少rsskey，种子下载失败的问题", "v1.9.2": "适配馒头使用API下载种子", diff --git a/plugins/iyuuautoseed/__init__.py b/plugins/iyuuautoseed/__init__.py index 128fad6..e0551a0 100644 --- a/plugins/iyuuautoseed/__init__.py +++ b/plugins/iyuuautoseed/__init__.py @@ -957,12 +957,9 @@ class IYUUAutoSeed(_PluginBase): if self._skipverify: # 跳过校验 logger.info(f"{download_id} 跳过校验，请自行检查...") - # qbittorrent 添加种子并跳过检验后会标记为完成不会自动做种 - # 加入校验种子列表，但是跳过校验 + # qbittorrent 添加种子并跳过检验后会标记为完成不会自动做种，需要手动开始 if downloader == "qbittorrent": - if not self._recheck_torrents.get(downloader): - self._recheck_torrents[downloader] = [] - self._recheck_torrents[downloader].append(download_id) + downloader_obj.start_torrents(ids=[download_id]) else: # 追加校验任务 logger.info(f"添加校验检查任务：{download_id} ...") From fbd2844f9bbf6eabb29df3662c75beb808e87a28 Mon Sep 17 00:00:00 2001 From: Alex Liu Date: Tue, 27 Aug 2024 10:58:05 +0800 Subject: [PATCH 2/5] Revert "Update Correct words" This reverts commit bfae36dce8889c0ad0be26ef33a94f8a79e87b13. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d0c051a..a32c29b 100644 --- a/package.json +++ b/package.json @@ -288,7 +288,7 @@ "author": "jxxghp", "level": 2, "history": { - "v1.9.4": "修复qbittorrent 添加种子并跳过检验后会标记为完成不会自动做种", + "v1.9.4": "修复qBittorrent辅种后不会自动开始做种", "v1.9.3": "修复Monika因缺少rsskey，种子下载失败的问题", "v1.9.2": "适配馒头使用API下载种子", "v1.9.1": "支持自定义辅种的种子分类", From 9b2eec8ca909626f7a9fdf2d27889ed9a5300bc2 Mon Sep 17 00:00:00 2001 From: Alex Liu Date: Tue, 27 Aug 2024 10:58:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E9=99=90=E5=88=B6=E4=B8=BA=E8=B7=B3=E8=BF=87=E6=A3=80?= =?UTF-8?q?=E9=AA=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7fef1f007a65ecf3cd84a8773d3e12f60f07d0e1. --- plugins/iyuuautoseed/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/iyuuautoseed/__init__.py b/plugins/iyuuautoseed/__init__.py index e0551a0..43682cf 100644 --- a/plugins/iyuuautoseed/__init__.py +++ b/plugins/iyuuautoseed/__init__.py @@ -957,9 +957,6 @@ class IYUUAutoSeed(_PluginBase): if self._skipverify: # 跳过校验 logger.info(f"{download_id} 跳过校验，请自行检查...") - # qbittorrent 添加种子并跳过检验后会标记为完成不会自动做种，需要手动开始 - if downloader == "qbittorrent": - downloader_obj.start_torrents(ids=[download_id]) else: # 追加校验任务 logger.info(f"添加校验检查任务：{download_id} ...") @@ -970,7 +967,9 @@ class IYUUAutoSeed(_PluginBase): if downloader == "qbittorrent": # 开始校验种子 downloader_obj.recheck_torrents(ids=[download_id]) - + # qbittorrent 添加种子后会标记为完成不会自动做种，需要手动开始 + if downloader == "qbittorrent": + downloader_obj.start_torrents(ids=[download_id]) # 下载成功 logger.info(f"成功添加辅种下载，站点：{site_info.get('name')}，种子链接：{torrent_url}") # 成功也加入缓存，有一些改了路径校验不通过的，手动删除后，下一次又会辅上 From 5dbafa0fe842a0f23ba29f45af227cc89ae81831 Mon Sep 17 00:00:00 2001 From: Alex Liu Date: Tue, 27 Aug 2024 10:58:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"Fix=20iyuu=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=81=9A=E7=A7=8D?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 31d0f4c3b67336b871c4a4596ebfc6bf84a89478. --- package.json | 3 +-- plugins/iyuuautoseed/__init__.py | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a32c29b..8f3cc0f 100644 --- a/package.json +++ b/package.json @@ -283,12 +283,11 @@ "name": "IYUU自动辅种", "description": "基于IYUU官方Api实现自动辅种。", "labels": "做种,IYUU", - "version": "1.9.4", + "version": "1.9.3", "icon": "IYUU.png", "author": "jxxghp", "level": 2, "history": { - "v1.9.4": "修复qBittorrent辅种后不会自动开始做种", "v1.9.3": "修复Monika因缺少rsskey，种子下载失败的问题", "v1.9.2": "适配馒头使用API下载种子", "v1.9.1": "支持自定义辅种的种子分类", diff --git a/plugins/iyuuautoseed/__init__.py b/plugins/iyuuautoseed/__init__.py index 43682cf..187a8c2 100644 --- a/plugins/iyuuautoseed/__init__.py +++ b/plugins/iyuuautoseed/__init__.py @@ -34,7 +34,7 @@ class IYUUAutoSeed(_PluginBase): # 插件图标 plugin_icon = "IYUU.png" # 插件版本 - plugin_version = "1.9.4" + plugin_version = "1.9.3" # 插件作者 plugin_author = "jxxghp" # 作者主页 @@ -967,9 +967,6 @@ class IYUUAutoSeed(_PluginBase): if downloader == "qbittorrent": # 开始校验种子 downloader_obj.recheck_torrents(ids=[download_id]) - # qbittorrent 添加种子后会标记为完成不会自动做种，需要手动开始 - if downloader == "qbittorrent": - downloader_obj.start_torrents(ids=[download_id]) # 下载成功 logger.info(f"成功添加辅种下载，站点：{site_info.get('name')}，种子链接：{torrent_url}") # 成功也加入缓存，有一些改了路径校验不通过的，手动删除后，下一次又会辅上 From 66b0fd3823ab73030dd8aaead23610a78d3ec77d Mon Sep 17 00:00:00 2001 From: Alex Liu Date: Tue, 27 Aug 2024 11:03:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(iyuuautoseed):=20Revert=20qBittorrent?= =?UTF-8?q?=20=E8=B7=B3=E6=A3=80=E4=B9=8B=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +++- plugins/iyuuautoseed/__init__.py | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8f3cc0f..e719740 100644 --- a/package.json +++ b/package.json @@ -283,11 +283,13 @@ "name": "IYUU自动辅种", "description": "基于IYUU官方Api实现自动辅种。", "labels": "做种,IYUU", - "version": "1.9.3", + "version": "1.9.5", "icon": "IYUU.png", "author": "jxxghp", "level": 2, "history": { + "v1.9.5": "Revert qBittorrent跳检之后自动开始", + "v1.9.4": "修复qBittorrent辅种后不会自动开始做种", "v1.9.3": "修复Monika因缺少rsskey，种子下载失败的问题", "v1.9.2": "适配馒头使用API下载种子", "v1.9.1": "支持自定义辅种的种子分类", diff --git a/plugins/iyuuautoseed/__init__.py b/plugins/iyuuautoseed/__init__.py index 187a8c2..64e4f2f 100644 --- a/plugins/iyuuautoseed/__init__.py +++ b/plugins/iyuuautoseed/__init__.py @@ -34,7 +34,7 @@ class IYUUAutoSeed(_PluginBase): # 插件图标 plugin_icon = "IYUU.png" # 插件版本 - plugin_version = "1.9.3" + plugin_version = "1.9.5" # 插件作者 plugin_author = "jxxghp" # 作者主页 @@ -957,6 +957,10 @@ class IYUUAutoSeed(_PluginBase): if self._skipverify: # 跳过校验 logger.info(f"{download_id} 跳过校验，请自行检查...") + # 请注意这里是故意不自动开始的 + # 跳过校验存在直接失败、种子目录相同文件不同等异常情况 + # 必须要用户自行二次确认之后才能开始做种 + # 否则会出现反复下载刷掉分享率、做假种的情况 else: # 追加校验任务 logger.info(f"添加校验检查任务：{download_id} ...")