From 517a16f0a3633462dad69cb5c4faa0c93a0e3fb1 Mon Sep 17 00:00:00 2001 From: cikezhu <604054726@qq.com> Date: Fri, 5 Dec 2025 16:13:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E8=87=AA=E5=8A=A8=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=9C=AA=E4=BD=BF=E7=94=A8=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.v2.json | 3 +- plugins.v2/downloadsitetag/__init__.py | 96 +++++++++++++++++--------- 2 files changed, 64 insertions(+), 35 deletions(-) diff --git a/package.v2.json b/package.v2.json index bfa4515..082014c 100644 --- a/package.v2.json +++ b/package.v2.json @@ -62,11 +62,12 @@ "name": "下载任务分类与标签", "description": "自动给下载任务分类与打站点标签、剧集名称标签", "labels": "下载管理", - "version": "2.4", + "version": "2.5", "icon": "Youtube-dl_B.png", "author": "叮叮当", "level": 1, "history": { + "v2.5": "优化采用公共服务自动清理未使用标签", "v2.4": "增加自动清理未使用标签", "v2.3": "增加tracker映射配置", "v2.2": "MoviePilot V2 版本下载任务分类与标签插件" diff --git a/plugins.v2/downloadsitetag/__init__.py b/plugins.v2/downloadsitetag/__init__.py index 3eb66cf..54ccfad 100644 --- a/plugins.v2/downloadsitetag/__init__.py +++ b/plugins.v2/downloadsitetag/__init__.py @@ -28,7 +28,7 @@ class DownloadSiteTag(_PluginBase): # 插件图标 plugin_icon = "Youtube-dl_B.png" # 插件版本 - plugin_version = "2.4" + plugin_version = "2.5" # 插件作者 plugin_author = "叮叮当" # 作者主页 @@ -72,8 +72,11 @@ class DownloadSiteTag(_PluginBase): ]) _tracker_mappings_str = "" _tracker_mappings = {} + _del_tags_task_rid = {} def init_plugin(self, config: dict = None): + # 初始化删除标签任务RID映射 + self._del_tags_task_rid = {} # 初始化默认的tracker映射 self._tracker_mappings = self._parse_tracker_mappings(self._tracker_mappings_default) # 读取配置 @@ -173,7 +176,20 @@ class DownloadSiteTag(_PluginBase): "kwargs": {} # 定时器参数 }] """ + # 初始化公共服务列表 + tasks = [] if self._enabled: + if self._enabled_del_tags: + # 添加 删除所有未被任何种子使用的标签 任务 每天凌晨4点执行 + tasks.append({ + "id": "DeleteUnusedTags", + "name": "删除下载器中未被使用的标签", + "trigger": "interval", + "func": self._del_unused_tags, + "kwargs": { + "minutes": 5 + } + }) if self._interval == "计划任务" or self._interval == "固定间隔": if self._interval == "固定间隔": if self._interval_unit == "小时": @@ -190,7 +206,7 @@ class DownloadSiteTag(_PluginBase): if self._interval_time < 5: self._interval_time = 5 logger.info(f"{self.LOG_TAG}启动定时服务: 最小不少于5分钟, 防止执行间隔太短任务冲突") - return [{ + tasks.append({ "id": "DownloadSiteTag", "name": "补全下载历史的标签与分类", "trigger": "interval", @@ -198,16 +214,16 @@ class DownloadSiteTag(_PluginBase): "kwargs": { "minutes": self._interval_time } - }] + }) else: - return [{ + tasks.append({ "id": "DownloadSiteTag", "name": "补全下载历史的标签与分类", "trigger": CronTrigger.from_crontab(self._interval_cron), "func": self._complemented_history, "kwargs": {} - }] - return [] + }) + return tasks @staticmethod def str_to_number(s: str, i: int) -> int: @@ -560,9 +576,48 @@ class DownloadSiteTag(_PluginBase): logger.warn( f"{self.LOG_TAG}下载器: {service.name} 种子id: {_hash} {(' 标签: ' + ','.join(_tags)) if _tags else ''} {(' 分类: ' + _cat) if _cat else ''}") + def _del_unused_tags(self): + """ + 删除所有未被任何种子使用的标签，遍历全部下载器 + """ + if not self.service_infos: + return + for service in self.service_infos.values(): + try: + # 仅qb支持删除未使用标签 + if service.type != "qbittorrent": + continue + downloader = service.name + downloader_obj = service.instance + if not downloader_obj: + logger.error(f"{self.LOG_TAG} 删除未使用标签公共服务，获取下载器失败 {downloader}") + continue + # 初始化下载器 获取全量数据 + if downloader not in self._del_tags_task_rid: + data = downloader_obj.qbc.sync_maindata(rid=0) + logger.info(f"{self.LOG_TAG}初始化删除未使用标签任务 RID for {downloader} full_update: {data.get('full_update', False)}") + self._del_tags_task_rid[downloader] = data.get("rid", 0) + else: + # 提取上次返回的 rid + last_rid = self._del_tags_task_rid[downloader] + data = downloader_obj.qbc.sync_maindata(rid=last_rid) + # 更新 rid 用于下次访问 + self._del_tags_task_rid[downloader] = data.get("rid", last_rid) + # 可能服务器重启，或其他原因导致 rid 状态已被重置 + if data.get("full_update", False): + logger.info(f"{self.LOG_TAG}重置删除未使用标签任务 RID for {downloader} full_update: {data.get('full_update', False)}") + continue + if data.get('torrents_removed', []): + logger.info(f"{self.LOG_TAG}删除未使用标签任务 RID for {downloader} 发现删除种子，即将执行清理未使用标签操作！") + # 指定下载器服务，执行删除未使用标签 + self._del_unused_tags(service=service) + except Exception as e: + logger.error( + f"{self.LOG_TAG}删除未使用标签公共服务，下载器：{downloader} 发生了错误: {str(e)}") + def _del_unused_tags(self, service: ServiceInfo, torrents: Any = None): """ - 删除所有未被任何种子使用的标签 + 删除所有未被任何种子使用的标签, 可指定下载器与种子列表 """ # 只有qb下载器才需要删除未使用的标签，TR下载器未使用标签会自动移除 if not service or not service.instance or service.type != "qbittorrent": @@ -647,33 +702,6 @@ class DownloadSiteTag(_PluginBase): except Exception as e: logger.error( f"{self.LOG_TAG}分析添加下载事件时发生了错误: {str(e)}") - - @eventmanager.register(EventType.DownloadDeleted) - def download_deleted(self, event: Event): - """ - 删除下载事件 - """ - if not self.get_state() or not self._enabled_del_tags: - return - - if not event.event_data: - return - try: - downloader = event.event_data.get("downloader") - if not downloader: - logger.info("触发删除下载事件，但没有获取到下载器信息，跳过后续处理") - return - - service = self.service_infos.get(downloader) - if not service: - logger.info(f"触发删除下载事件，但没有监听下载器 {downloader}，跳过后续处理") - return - - # 执行通用方法, 删除所有未被任何种子使用的标签 - self._del_unused_tags(service=service) - except Exception as e: - logger.error( - f"{self.LOG_TAG}分析删除下载事件时发生了错误: {str(e)}") def get_form(self) -> Tuple[List[dict], Dict[str, Any]]: """ From b65c1b8bf7d5bf286dda052c04b56e59df85aaa5 Mon Sep 17 00:00:00 2001 From: cikezhu <604054726@qq.com> Date: Fri, 5 Dec 2025 16:18:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E5=88=9D=E5=A7=8B=E5=8C=96rid=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins.v2/downloadsitetag/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins.v2/downloadsitetag/__init__.py b/plugins.v2/downloadsitetag/__init__.py index 54ccfad..12daf3f 100644 --- a/plugins.v2/downloadsitetag/__init__.py +++ b/plugins.v2/downloadsitetag/__init__.py @@ -75,7 +75,7 @@ class DownloadSiteTag(_PluginBase): _del_tags_task_rid = {} def init_plugin(self, config: dict = None): - # 初始化删除标签任务RID映射 + # 初始化删除标签任务rid映射 self._del_tags_task_rid = {} # 初始化默认的tracker映射 self._tracker_mappings = self._parse_tracker_mappings(self._tracker_mappings_default) @@ -106,6 +106,10 @@ class DownloadSiteTag(_PluginBase): user_mappings = self._parse_tracker_mappings(self._tracker_mappings_str) # 将用户映射合并到默认映射中，用户映射会覆盖默认映射中相同的key self._tracker_mappings.update(user_mappings) + + # 首次运行时，从下载器初始化rid映射 + if self._enabled_del_tags: + self._del_unused_tags() # 停止现有任务 self.stop_service() From 99d1bfe37ef428666e2fd5a7c1340fbc84bc36e7 Mon Sep 17 00:00:00 2001 From: cikezhu <604054726@qq.com> Date: Fri, 5 Dec 2025 16:24:15 +0800 Subject: [PATCH 3/4] fix --- plugins.v2/downloadsitetag/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins.v2/downloadsitetag/__init__.py b/plugins.v2/downloadsitetag/__init__.py index 12daf3f..82b6fab 100644 --- a/plugins.v2/downloadsitetag/__init__.py +++ b/plugins.v2/downloadsitetag/__init__.py @@ -109,7 +109,7 @@ class DownloadSiteTag(_PluginBase): # 首次运行时，从下载器初始化rid映射 if self._enabled_del_tags: - self._del_unused_tags() + self._task_del_unused_tags() # 停止现有任务 self.stop_service() @@ -189,7 +189,7 @@ class DownloadSiteTag(_PluginBase): "id": "DeleteUnusedTags", "name": "删除下载器中未被使用的标签", "trigger": "interval", - "func": self._del_unused_tags, + "func": self._task_del_unused_tags, "kwargs": { "minutes": 5 } @@ -580,9 +580,9 @@ class DownloadSiteTag(_PluginBase): logger.warn( f"{self.LOG_TAG}下载器: {service.name} 种子id: {_hash} {(' 标签: ' + ','.join(_tags)) if _tags else ''} {(' 分类: ' + _cat) if _cat else ''}") - def _del_unused_tags(self): + def _task_del_unused_tags(self): """ - 删除所有未被任何种子使用的标签，遍历全部下载器 + 公共服务：删除所有未被任何种子使用的标签，遍历全部下载器 """ if not self.service_infos: return From 7871dfd0b8bdac45ffd1510df15f83714aec42e9 Mon Sep 17 00:00:00 2001 From: cikezhu <604054726@qq.com> Date: Fri, 5 Dec 2025 17:01:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20gemini-code-assist=20suggestion?= =?UTF-8?q?=E2=80=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins.v2/downloadsitetag/__init__.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins.v2/downloadsitetag/__init__.py b/plugins.v2/downloadsitetag/__init__.py index 82b6fab..e27c1bb 100644 --- a/plugins.v2/downloadsitetag/__init__.py +++ b/plugins.v2/downloadsitetag/__init__.py @@ -184,7 +184,7 @@ class DownloadSiteTag(_PluginBase): tasks = [] if self._enabled: if self._enabled_del_tags: - # 添加 删除所有未被任何种子使用的标签 任务 每天凌晨4点执行 + # 添加 删除所有未被任何种子使用的标签 任务 每5分钟执行一次 tasks.append({ "id": "DeleteUnusedTags", "name": "删除下载器中未被使用的标签", @@ -587,15 +587,15 @@ class DownloadSiteTag(_PluginBase): if not self.service_infos: return for service in self.service_infos.values(): + # 仅qb支持删除未使用标签 + if service.type != "qbittorrent": + continue + downloader = service.name + downloader_obj = service.instance + if not downloader_obj: + logger.error(f"{self.LOG_TAG} 删除未使用标签公共服务，获取下载器失败 {downloader}") + continue try: - # 仅qb支持删除未使用标签 - if service.type != "qbittorrent": - continue - downloader = service.name - downloader_obj = service.instance - if not downloader_obj: - logger.error(f"{self.LOG_TAG} 删除未使用标签公共服务，获取下载器失败 {downloader}") - continue # 初始化下载器 获取全量数据 if downloader not in self._del_tags_task_rid: data = downloader_obj.qbc.sync_maindata(rid=0)