From c4b9221ffd2aed7f380c2414408c676e46fdc27a Mon Sep 17 00:00:00 2001 From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com> Date: Sun, 28 Jul 2024 05:09:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(brushflow):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E3=80=8C=E5=88=A0=E7=A7=8D=E6=8E=92=E9=99=A4MoviePilot?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=8D=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/brushflow/__init__.py | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/plugins/brushflow/__init__.py b/plugins/brushflow/__init__.py index bdc0b9a..e61c052 100644 --- a/plugins/brushflow/__init__.py +++ b/plugins/brushflow/__init__.py @@ -67,7 +67,6 @@ class BrushConfig: self.save_path = config.get("save_path") self.clear_task = config.get("clear_task", False) self.archive_task = config.get("archive_task", False) - self.except_tags = config.get("except_tags", True) self.delete_except_tags = config.get("delete_except_tags") self.except_subscribe = config.get("except_subscribe", True) self.brush_sequential = config.get("brush_sequential", False) @@ -1485,8 +1484,8 @@ class BrushFlow(_PluginBase): { 'component': 'VSwitch', 'props': { - 'model': 'except_tags', - 'label': '删种排除MoviePilot任务', + 'model': 'except_subscribe', + 'label': '排除订阅（实验性功能）', } } ] @@ -1501,8 +1500,8 @@ class BrushFlow(_PluginBase): { 'component': 'VSwitch', 'props': { - 'model': 'except_subscribe', - 'label': '排除订阅（实验性功能）', + 'model': 'qb_first_last_piece', + 'label': '优先下载首尾文件块', } } ] @@ -1649,22 +1648,6 @@ class BrushFlow(_PluginBase): } } ] - }, - { - 'component': 'VCol', - 'props': { - 'cols': 12, - 'md': 4 - }, - 'content': [ - { - 'component': 'VSwitch', - 'props': { - 'model': 'qb_first_last_piece', - 'label': '优先下载首尾文件块', - } - } - ] } ] } @@ -1837,7 +1820,6 @@ class BrushFlow(_PluginBase): "onlyonce": False, "clear_task": False, "archive_task": False, - "except_tags": True, "delete_except_tags": f"{settings.TORRENT_TAG},H&R" if settings.TORRENT_TAG else "H&R", "except_subscribe": True, "brush_sequential": False, @@ -2369,9 +2351,6 @@ class BrushFlow(_PluginBase): logger.info(f"当前刷流任务共 {len(check_torrents)} 个有效种子，正在准备按设定的种子标签进行排除") # 初始化一个空的列表来存储需要排除的标签 tags_to_exclude = set() - # 如果 except_tags 配置为 True，将 settings.TORRENT_TAG 添加到排除列表中（前提是它不为空且不是纯空白） - if brush_config.except_tags and settings.TORRENT_TAG.strip(): - tags_to_exclude.add(settings.TORRENT_TAG.strip()) # 如果 delete_except_tags 非空且不是纯空白，则添加到排除列表中 if brush_config.delete_except_tags and brush_config.delete_except_tags.strip(): tags_to_exclude.update(tag.strip() for tag in brush_config.delete_except_tags.split(',')) @@ -3042,7 +3021,6 @@ class BrushFlow(_PluginBase): "save_path": brush_config.save_path, "clear_task": brush_config.clear_task, "archive_task": brush_config.archive_task, - "except_tags": brush_config.except_tags, "delete_except_tags": brush_config.delete_except_tags, "except_subscribe": brush_config.except_subscribe, "brush_sequential": brush_config.brush_sequential, From 42336827ecf178568d5a9eb262fc9e6ce461f15c Mon Sep 17 00:00:00 2001 From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com> Date: Sun, 28 Jul 2024 05:10:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(brushflow):=20event=5Fdata=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=A7=8D=E5=AD=90hash=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/brushflow/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/brushflow/__init__.py b/plugins/brushflow/__init__.py index e61c052..6b37e10 100644 --- a/plugins/brushflow/__init__.py +++ b/plugins/brushflow/__init__.py @@ -2105,6 +2105,7 @@ class BrushFlow(_PluginBase): self.eventmanager.send_event(etype=EventType.PluginAction, data={ "action": "brushflow_download_added", + "hash": hash_string, "data": torrent_task }) torrent_tasks[hash_string] = torrent_task From 493375ecbb1c1daffc759caf87bd2c461d461dde Mon Sep 17 00:00:00 2001 From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com> Date: Sun, 28 Jul 2024 05:11:28 +0800 Subject: [PATCH 3/3] fix BrushFlow v3.5 --- package.json | 5 +++-- plugins/brushflow/__init__.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a76e7c3..548c3c9 100644 --- a/package.json +++ b/package.json @@ -355,12 +355,13 @@ "name": "站点刷流", "description": "自动托管刷流，将会提高对应站点的访问频率。", "labels": "刷流,仪表板", - "version": "3.4", + "version": "3.5", "icon": "brush.jpg", "author": "jxxghp,InfinityPacer", "level": 2, "history": { - "v3.4": "移除「记录更多日志」配置项并调整为DEBUG日志，支持「删除排除标签」配置项，增加刷流任务时支持触发插件事件", + "v3.5": "移除「删种排除MoviePilot任务」配置项（请使用「删除排除标签」替代），完善刷流任务触发插件事件相关逻辑（联动H&R助手）", + "v3.4": "移除「记录更多日志」配置项并调整为DEBUG日志，支持「删除排除标签」配置项，增加刷流任务时支持触发插件事件（联动H&R助手）", "v3.3": "支持QB删除种子时强制汇报Tracker，站点独立配置增加「站点全局H&R」配置项", "v3.2": "支持推送QB种子时启用「先下载首尾文件块」选项", "v3.1": "支持仪表板显示站点刷流数据，需要主程序升级v1.8.7+版本", diff --git a/plugins/brushflow/__init__.py b/plugins/brushflow/__init__.py index 6b37e10..b9025a1 100644 --- a/plugins/brushflow/__init__.py +++ b/plugins/brushflow/__init__.py @@ -257,7 +257,7 @@ class BrushFlow(_PluginBase): # 插件图标 plugin_icon = "brush.jpg" # 插件版本 - plugin_version = "3.4" + plugin_version = "3.5" # 插件作者 plugin_author = "jxxghp,InfinityPacer" # 作者主页