From 5f32c974a5e2deff6c35b4c577cee2202b805088 Mon Sep 17 00:00:00 2001 From: InfinityPacer Date: Sun, 19 Jul 2026 18:21:47 +0800 Subject: [PATCH] fix(subscribeassistantenhanced): preserve conversion facts --- package.v2.json | 3 ++- plugins.v2/subscribeassistantenhanced/README.md | 1 + plugins.v2/subscribeassistantenhanced/__init__.py | 2 +- .../subscribeassistantenhanced/best_version/converter.py | 3 +-- tests/v2/subscribeassistantenhanced/test_converter.py | 7 +++++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package.v2.json b/package.v2.json index 3ab08227..4530e4c3 100644 --- a/package.v2.json +++ b/package.v2.json @@ -3,12 +3,13 @@ "name": "订阅助手（增强版）", "description": "多场景管理订阅，实现订阅全生命周期管理。", "labels": "订阅", - "version": "0.6.6", + "version": "0.6.7", "icon": "https://raw.githubusercontent.com/InfinityPacer/MoviePilot-Plugins/main/icons/subscribeassistantenhanced.png", "author": "InfinityPacer", "level": 1, "system_version": ">2.14.1", "history": { + "v0.6.7": "分集洗版转为全集洗版时保留已下载剧集、当前优先级和分集优先级，避免转换后订阅进度重置。", "v0.6.6": "修正洗版订阅继承手动总集数的问题，补充分集转全集完成快照，并仅在已有订阅覆盖最新 TMDB 集数时完成自动纠错。", "v0.6.5": "优化插件品牌图标与配置页视觉效果，提升界面一致性与操作辨识度。", "v0.6.4": "修正新增订阅时集数刷新事件可能中断插件处理的问题。", diff --git a/plugins.v2/subscribeassistantenhanced/README.md b/plugins.v2/subscribeassistantenhanced/README.md index d28ac8a7..92b0a26b 100644 --- a/plugins.v2/subscribeassistantenhanced/README.md +++ b/plugins.v2/subscribeassistantenhanced/README.md @@ -16,6 +16,7 @@ ## 版本更新日志 +- v0.6.7：分集洗版转为全集洗版时保留已下载剧集、当前优先级和分集优先级，避免转换后订阅进度重置。 - v0.6.6：修正洗版订阅继承手动总集数的问题，补充分集转全集完成快照，并仅在已有订阅覆盖最新 TMDB 集数时完成自动纠错。 - v0.6.5：优化插件品牌图标与配置页视觉效果，提升界面一致性与操作辨识度。 - v0.6.4：修正新增订阅时集数刷新事件可能中断插件处理的问题。 diff --git a/plugins.v2/subscribeassistantenhanced/__init__.py b/plugins.v2/subscribeassistantenhanced/__init__.py index 3dfde3c6..a90308a2 100644 --- a/plugins.v2/subscribeassistantenhanced/__init__.py +++ b/plugins.v2/subscribeassistantenhanced/__init__.py @@ -88,7 +88,7 @@ class SubscribeAssistantEnhanced(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/InfinityPacer/MoviePilot-Plugins/main/icons/subscribeassistantenhanced.png" # 插件版本 - plugin_version = "0.6.6" + plugin_version = "0.6.7" _site_cache_candidate_helper_warned = False # 插件作者 plugin_author = "InfinityPacer" diff --git a/plugins.v2/subscribeassistantenhanced/best_version/converter.py b/plugins.v2/subscribeassistantenhanced/best_version/converter.py index 2e535e5d..d44f40f7 100644 --- a/plugins.v2/subscribeassistantenhanced/best_version/converter.py +++ b/plugins.v2/subscribeassistantenhanced/best_version/converter.py @@ -6,8 +6,7 @@ DROP_REBUILT_FIELDS = { "id", "name", "year", "type", "tmdbid", "imdbid", "tvdbid", "doubanid", "bangumiid", - "poster", "backdrop", "vote", "description", "date", "last_update", "note", "current_priority", - "episode_priority", + "poster", "backdrop", "vote", "description", "date", "last_update", } diff --git a/tests/v2/subscribeassistantenhanced/test_converter.py b/tests/v2/subscribeassistantenhanced/test_converter.py index 3f5d8fc0..a6c64901 100644 --- a/tests/v2/subscribeassistantenhanced/test_converter.py +++ b/tests/v2/subscribeassistantenhanced/test_converter.py @@ -53,8 +53,9 @@ def test_success(self): username="user", state="R", current_priority=50, + episode_priority={"1": 100, "2": 50}, manual_total_episode=92, - note=[1], + note=[1, 2], ) media = _mediainfo() @@ -71,8 +72,10 @@ def test_success(self): assert add_payload["state"] == "N" assert add_payload["username"] == "订阅助手（增强版）" assert add_payload["manual_total_episode"] == 0 + assert add_payload["note"] == [1, 2] + assert add_payload["current_priority"] == 50 + assert add_payload["episode_priority"] == {"1": 100, "2": 50} assert "id" not in add_payload - assert "current_priority" not in add_payload snapshot.assert_called_once_with(subscribe=sub, mediainfo=media, scope=None) assert call_order == ["snapshot", "delete"] send_event.assert_called_once()