codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1967 from thsrite/main

Browse Source 
fix 当前版本、重启检查前端版本
This commit is contained in:
jxxghp 2024-04-26 17:05:12 +08:00 committed by GitHub
commit 0840e0bcbc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/chain/system.py
View File

@ -45,13 +45,18 @@ class SystemChain(ChainBase, metaclass=Singleton):
""" """
查看当前版本、远程版本 查看当前版本、远程版本
""" """
release_version = self.__get_release_version() server_release_version = self.__get_server_release_version()
local_version = self.get_local_version() front_release_version = self.__get_front_release_version()
if release_version == local_version: server_local_version = self.get_server_local_version()
title = f"当前版本：{local_version}，已是最新版本" front_local_version = self.get_frontend_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,21 +77,27 @@ class SystemChain(ChainBase, metaclass=Singleton):
userid = restart_channel.get('userid') userid = restart_channel.get('userid')
# 版本号 # 版本号
release_version = self.__get_release_version() server_release_version = self.__get_server_release_version()
local_version = self.get_local_version() front_release_version = self.__get_front_release_version()
if release_version == local_version: server_local_version = self.get_server_local_version()
title = f"当前版本：{local_version}" front_local_version = self.get_frontend_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)
@staticmethod @staticmethod
def __get_release_version(): def __get_server_release_version():
""" """
获取最新版本 获取后端最新版本
""" """
version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res( 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")
@ -98,7 +109,21 @@ class SystemChain(ChainBase, metaclass=Singleton):
return None return None
@staticmethod @staticmethod
def get_local_version(): def __get_front_release_version():
"""
获取前端最新版本
"""
version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res(
"https://api.github.com/repos/jxxghp/MoviePilot-Frontend/releases/latest")
if version_res:
ver_json = version_res.json()
version = f"{ver_json['tag_name']}"
return version
else:
return None
@staticmethod
def get_server_local_version():
""" """
查看当前版本 查看当前版本
""" """