From b86e2c4032855b2326926d20f35e1d7fcdaf0089 Mon Sep 17 00:00:00 2001 From: Codex Date: Mon, 20 Jul 2026 23:44:07 +0800 Subject: [PATCH] fix: normalize MoviePilot media identifiers --- main.py | 2 +- media_service.py | 5 ++++- metadata.yaml | 2 +- tests/test_media_service.py | 3 ++- tests/test_plugin_metadata.py | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index 67198e1..409c82f 100644 --- a/main.py +++ b/main.py @@ -40,7 +40,7 @@ def _media_result_chain(results: list[dict[str, object]]) -> list[object]: "astrbot_plugin_moviepilot", "AstrBot MoviePilot Contributors", "在 AstrBot 中通过命令和 LLM 控制 MoviePilot。", - "0.12.0", + "0.13.0", ) class MoviePilotPlugin(star.Star): """MoviePilot integration entrypoint.""" diff --git a/media_service.py b/media_service.py index 8400984..122421b 100644 --- a/media_service.py +++ b/media_service.py @@ -104,10 +104,13 @@ class MediaService: @staticmethod def _media_id(media: Mapping[str, Any]) -> str: - for key in ("mediaid", "media_id", "id", "mediaId", "tmdb_id", "tmdbid"): + for key in ("mediaid", "media_id", "id", "mediaId"): value = media.get(key) if value: return str(value) + tmdb_id = media.get("tmdb_id") or media.get("tmdbid") or media.get("tmdbId") + if tmdb_id: + return f"tmdb:{tmdb_id}" return "" @staticmethod diff --git a/metadata.yaml b/metadata.yaml index 68313df..d135e69 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -2,7 +2,7 @@ name: astrbot_plugin_moviepilot display_name: MoviePilot 控制 description: 在 AstrBot 中通过命令和 LLM 控制 MoviePilot。 short_desc: 搜索影视、订阅、下载和接收 MoviePilot 通知。 -version: 0.12.0 +version: 0.13.0 author: AstrBot MoviePilot Contributors repo: https://github.com/jxxghp/MoviePilot astrbot_version: ">=4.16,<5" diff --git a/tests/test_media_service.py b/tests/test_media_service.py index def0b29..279d122 100644 --- a/tests/test_media_service.py +++ b/tests/test_media_service.py @@ -38,6 +38,7 @@ async def test_media_and_resource_results_are_cached(service) -> None: resources = await service.search_resources("session", media[0]) assert media[0]["id"] == "tmdb:1" + assert MediaService._media_id({"tmdb_id": 276161}) == "tmdb:276161" assert resources[0]["site"] == "site-a" assert service._session_store.get_resource_result("session", 1) == resources[0] @@ -76,4 +77,4 @@ def test_media_formatter_uses_moviepilot_metadata_fields() -> None: assert "上映年月:2026-06" in text assert "集数:12" in text assert "评分:9.5" in text - assert media_poster_url({"poster_path": "https://image.tmdb.org/p/t.jpg"}) \ No newline at end of file + assert media_poster_url({"poster_path": "https://image.tmdb.org/p/t.jpg"}) diff --git a/tests/test_plugin_metadata.py b/tests/test_plugin_metadata.py index 7668816..5c9578d 100644 --- a/tests/test_plugin_metadata.py +++ b/tests/test_plugin_metadata.py @@ -13,7 +13,7 @@ def test_metadata_contains_required_plugin_fields() -> None: ) assert metadata["name"] == "astrbot_plugin_moviepilot" - assert metadata["version"] == "0.12.0" + assert metadata["version"] == "0.13.0" assert metadata["astrbot_version"] == ">=4.16,<5" assert "aiocqhttp" in metadata["support_platforms"] assert "telegram" in metadata["support_platforms"]