diff --git a/package.json b/package.json index 3841555..b08f9b0 100644 --- a/package.json +++ b/package.json @@ -361,12 +361,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 bdc0b9a..b9025a1 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) @@ -258,7 +257,7 @@ class BrushFlow(_PluginBase): # 插件图标 plugin_icon = "brush.jpg" # 插件版本 - plugin_version = "3.4" + plugin_version = "3.5" # 插件作者 plugin_author = "jxxghp,InfinityPacer" # 作者主页 @@ -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, @@ -2123,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 @@ -2369,9 +2352,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 +3022,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,