diff --git a/package.json b/package.json index c4c06a2..f514486 100644 --- a/package.json +++ b/package.json @@ -499,11 +499,12 @@ "name": "MoviePilot更新推送", "description": "MoviePilot推送release更新通知、自动重启。", "labels": "消息通知,自动更新", - "version": "1.5", + "version": "1.5.1", "icon": "Moviepilot_A.png", "author": "thsrite", "level": 1, "history": { + "v1.5.1": "修复版本号比较逻辑", "v1.5": "修复版本描述为空时的报错", "v1.4": "兼容更新内容带版本号的情况", "v1.3": "增加前端版本更新检查,需要主程序升级至v1.8.4+版本" diff --git a/package.v2.json b/package.v2.json index 776dfee..fa8fce9 100644 --- a/package.v2.json +++ b/package.v2.json @@ -385,11 +385,12 @@ "name": "MoviePilot更新推送", "description": "MoviePilot推送release更新通知、自动重启。", "labels": "消息通知,自动更新", - "version": "2.3", + "version": "2.3.1", "icon": "Moviepilot_A.png", "author": "thsrite", "level": 1, "history": { + "v2.3.1": "修复版本号比较逻辑", "v2.3": "修复版本描述为空时的报错", "v2.2": "支持 MoviePilot v2.5.0+", "v2.1": "优化执行周期输入,需要MoviePilot v2.2.1+", diff --git a/plugins.v2/moviepilotupdatenotify/__init__.py b/plugins.v2/moviepilotupdatenotify/__init__.py index 060c91a..d62b3c7 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 = "2.3" + plugin_version = "2.3.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -83,7 +83,7 @@ class MoviePilotUpdateNotify(_PluginBase): # 本地版本 local_version = SystemChain().get_server_local_version() - if local_version and release_version <= local_version: + if local_version and list(map(int, re.findall(r'\d+', release_version))) <= list(map(int, re.findall(r'\d+', local_version))): logger.info(f"当前后端版本:{local_version} 远程版本:{release_version} 停止运行") return False @@ -108,7 +108,7 @@ class MoviePilotUpdateNotify(_PluginBase): # 本地版本 local_version = SystemChain().get_frontend_version() - if local_version and release_version <= local_version: + if local_version and list(map(int, re.findall(r'\d+', release_version))) <= list(map(int, re.findall(r'\d+', local_version))): logger.info(f"当前前端版本:{local_version} 远程版本:{release_version} 停止运行") return False diff --git a/plugins/moviepilotupdatenotify/__init__.py b/plugins/moviepilotupdatenotify/__init__.py index 7aeefd4..fea99dd 100644 --- a/plugins/moviepilotupdatenotify/__init__.py +++ b/plugins/moviepilotupdatenotify/__init__.py @@ -1,4 +1,5 @@ import datetime +import re import pytz from apscheduler.schedulers.background import BackgroundScheduler @@ -22,7 +23,7 @@ class MoviePilotUpdateNotify(_PluginBase): # 插件图标 plugin_icon = "Moviepilot_A.png" # 插件版本 - plugin_version = "1.5" + plugin_version = "1.5.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -82,7 +83,7 @@ class MoviePilotUpdateNotify(_PluginBase): # 本地版本 local_version = SystemChain().get_server_local_version() - if local_version and release_version <= local_version: + if local_version and list(map(int, re.findall(r'\d+', release_version))) <= list(map(int, re.findall(r'\d+', local_version))): logger.info(f"当前后端版本:{local_version} 远程版本:{release_version} 停止运行") return False @@ -107,7 +108,7 @@ class MoviePilotUpdateNotify(_PluginBase): # 本地版本 local_version = SystemChain().get_frontend_version() - if local_version and release_version <= local_version: + if local_version and list(map(int, re.findall(r'\d+', release_version))) <= list(map(int, re.findall(r'\d+', local_version))): logger.info(f"当前前端版本:{local_version} 远程版本:{release_version} 停止运行") return False