From 7fbbc088aef4aad6c9636460cee8869e1aabd580 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 1 Dec 2024 17:54:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=87=AA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=8Cruff=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher.py | 61 ++++++++++++++------------------------- ui/src/pages/Settings.vue | 2 -- 2 files changed, 21 insertions(+), 42 deletions(-) diff --git a/launcher.py b/launcher.py index 845b934..8df7c24 100644 --- a/launcher.py +++ b/launcher.py @@ -1,6 +1,5 @@ import json import mimetypes -import platform import sys from pathlib import Path from shutil import rmtree @@ -27,6 +26,8 @@ config_path = Path("launcher.json") get_new_version_url = "https://git.zhaozuohong.vip/api/v1/repos/mower-ng/launcher/releases/latest" +upgrade_script_name = "upgrade.bat" + try: with config_path.open("r") as f: user_config = json.load(f) @@ -40,42 +41,23 @@ def custom_event(data): js = f"var event = new CustomEvent('log', {{detail: {data}}}); window.dispatchEvent(event);" window.evaluate_js(js) + def replace_restart(exename, new_exename): - script_name = "upgrade.sh" if platform.system() != "Windows" else "upgrade.bat" - script_path = os.path.join(os.getcwd(), script_name) - + script_path = os.path.join(os.getcwd(), upgrade_script_name) with open(script_path, 'w') as b: - if platform.system() == "Windows": - TempList = f"@echo off\n" - TempList += f"timeout /t 3 /nobreak\n" # 等待进程退出 - TempList += f"del {exename}\n" # 删除旧程序 - TempList += f"move {new_exename} {exename}\n" # 复制新版本程序 - TempList += f"timeout /t 1 /nobreak\n" # 等待复制完成 - TempList += f"start {exename}\n" # 启动新程序 - TempList += f"exit" - else: - TempList = f"#!/bin/sh\n" - TempList += f"EXENAME={exename}\n" - TempList += f"NEW_EXENAME={new_exename}\n" - TempList += f"sleep 3\n" - TempList += f"rm \"$EXENAME\"\n" - TempList += f"mv \"$NEW_EXENAME\" \"$EXENAME\"\n" - TempList += f"sleep 1\n" - TempList += f"nohup ./{exename} &\n" - TempList += f"exit 0\n" + TempList = f"@echo off\n" + TempList += f"timeout /t 3 /nobreak\n" # 等待进程退出 + TempList += f"del {exename}\n" # 删除旧程序 + TempList += f"move {new_exename} {exename}\n" # 复制新版本程序 + TempList += f"timeout /t 1 /nobreak\n" # 等待复制完成 + TempList += f"start {exename}\n" # 启动新程序 + TempList += f"exit" b.write(TempList) - - if platform.system() != "Windows": - os.chmod(script_path, 0o755) # 设置脚本可执行权限 - - if platform.system() == "Windows": - # 不显示cmd窗口 - subprocess.Popen([script_path], creationflags=subprocess.CREATE_NO_WINDOW) - else: - subprocess.Popen([script_path, exename, new_exename]) - + # 不显示cmd窗口 + subprocess.Popen([script_path], creationflags=subprocess.CREATE_NO_WINDOW) os._exit(0) + mirror_list = { "pypi": "https://pypi.org/simple", "aliyun": "https://mirrors.aliyun.com/pypi/simple/", @@ -83,7 +65,6 @@ mirror_list = { "sjtu": "https://mirror.sjtu.edu.cn/pypi/web/simple", } - command_list = { "lfs": "git\\bin\\git lfs install", "ensurepip": "python\\python -m ensurepip --default-pip", @@ -125,7 +106,7 @@ class Api: return response.json() # 更新启动器本身 - def update_self(self,download_url): + def update_self(self, download_url): # 获取当前启动器的路径 current_path = sys.argv[0] # 如果current_path是以py结尾，则将其转换为.exe @@ -143,7 +124,7 @@ class Api: return f"下载新版本: {response.status_code}" logger.info(f"替换旧版本,{temp_path} -> {current_path}") - replace_restart(current_path,temp_path) + replace_restart(current_path, temp_path) def rm_site_packages(self): site_packages_path = Path("./python/Lib/site-packages") @@ -166,7 +147,7 @@ class Api: custom_event(command + "\n") try: with Popen( - command, stdout=PIPE, stderr=STDOUT, shell=True, cwd=cwd, bufsize=0 + command, stdout=PIPE, stderr=STDOUT, shell=True, cwd=cwd, bufsize=0 ) as p: for data in p.stdout: try: @@ -180,13 +161,13 @@ class Api: custom_event(str(e)) return "failed" -script_name = "upgrade.sh" if platform.system() != "Windows" else "upgrade.bat" + # 如果当前路径存在更新脚本，则删除 -if Path(script_name).exists(): - os.remove(script_name) +if Path(upgrade_script_name).exists(): + os.remove(upgrade_script_name) window = webview.create_window(f"mower-ng launcher {version}", "ui/dist/index.html", js_api=Api()) -#window = webview.create_window(f"mower-ng launcher {version}", "http://localhost:5173/", js_api=Api()) +# window = webview.create_window(f"mower-ng launcher {version}", "http://localhost:5173/", js_api=Api()) webview.start() with config_path.open("w") as f: diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue index 4798723..cfe9d61 100644 --- a/ui/src/pages/Settings.vue +++ b/ui/src/pages/Settings.vue @@ -8,8 +8,6 @@ const running = inject('running') const version = inject('version') const new_version = inject('new_version') -const branch = ref(null) -const mirror = ref(null) const check_running = ref(false) const update_self_running = ref(false)