From 242894cec24fc26e4357ed6988a0a8337e6fc911 Mon Sep 17 00:00:00 2001 From: thsrite Date: Fri, 26 Apr 2024 16:54:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=81=E9=87=8D=E5=90=AF=E6=A3=80=E6=9F=A5=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/system.py | 54 +++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/app/chain/system.py b/app/chain/system.py index c953f60d..a8c9a587 100644 --- a/app/chain/system.py +++ b/app/chain/system.py @@ -45,13 +45,17 @@ class SystemChain(ChainBase, metaclass=Singleton): """ 查看当前版本、远程版本 """ - release_version = self.__get_release_version() - local_version = self.get_local_version() - if release_version == local_version: - title = f"当前版本：{local_version}，已是最新版本" + server_release_version, front_release_version = self.__get_release_version() + server_local_version = self.get_local_version() + front_local_version = self.get_frontend_version() + if server_release_version == server_local_version: + title = f"当前后端版本：{server_local_version}，已是最新版本\n" 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, title=title, userid=userid)) @@ -72,14 +76,19 @@ class SystemChain(ChainBase, metaclass=Singleton): userid = restart_channel.get('userid') # 版本号 - release_version = self.__get_release_version() - local_version = self.get_local_version() - if release_version == local_version: - title = f"当前版本：{local_version}" + server_release_version, front_release_version = self.__get_release_version() + server_local_version = self.get_local_version() + front_local_version = self.get_frontend_version() + if server_release_version == server_local_version: + title = f"当前后端版本：{server_local_version}\n" 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, - title=f"系统已重启完成！{title}", + title=f"系统已重启完成！\n{title}", userid=userid)) 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") - if version_res: - ver_json = version_res.json() - version = f"{ver_json['tag_name']}" - return version - else: - return None + if server_version_res: + ver_json = server_version_res.json() + server_version = f"{ver_json['tag_name']}" + + front_version = 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 def get_local_version(): From 8028866ceebbe6f8c268b31281d29d759ecfbc19 Mon Sep 17 00:00:00 2001 From: thsrite Date: Fri, 26 Apr 2024 16:58:30 +0800 Subject: [PATCH 2/4] fix --- app/chain/system.py | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/app/chain/system.py b/app/chain/system.py index a8c9a587..cc2450ca 100644 --- a/app/chain/system.py +++ b/app/chain/system.py @@ -45,7 +45,8 @@ class SystemChain(ChainBase, metaclass=Singleton): """ 查看当前版本、远程版本 """ - server_release_version, front_release_version = self.__get_release_version() + server_release_version = self.__get_release_version() + front_release_version = self.__get_front_release_version() server_local_version = self.get_local_version() front_local_version = self.get_frontend_version() if server_release_version == server_local_version: @@ -76,7 +77,8 @@ class SystemChain(ChainBase, metaclass=Singleton): userid = restart_channel.get('userid') # 版本号 - server_release_version, front_release_version = self.__get_release_version() + server_release_version = self.__get_release_version() + front_release_version = self.__get_front_release_version() server_local_version = self.get_local_version() front_local_version = self.get_frontend_version() if server_release_version == server_local_version: @@ -95,23 +97,30 @@ class SystemChain(ChainBase, metaclass=Singleton): @staticmethod def __get_release_version(): """ - 获取最新版本 + 获取后端最新版本 """ - server_version = None - server_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") - if server_version_res: - ver_json = server_version_res.json() - server_version = f"{ver_json['tag_name']}" + if version_res: + ver_json = version_res.json() + version_res = f"{ver_json['tag_name']}" + return version_res + else: + return None - front_version = 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 + 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_res = f"{ver_json['tag_name']}" + return version_res + else: + return None @staticmethod def get_local_version(): From baddaabd73ab427eff4460ca875f91af8e38a6f7 Mon Sep 17 00:00:00 2001 From: thsrite Date: Fri, 26 Apr 2024 16:59:19 +0800 Subject: [PATCH 3/4] fix --- app/chain/system.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/chain/system.py b/app/chain/system.py index cc2450ca..c430f9c5 100644 --- a/app/chain/system.py +++ b/app/chain/system.py @@ -103,8 +103,8 @@ class SystemChain(ChainBase, metaclass=Singleton): "https://api.github.com/repos/jxxghp/MoviePilot/releases/latest") if version_res: ver_json = version_res.json() - version_res = f"{ver_json['tag_name']}" - return version_res + version = f"{ver_json['tag_name']}" + return version else: return None @@ -117,8 +117,8 @@ class SystemChain(ChainBase, metaclass=Singleton): "https://api.github.com/repos/jxxghp/MoviePilot-Frontend/releases/latest") if version_res: ver_json = version_res.json() - version_res = f"{ver_json['tag_name']}" - return version_res + version = f"{ver_json['tag_name']}" + return version else: return None From 933af7485c8c422efd879681b1026ad090a7377c Mon Sep 17 00:00:00 2001 From: thsrite Date: Fri, 26 Apr 2024 17:00:40 +0800 Subject: [PATCH 4/4] fix function name --- app/chain/system.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/chain/system.py b/app/chain/system.py index c430f9c5..34bd7f1a 100644 --- a/app/chain/system.py +++ b/app/chain/system.py @@ -45,9 +45,9 @@ class SystemChain(ChainBase, metaclass=Singleton): """ 查看当前版本、远程版本 """ - server_release_version = self.__get_release_version() + server_release_version = self.__get_server_release_version() front_release_version = self.__get_front_release_version() - server_local_version = self.get_local_version() + server_local_version = self.get_server_local_version() front_local_version = self.get_frontend_version() if server_release_version == server_local_version: title = f"当前后端版本：{server_local_version}，已是最新版本\n" @@ -77,9 +77,9 @@ class SystemChain(ChainBase, metaclass=Singleton): userid = restart_channel.get('userid') # 版本号 - server_release_version = self.__get_release_version() + server_release_version = self.__get_server_release_version() front_release_version = self.__get_front_release_version() - server_local_version = self.get_local_version() + server_local_version = self.get_server_local_version() front_local_version = self.get_frontend_version() if server_release_version == server_local_version: title = f"当前后端版本：{server_local_version}\n" @@ -95,7 +95,7 @@ class SystemChain(ChainBase, metaclass=Singleton): self.remove_cache(self._restart_file) @staticmethod - def __get_release_version(): + def __get_server_release_version(): """ 获取后端最新版本 """ @@ -123,7 +123,7 @@ class SystemChain(ChainBase, metaclass=Singleton): return None @staticmethod - def get_local_version(): + def get_server_local_version(): """ 查看当前版本 """