fix 当前版本、重启检查前端版本

This commit is contained in:
thsrite 2024-04-26 16:54:25 +08:00
parent 967ad3a507
commit 242894cec2

View File

@ -45,13 +45,17 @@ class SystemChain(ChainBase, metaclass=Singleton):
""" """
查看当前版本远程版本 查看当前版本远程版本
""" """
release_version = self.__get_release_version() server_release_version, front_release_version = self.__get_release_version()
local_version = self.get_local_version() server_local_version = self.get_local_version()
if release_version == local_version: front_local_version = self.get_frontend_version()
title = f"当前版本:{local_version},已是最新版本" if server_release_version == server_local_version:
title = f"当前后端版本:{server_local_version},已是最新版本\n"
else: else:
title = f"当前版本:{local_version},远程版本:{release_version}" title = f"当前后端版本:{server_local_version},远程版本:{server_release_version}\n"
if front_release_version == front_local_version:
title += f"当前前端版本:{front_local_version},已是最新版本"
else:
title += f"当前前端版本:{front_local_version},远程版本:{front_release_version}"
self.post_message(Notification(channel=channel, self.post_message(Notification(channel=channel,
title=title, userid=userid)) title=title, userid=userid))
@ -72,14 +76,19 @@ class SystemChain(ChainBase, metaclass=Singleton):
userid = restart_channel.get('userid') userid = restart_channel.get('userid')
# 版本号 # 版本号
release_version = self.__get_release_version() server_release_version, front_release_version = self.__get_release_version()
local_version = self.get_local_version() server_local_version = self.get_local_version()
if release_version == local_version: front_local_version = self.get_frontend_version()
title = f"当前版本:{local_version}" if server_release_version == server_local_version:
title = f"当前后端版本:{server_local_version}\n"
else: else:
title = f"当前版本:{local_version},远程版本:{release_version}" title = f"当前后端版本:{server_local_version},远程版本:{server_release_version}\n"
if front_release_version == front_local_version:
title += f"当前前端版本:{front_local_version}"
else:
title += f"当前前端版本:{front_local_version},远程版本:{front_release_version}"
self.post_message(Notification(channel=channel, self.post_message(Notification(channel=channel,
title=f"系统已重启完成!{title}", title=f"系统已重启完成!\n{title}",
userid=userid)) userid=userid))
self.remove_cache(self._restart_file) self.remove_cache(self._restart_file)
@ -88,14 +97,21 @@ class SystemChain(ChainBase, metaclass=Singleton):
""" """
获取最新版本 获取最新版本
""" """
version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res( server_version = None
server_version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res(
"https://api.github.com/repos/jxxghp/MoviePilot/releases/latest") "https://api.github.com/repos/jxxghp/MoviePilot/releases/latest")
if version_res: if server_version_res:
ver_json = version_res.json() ver_json = server_version_res.json()
version = f"{ver_json['tag_name']}" server_version = f"{ver_json['tag_name']}"
return version
else: front_version = None
return None front_version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res(
"https://raw.githubusercontent.com/jxxghp/MoviePilot-Frontend/main/package.json")
if front_version_res:
ver_json = front_version_res.json()
front_version = f"v{ver_json['version']}"
return server_version, front_version
@staticmethod @staticmethod
def get_local_version(): def get_local_version():