From 0dcc18c6501d4f5c1a8fcff4c8b24a2e22177c60 Mon Sep 17 00:00:00 2001 From: thsrite Date: Fri, 22 Nov 2024 16:40:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8DV2=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.v2.json | 4 +-- plugins.v2/moviepilotupdatenotify/__init__.py | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.v2.json b/package.v2.json index f5d0b94..889bcf3 100644 --- a/package.v2.json +++ b/package.v2.json @@ -482,12 +482,12 @@ "name": "MoviePilot更新推送", "description": "MoviePilot推送release更新通知、自动重启。", "labels": "消息通知,自动更新", - "version": "1.5", + "version": "1.6", "icon": "Moviepilot_A.png", "author": "thsrite", "level": 1, "history": { - "v1.5": "修复V2最新版本号获取", + "v1.6": "修复V2最新版本号获取", "v1.4": "兼容更新内容带版本号的情况", "v1.3": "增加前端版本更新检查，需要主程序升级至v1.8.4+版本" } diff --git a/plugins.v2/moviepilotupdatenotify/__init__.py b/plugins.v2/moviepilotupdatenotify/__init__.py index a92f26f..c6f7df2 100644 --- a/plugins.v2/moviepilotupdatenotify/__init__.py +++ b/plugins.v2/moviepilotupdatenotify/__init__.py @@ -23,7 +23,7 @@ class MoviePilotUpdateNotify(_PluginBase): # 插件图标 plugin_icon = "Moviepilot_A.png" # 插件版本 - plugin_version = "1.5" + plugin_version = "1.6" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -152,8 +152,7 @@ class MoviePilotUpdateNotify(_PluginBase): headers=settings.GITHUB_HEADERS ).get_res("https://api.github.com/repos/jxxghp/MoviePilot/releases") if version_res: - ver_json = version_res.json() - releases = [release['tag_name'] for release in ver_json] + releases = [release['tag_name'] for release in version_res.json()] v2_releases = [tag for tag in releases if re.match(r"^v2\.", tag)] if not v2_releases: logger.warn("获取v2后端最新版本版本出错！") @@ -162,11 +161,12 @@ class MoviePilotUpdateNotify(_PluginBase): # 找到最新的v2版本 latest_v2 = sorted(v2_releases, key=lambda s: list(map(int, re.findall(r'\d+', s))))[-1] logger.info(f"获取到后端最新版本：{latest_v2}") - description = f"{ver_json['body']}" - update_time = f"{ver_json['published_at']}" - return latest_v2, description, update_time - else: - return None, None, None + for release in version_res.json(): + if release['tag_name'] == latest_v2: + description = f"{release['body']}" + update_time = f"{release['published_at']}" + return latest_v2, description, update_time + return None, None, None @staticmethod def __get_front_release_version(): @@ -178,8 +178,7 @@ class MoviePilotUpdateNotify(_PluginBase): headers=settings.GITHUB_HEADERS ).get_res("https://api.github.com/repos/jxxghp/MoviePilot-Frontend/releases") if version_res: - ver_json = version_res.json() - releases = [release['tag_name'] for release in ver_json] + releases = [release['tag_name'] for release in version_res.json()] v2_releases = [tag for tag in releases if re.match(r"^v2\.", tag)] if not v2_releases: logger.warn("获取v2前端最新版本版本出错！") @@ -188,11 +187,12 @@ class MoviePilotUpdateNotify(_PluginBase): # 找到最新的v2版本 latest_v2 = sorted(v2_releases, key=lambda s: list(map(int, re.findall(r'\d+', s))))[-1] logger.info(f"获取到前端最新版本：{latest_v2}") - description = f"{ver_json['body']}" - update_time = f"{ver_json['published_at']}" - return latest_v2, description, update_time - else: - return None, None, None + for release in version_res.json(): + if release['tag_name'] == latest_v2: + description = f"{release['body']}" + update_time = f"{release['published_at']}" + return latest_v2, description, update_time + return None, None, None def get_state(self) -> bool: return self._enabled