From 94009c8136f923235a0d71e5bb93c464a8e45665 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 14 Dec 2024 20:52:05 +0800 Subject: [PATCH 01/29] =?UTF-8?q?ruff=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/config/__init__.py | 14 +++----------- launcher/sys_config/__init__.py | 4 ++-- launcher/webview/__init__.py | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/launcher/config/__init__.py b/launcher/config/__init__.py index b36e8f2..972e9a5 100644 --- a/launcher/config/__init__.py +++ b/launcher/config/__init__.py @@ -1,26 +1,18 @@ import json import os +from pathlib import Path import yaml -from yamlcore import CoreDumper, CoreLoader +from yamlcore import CoreLoader from launcher.config.conf import Conf -from pathlib import Path conf_path = Path(os.path.join(os.getcwd(), "conf.json")) def save_conf(): with conf_path.open("w", encoding="utf8") as f: - json.dump(conf.model_dump(), f, ensure_ascii=False, indent=4) # Use json.dump - # yaml.dump( - # conf.model_dump(), - # f, - # Dumper=CoreDumper, - # encoding="utf-8", - # default_flow_style=False, - # allow_unicode=True, - # ) + json.dump(conf.model_dump(), f, ensure_ascii=False, indent=4) def load_conf(): diff --git a/launcher/sys_config/__init__.py b/launcher/sys_config/__init__.py index d50d859..f0a93bf 100644 --- a/launcher/sys_config/__init__.py +++ b/launcher/sys_config/__init__.py @@ -1,5 +1,5 @@ -import sys import os +import sys import yaml @@ -44,7 +44,7 @@ class SysConfig: except FileNotFoundError: pass # logger.error(f"配置文件未找到: {self.config_path}") - except Exception as e: + except Exception: pass # logger.error(f"加载配置文件时出错: {str(e)}") diff --git a/launcher/webview/__init__.py b/launcher/webview/__init__.py index d2dea2f..6371a19 100644 --- a/launcher/webview/__init__.py +++ b/launcher/webview/__init__.py @@ -1,7 +1,7 @@ import webview -from launcher.webview.api import Api from launcher.sys_config import sys_config +from launcher.webview.api import Api window = None From 04218f40f7b257d4a08b83bf8729902d24b68857 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 14 Dec 2024 22:14:10 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8C=85=E4=BB=8Etar?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA7z=EF=BC=8C=E8=87=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=80=82=E9=85=8D=E6=96=B0=E5=8F=91=E5=8C=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- launcher.py | 10 +++++----- launcher/constants.py | 3 ++- launcher/file/utils.py | 9 +++++++++ launcher/log.py | 4 +++- launcher/webview/__init__.py | 3 ++- launcher/webview/api.py | 28 +++++++++++++++++++--------- 7 files changed, 42 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index a5e8995..bfd89e0 100644 --- a/README.md +++ b/README.md @@ -15,5 +15,6 @@ pyinstaller -w --add-data "ui/dist:ui/dist" --add-data "launcher/sys_config/conf 在dist文件夹生成launcher文件夹 ```bash -tar -cf dist/launcher.tar dist/launcher +cd dist +py7zr c launcher.7z launcher ``` diff --git a/launcher.py b/launcher.py index b850fb9..115cc4f 100644 --- a/launcher.py +++ b/launcher.py @@ -1,8 +1,8 @@ import mimetypes -import os +import shutil from pathlib import Path -from launcher.constants import upgrade_script_name +from launcher.constants import update_tmp_folder from launcher.webview import start_webview mimetypes.add_type("text/html", ".html") @@ -11,8 +11,8 @@ mimetypes.add_type("application/javascript", ".js") if __name__ == '__main__': - # 如果当前路径存在更新脚本，则删除 - if Path(upgrade_script_name).exists(): - os.remove(upgrade_script_name) + # 如果当前路径存在临时文件夹，则删除 + if Path(update_tmp_folder).exists(): + shutil.rmtree(update_tmp_folder) start_webview() diff --git a/launcher/constants.py b/launcher/constants.py index 60ec018..da1c637 100644 --- a/launcher/constants.py +++ b/launcher/constants.py @@ -4,6 +4,8 @@ constants.py 该模块定义了应用程序中使用的各种常量。这些常量包括API URL和其他配置参数。 """ +# 更新临时文件夹名 +update_tmp_folder = "download_tmp" # 更新脚本名 upgrade_script_name = "upgrade.bat" @@ -21,4 +23,3 @@ mirror_list = { "tuna": "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple", "sjtu": "https://mirror.sjtu.edu.cn/pypi/web/simple", } - diff --git a/launcher/file/utils.py b/launcher/file/utils.py index e78dfcd..cd8a378 100644 --- a/launcher/file/utils.py +++ b/launcher/file/utils.py @@ -1,3 +1,6 @@ +import os + + def format_size(size_bytes): """格式化文件大小为人类可读的形式""" for unit in ['B', 'KB', 'MB', 'GB', 'TB']: @@ -5,3 +8,9 @@ def format_size(size_bytes): return f"{size_bytes:.2f} {unit}" size_bytes /= 1024 return f"{size_bytes:.2f} PB" + + +def ensure_directory_exists(directory): + """确保目录存在，如果不存在则创建""" + if not os.path.exists(directory): + os.makedirs(directory) diff --git a/launcher/log.py b/launcher/log.py index 954ccc3..1797c98 100644 --- a/launcher/log.py +++ b/launcher/log.py @@ -1,5 +1,6 @@ import io import logging +import os import sys from logging.handlers import RotatingFileHandler @@ -21,8 +22,9 @@ def setup_logger(): console_handler.setLevel(log_level) # 文件输出 + file_path = os.path.join(os.getcwd(), "launcher.log") file_handler = RotatingFileHandler( - "../launcher.log", maxBytes=5 * 1024 * 1024, backupCount=3, encoding='utf-8' + file_path, maxBytes=5 * 1024 * 1024, backupCount=3, encoding='utf-8' ) file_handler.setLevel(logging.INFO) diff --git a/launcher/webview/__init__.py b/launcher/webview/__init__.py index 6371a19..77fe4a6 100644 --- a/launcher/webview/__init__.py +++ b/launcher/webview/__init__.py @@ -8,5 +8,6 @@ window = None def start_webview(): global window - window = webview.create_window(f"mower-ng launcher {sys_config.get('version')}", sys_config.get('url'), js_api=Api()) + window = webview.create_window(f"mower-ng launcher {sys_config.get('version')}", sys_config.get('url'), + js_api=Api()) webview.start() diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 09fdd02..e8e5c0b 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -14,6 +14,8 @@ from launcher import config from launcher.constants import download_git_url, download_python_url, get_new_version_url, upgrade_script_name, \ mirror_list from launcher.file.download import init_download, download_file +from launcher.file.extract import extract_7z_file +from launcher.file.utils import ensure_directory_exists from launcher.log import logger from launcher.sys_config import sys_config from launcher.webview.events import custom_event @@ -74,25 +76,33 @@ class Api: # 更新启动器本身 def update_self(self, download_url): logger.info(f"开始更新启动器 {download_url}") - # 下载压缩包的全路径 file_name = os.path.basename(download_url) + file_name = "launcher.7z" current_path = os.getcwd() - if not download_file("launcher", download_url, current_path): + download_tmp_folder = os.path.join(current_path, "download_tmp") + # 确保 download_tmp 文件夹存在 + ensure_directory_exists(download_tmp_folder) + if not download_file("launcher", download_url, download_tmp_folder): return "下载新版本失败" - download_path = os.path.join(current_path, file_name) - script_path = os.path.join(os.getcwd(), upgrade_script_name) - folder_path = os.path.join(os.getcwd(), "_internal") - exe_path = os.path.join(os.getcwd(), "launcher.exe") + download_path = os.path.join(download_tmp_folder, file_name) + if not extract_7z_file("launcher", download_path, download_tmp_folder, True): + return "解压新版本失败" + + exe_path = os.path.join(current_path, "launcher.exe") + folder_path = os.path.join(current_path, "_internal") + new_exe_path = os.path.join(download_tmp_folder, "launcher", "launcher.exe") + new_folder_path = os.path.join(download_tmp_folder, "launcher", "_internal") + script_path = os.path.join(download_tmp_folder, upgrade_script_name) with open(script_path, "w") as b: temp_list = "@echo off\n" temp_list += "timeout /t 3 /nobreak\n" # 等待进程退出 temp_list += f"rmdir {folder_path}\n" # 删除_internal temp_list += f"del {exe_path}\n" # 删除exe - temp_list += f"tar -xf {download_path} -C ..\n" # 解压压缩包 - temp_list += "timeout /t 1 /nobreak\n" # 等待解压 + temp_list += f"xcopy /e /i /y {new_folder_path} {folder_path}\n" + temp_list += f"move {new_exe_path} {exe_path}\n" + temp_list += "timeout /t 1 /nobreak\n" # 等待操作完成 temp_list += f"start {exe_path}\n" # 启动新程序 - temp_list += f"del {download_path}\n" # 删除压缩包 temp_list += "exit" b.write(temp_list) # 不显示cmd窗口 From 987f1b69292686ad3f2b366b3dcfa1704275c309 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 14 Dec 2024 22:15:00 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E5=8F=91=E5=B8=83v0.4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/sys_config/config_dist.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/sys_config/config_dist.yaml b/launcher/sys_config/config_dist.yaml index 1319bb8..def4021 100644 --- a/launcher/sys_config/config_dist.yaml +++ b/launcher/sys_config/config_dist.yaml @@ -1,3 +1,3 @@ -version: "v0.3" +version: "v0.4" url: "ui/dist/index.html" log_level: "ERROR" \ No newline at end of file From bcbd556e7d37902371198f0d0dbe1902e06f48ee Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 15 Dec 2024 21:57:17 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=94=B9=E4=B8=BAjson=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4yaml=E7=9A=84=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- launcher/config/__init__.py | 7 ++----- launcher/sys_config/__init__.py | 9 ++++----- launcher/sys_config/config_dist.json | 5 +++++ launcher/sys_config/config_dist.yaml | 3 --- launcher/sys_config/config_local.json | 5 +++++ launcher/sys_config/config_local.yaml | 3 --- 7 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 launcher/sys_config/config_dist.json delete mode 100644 launcher/sys_config/config_dist.yaml create mode 100644 launcher/sys_config/config_local.json delete mode 100644 launcher/sys_config/config_local.yaml diff --git a/README.md b/README.md index bfd89e0..1cd6865 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ 前端运行 `npm run build` 生成 `ui/dist`，之后安装 PyInstaller，运行 ```bash -pyinstaller -w --add-data "ui/dist:ui/dist" --add-data "launcher/sys_config/config_dist.yaml:launcher/sys_config" launcher.py +pyinstaller -w --add-data "ui/dist:ui/dist" --add-data "launcher/sys_config/config_dist.json:launcher/sys_config" launcher.py ``` 在dist文件夹生成launcher文件夹 diff --git a/launcher/config/__init__.py b/launcher/config/__init__.py index 972e9a5..01d7c22 100644 --- a/launcher/config/__init__.py +++ b/launcher/config/__init__.py @@ -2,9 +2,6 @@ import json import os from pathlib import Path -import yaml -from yamlcore import CoreLoader - from launcher.config.conf import Conf conf_path = Path(os.path.join(os.getcwd(), "conf.json")) @@ -22,8 +19,8 @@ def load_conf(): conf = Conf() save_conf() return - with conf_path.open("r", encoding="utf-8") as f: - data = yaml.load(f, Loader=CoreLoader) + with conf_path.open("r", encoding="utf-8") as file: + data = json.load(file) if data is None: data = {} conf = Conf(**data) diff --git a/launcher/sys_config/__init__.py b/launcher/sys_config/__init__.py index f0a93bf..78115eb 100644 --- a/launcher/sys_config/__init__.py +++ b/launcher/sys_config/__init__.py @@ -1,8 +1,7 @@ +import json import os import sys -import yaml - class SysConfig: """ @@ -26,13 +25,13 @@ class SysConfig: # 如果是打包后的可执行文件 base_path = sys._MEIPASS config_subdir = 'launcher/sys_config' # 添加子目录 - config_filename = 'config_dist.yaml' + config_filename = 'config_dist.json' else: # logger.error("本地配置") # 如果是本地开发环境 base_path = os.path.dirname(__file__) config_subdir = '' # 本地开发环境不需要子目录 - config_filename = 'config_local.yaml' + config_filename = 'config_local.json' config_path = os.path.join(base_path, config_subdir, config_filename) return config_path @@ -40,7 +39,7 @@ class SysConfig: def load_config(self): try: with open(self.config_path, 'r', encoding='utf-8') as file: - self.config = yaml.safe_load(file) + self.config = json.load(file) except FileNotFoundError: pass # logger.error(f"配置文件未找到: {self.config_path}") diff --git a/launcher/sys_config/config_dist.json b/launcher/sys_config/config_dist.json new file mode 100644 index 0000000..01d4337 --- /dev/null +++ b/launcher/sys_config/config_dist.json @@ -0,0 +1,5 @@ +{ + "version": "v0.4", + "url": "ui/dist/index.html", + "log_level": "ERROR" +} \ No newline at end of file diff --git a/launcher/sys_config/config_dist.yaml b/launcher/sys_config/config_dist.yaml deleted file mode 100644 index def4021..0000000 --- a/launcher/sys_config/config_dist.yaml +++ /dev/null @@ -1,3 +0,0 @@ -version: "v0.4" -url: "ui/dist/index.html" -log_level: "ERROR" \ No newline at end of file diff --git a/launcher/sys_config/config_local.json b/launcher/sys_config/config_local.json new file mode 100644 index 0000000..8b1423e --- /dev/null +++ b/launcher/sys_config/config_local.json @@ -0,0 +1,5 @@ +{ + "version": "dev", + "url": "http://localhost:5173/", + "log_level": "INFO" +} \ No newline at end of file diff --git a/launcher/sys_config/config_local.yaml b/launcher/sys_config/config_local.yaml deleted file mode 100644 index a556984..0000000 --- a/launcher/sys_config/config_local.yaml +++ /dev/null @@ -1,3 +0,0 @@ -version: "dev" -url: "http://localhost:5173/" -log_level: "INFO" \ No newline at end of file From ffc2ff6808ef4c90ba8144c42e463404c89dcd15 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 15 Dec 2024 23:23:13 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E4=BD=BF=E7=94=A8pip-tools=E7=AE=A1?= =?UTF-8?q?=E7=90=86python=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++++- requirements.in | 5 ++++ requirements.txt | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 requirements.in create mode 100644 requirements.txt diff --git a/README.md b/README.md index 1cd6865..c49916e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,17 @@ ## 开发环境 -目前只有 `pywebview` 一个依赖。 +安装 `pip-tools` + +```bash +pip install pip-tools +``` + +安装依赖 + +```bash +pip-sync requirements.txt +``` ## 打包 diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..0355191 --- /dev/null +++ b/requirements.in @@ -0,0 +1,5 @@ +pywebview==5.1 +requests==2.32.3 +py7zr==0.22.0 +chardet==5.2.0 +pydantic==2.10.3 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..b2c00c2 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,65 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile requirements.in +# +--index-url https://pypi.tuna.tsinghua.edu.cn/simple + +annotated-types==0.7.0 + # via pydantic +bottle==0.13.2 + # via pywebview +brotli==1.1.0 + # via py7zr +certifi==2024.12.14 + # via requests +cffi==1.17.1 + # via clr-loader +chardet==5.2.0 + # via -r requirements.in +charset-normalizer==3.4.0 + # via requests +clr-loader==0.2.7.post0 + # via pythonnet +idna==3.10 + # via requests +inflate64==1.0.0 + # via py7zr +multivolumefile==0.2.3 + # via py7zr +proxy-tools==0.1.0 + # via pywebview +psutil==6.1.0 + # via py7zr +py7zr==0.22.0 + # via -r requirements.in +pybcj==1.0.2 + # via py7zr +pycparser==2.22 + # via cffi +pycryptodomex==3.21.0 + # via py7zr +pydantic==2.10.3 + # via -r requirements.in +pydantic-core==2.27.1 + # via pydantic +pyppmd==1.1.0 + # via py7zr +pythonnet==3.0.5 + # via pywebview +pywebview==5.1 + # via -r requirements.in +pyzstd==0.16.2 + # via py7zr +requests==2.32.3 + # via -r requirements.in +texttable==1.7.0 + # via py7zr +typing-extensions==4.12.2 + # via + # pydantic + # pydantic-core + # pywebview +urllib3==2.2.3 + # via requests From 92ef815d0dbeb44066791facc7a9b9c75f56ba00 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Thu, 19 Dec 2024 08:07:32 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E4=BD=BF=E7=94=A8pip-tools=E5=AE=89?= =?UTF-8?q?=E8=A3=85mower-ng=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/webview/api.py | 33 +++++++++++++++++---------------- requirements.in | 1 - requirements.txt | 2 -- ui/src/pages/Update.vue | 2 +- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index e8e5c0b..fae921a 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -7,7 +7,6 @@ from pathlib import Path from shutil import rmtree from subprocess import Popen -import chardet import requests from launcher import config @@ -29,27 +28,27 @@ command_list = { "fetch": lambda: f"..\\git\\bin\\git fetch origin {config.conf.branch} --progress", "switch": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=100 switch -f {config.conf.branch} --progress", "reset": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=200 reset --hard origin/{config.conf.branch}", - "pip_install": lambda: f"..\\python\\Scripts\\pip install --no-cache-dir -i {mirror_list[config.conf.mirror]} -r requirements.txt --no-warn-script-location", + "pip_tools_install": lambda: f"..\\python\\Scripts\\pip install --no-cache-dir -i {mirror_list[config.conf.mirror]} pip-tools --no-warn-script-location", + "pip_sync": lambda: f"..\\python\\Scripts\\pip-sync -i {mirror_list[config.conf.mirror]} requirements.txt", "webview": "start ..\\python\\pythonw webview_ui.py", "manager": "start ..\\python\\pythonw manager.py", } -def detect_encoding(stream): - # 读取一部分数据来检测编码 - raw_data = stream.read(4096) - result = chardet.detect(raw_data) - stream.seek(0) # 将流指针重置到开头 - return result['encoding'] - - def read_stream(stream, log_func): - detected_encoding = detect_encoding(stream) - text_io = io.TextIOWrapper(stream, encoding=detected_encoding, errors='replace') - try: + def process_lines(text_io): for line in iter(text_io.readline, ''): text = line.rstrip('\n') - custom_event(text.strip() + "\n") + custom_event(f"{text.strip()}\n") + + detected_encoding = 'utf-8' + text_io = io.TextIOWrapper(stream, encoding=detected_encoding, errors='replace') + try: + process_lines(text_io) + except UnicodeDecodeError: + stream.seek(0) # 重新将流指针重置到开头 + text_io = io.TextIOWrapper(stream, encoding='gbk', errors='replace') + process_lines(text_io) finally: text_io.close() @@ -136,7 +135,7 @@ class Api: universal_newlines=False ) as p: stdout_thread = threading.Thread(target=read_stream, args=(p.stdout, logger.info)) - stderr_thread = threading.Thread(target=read_stream, args=(p.stderr, logger.info)) + stderr_thread = threading.Thread(target=read_stream, args=(p.stderr, logger.error)) stdout_thread.start() stderr_thread.start() @@ -145,7 +144,9 @@ class Api: stderr_thread.join() if p.returncode == 0: return "success" + else: + logger.error(f"{command} 运行失败") + return "failed" except Exception as e: logger.exception(e) custom_event(str(e)) - return "failed" diff --git a/requirements.in b/requirements.in index 0355191..6e921b6 100644 --- a/requirements.in +++ b/requirements.in @@ -1,5 +1,4 @@ pywebview==5.1 requests==2.32.3 py7zr==0.22.0 -chardet==5.2.0 pydantic==2.10.3 diff --git a/requirements.txt b/requirements.txt index b2c00c2..f44f0c6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,8 +16,6 @@ certifi==2024.12.14 # via requests cffi==1.17.1 # via clr-loader -chardet==5.2.0 - # via -r requirements.in charset-normalizer==3.4.0 # via requests clr-loader==0.2.7.post0 diff --git a/ui/src/pages/Update.vue b/ui/src/pages/Update.vue index 1d7019a..dc1da6a 100644 --- a/ui/src/pages/Update.vue +++ b/ui/src/pages/Update.vue @@ -13,7 +13,7 @@ const steps = computed(() => [ }, { title: '安装依赖', - command: ['pip_install'], + command: ['pip_tools_install', 'pip_sync'], cwd: 'mower-ng' } ]) From f22594a260b40d886ba671c093bb76ef932665c1 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Thu, 26 Dec 2024 08:41:33 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=EF=BC=8C=E9=A6=96=E6=AC=A1=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=99=A8=E6=97=B6=E8=87=AA=E5=8A=A8=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/config/conf.py | 2 ++ launcher/sys_config/__init__.py | 2 ++ launcher/sys_config/config_dist.json | 3 ++- launcher/sys_config/config_local.json | 3 ++- launcher/webview/__init__.py | 2 +- ui/src/App.vue | 13 ++++++++++++- ui/src/stores/config.js | 1 + 7 files changed, 22 insertions(+), 4 deletions(-) diff --git a/launcher/config/conf.py b/launcher/config/conf.py index 0f60eec..e411765 100644 --- a/launcher/config/conf.py +++ b/launcher/config/conf.py @@ -19,6 +19,8 @@ class Total(ConfModel): """整体""" # 所在页面 page: str = "init" + # 是否已展示帮助文档 + is_already_show_doc: bool = False class UpdatePart(ConfModel): diff --git a/launcher/sys_config/__init__.py b/launcher/sys_config/__init__.py index 78115eb..f81abf3 100644 --- a/launcher/sys_config/__init__.py +++ b/launcher/sys_config/__init__.py @@ -13,6 +13,8 @@ class SysConfig: url: str # 日志输出级别 log_level: str + # 是否开启ui调试 + debug: bool def __init__(self): self.config = {} diff --git a/launcher/sys_config/config_dist.json b/launcher/sys_config/config_dist.json index 01d4337..a9c2eb5 100644 --- a/launcher/sys_config/config_dist.json +++ b/launcher/sys_config/config_dist.json @@ -1,5 +1,6 @@ { "version": "v0.4", "url": "ui/dist/index.html", - "log_level": "ERROR" + "log_level": "ERROR", + "debug": false } \ No newline at end of file diff --git a/launcher/sys_config/config_local.json b/launcher/sys_config/config_local.json index 8b1423e..d74400e 100644 --- a/launcher/sys_config/config_local.json +++ b/launcher/sys_config/config_local.json @@ -1,5 +1,6 @@ { "version": "dev", "url": "http://localhost:5173/", - "log_level": "INFO" + "log_level": "INFO", + "debug": true } \ No newline at end of file diff --git a/launcher/webview/__init__.py b/launcher/webview/__init__.py index 77fe4a6..1129706 100644 --- a/launcher/webview/__init__.py +++ b/launcher/webview/__init__.py @@ -10,4 +10,4 @@ def start_webview(): global window window = webview.create_window(f"mower-ng launcher {sys_config.get('version')}", sys_config.get('url'), js_api=Api()) - webview.start() + webview.start(debug=sys_config.get('debug')) diff --git a/ui/src/App.vue b/ui/src/App.vue index be241cb..bba955f 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -12,6 +12,10 @@ const loading = ref(true) const page = ref(null) let conf +function show_doc() { + window.open('https://hedgedoc.zhaozuohong.vip/s/LfSzK2n0K', '_blank') +} + async function init_version() { version.value = await pywebview.api.get_version() new_version.value = await pywebview.api.get_new_version() @@ -22,7 +26,11 @@ async function init_version() { async function initialize_config() { await configStore.load_config() conf = configStore.config - await init_version() + init_version() + if (!conf.is_already_show_doc) { + show_doc() + conf.is_already_show_doc = true + } loading.value = false } @@ -95,6 +103,9 @@ provide('new_version', new_version) + diff --git a/ui/src/stores/config.js b/ui/src/stores/config.js index 8a7386d..f20625c 100644 --- a/ui/src/stores/config.js +++ b/ui/src/stores/config.js @@ -6,6 +6,7 @@ export const useConfigStore = defineStore('config', () => { this.page = conf.page this.branch = conf.branch this.mirror = conf.mirror + this.is_already_show_doc = conf.is_already_show_doc } } From 1c484d3f77bdf7bc22c15646dc59785cfc42f6c4 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Thu, 26 Dec 2024 08:57:15 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9A=E5=9C=A8=E6=97=A0=E7=BD=91=E7=BB=9C=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E5=90=AF=E5=8A=A8=E5=99=A8=E6=97=A0=E6=B3=95=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20=E5=9C=A8=E5=8A=A0=E8=BD=BD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=8F=96=E6=B6=88=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81=EF=BC=8C=E6=8A=8A=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E4=B8=8D=E5=BD=B1=E5=93=8D=E5=8A=9F=E8=83=BD=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E5=90=8E=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/App.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/App.vue b/ui/src/App.vue index bba955f..06d73a2 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -26,12 +26,12 @@ async function init_version() { async function initialize_config() { await configStore.load_config() conf = configStore.config - init_version() + loading.value = false if (!conf.is_already_show_doc) { show_doc() conf.is_already_show_doc = true } - loading.value = false + await init_version() } const log = ref('') From 60f43d42be3ffe2f30bead0f35dabbcadc203cf2 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 28 Dec 2024 11:29:58 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E7=95=8C=E9=9D=A2=E8=BE=93=E5=87=BA=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=B9=B6=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=90=8C=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/file/download.py | 16 +++++----- launcher/file/extract.py | 17 +++++------ launcher/sys_config/__init__.py | 2 +- launcher/webview/api.py | 16 +++++----- launcher/webview/events.py | 25 ++++++++++++++-- ui/package-lock.json | 9 +++--- ui/package.json | 1 + ui/src/components/LogComponent.vue | 47 ++++++++++++++++++++++++++++-- 8 files changed, 99 insertions(+), 34 deletions(-) diff --git a/launcher/file/download.py b/launcher/file/download.py index ccda67e..2acf26a 100644 --- a/launcher/file/download.py +++ b/launcher/file/download.py @@ -5,7 +5,7 @@ import requests from launcher.file.extract import extract_7z_file from launcher.file.utils import format_size -from launcher.webview.events import custom_event +from launcher.webview.events import custom_event, LogType def download_file(download_name, download_url, destination_folder): @@ -21,7 +21,7 @@ def download_file(download_name, download_url, destination_folder): filename = os.path.basename(download_url) download_path = os.path.join(destination_folder, filename) - custom_event(f"开始下载: {download_name}") + custom_event(LogType.info, f"开始下载: {download_name}") response = requests.get(download_url, stream=True) if response.status_code == 200: @@ -52,8 +52,8 @@ def download_file(download_name, download_url, destination_folder): formatted_total_size = format_size(total_size) formatted_speed = format_size(download_speed) + "/s" - custom_event( - f"下载进度: {progress_percent:.2f}% ({formatted_downloaded_size}/{formatted_total_size}), 下载速度: {formatted_speed}") + custom_event(LogType.info, + f"下载进度: {progress_percent:.2f}% ({formatted_downloaded_size}/{formatted_total_size}), 下载速度: {formatted_speed}") last_update_time = current_time # 更新上次更新时间 end_time = time.time() @@ -63,10 +63,10 @@ def download_file(download_name, download_url, destination_folder): formatted_total_elapsed_time = f"{total_elapsed_time:.2f} 秒" formatted_average_download_speed = format_size(average_download_speed) + "/s" - custom_event( - f"下载完成: {filename}, 耗时: {formatted_total_elapsed_time}, 下载速度: {formatted_average_download_speed}") + custom_event(LogType.info, + f"下载完成: {filename}, 耗时: {formatted_total_elapsed_time}, 下载速度: {formatted_average_download_speed}") else: - custom_event(f"下载失败: {response.status_code}") + custom_event(LogType.error, f"下载失败: {response.status_code}") return False return True @@ -84,7 +84,7 @@ def init_download(download_name, download_url, destination_folder): def download(): target_folder = os.path.join(download_name) if os.path.exists(target_folder): - custom_event(f"{download_name} 文件夹已存在，跳过下载") + custom_event(LogType.info, f"{download_name} 文件夹已存在，跳过下载") return True filename = os.path.basename(download_url) diff --git a/launcher/file/extract.py b/launcher/file/extract.py index 17269a2..1588c41 100644 --- a/launcher/file/extract.py +++ b/launcher/file/extract.py @@ -5,7 +5,7 @@ from py7zr import py7zr from py7zr.callbacks import ExtractCallback from launcher.file.utils import format_size -from launcher.webview.events import custom_event +from launcher.webview.events import custom_event, LogType class MyExtractCallback(ExtractCallback): @@ -24,7 +24,7 @@ class MyExtractCallback(ExtractCallback): self.total_size += int(wrote_bytes) current_time = time.time() if current_time - self.last_print_time >= 1.0: # 至少每隔1秒输出一次 - custom_event(f"已解压: {format_size(self.total_size)}") + custom_event(LogType.info, f"已解压: {format_size(self.total_size)}") self.last_print_time = current_time def report_postprocess(self): @@ -49,7 +49,7 @@ def extract_7z_file(file_name, file_path, destination_folder, delete_after_extra if not os.path.exists(destination_folder): os.makedirs(destination_folder) - custom_event(f"开始解压文件: {file_name}") + custom_event(LogType.info, f"开始解压文件: {file_name}") try: start_time = time.time() with py7zr.SevenZipFile(file_path, mode='r') as z: @@ -58,18 +58,17 @@ def extract_7z_file(file_name, file_path, destination_folder, delete_after_extra end_time = time.time() total_elapsed_time = end_time - start_time formatted_total_elapsed_time = f"{total_elapsed_time:.2f} 秒" - custom_event( - f"解压完成: {file_name}, 总大小: {format_size(callback.total_size)}, 耗时: {formatted_total_elapsed_time}") + custom_event(LogType.info, + f"解压完成: {file_name}, 总大小: {format_size(callback.total_size)}, 耗时: {formatted_total_elapsed_time}") except Exception as e: - e.print_exc() - custom_event(f"解压失败: {str(e)}") + custom_event(LogType.error, f"解压失败: {repr(e)}") return False if delete_after_extract: try: os.remove(file_path) - custom_event(f"删除{file_path}成功") + custom_event(LogType.info, f"删除{file_path}成功") except OSError as e: - custom_event(f"删除{file_path}失败: {str(e)}") + custom_event(LogType.error, f"删除{file_path}失败: {repr(e)}") return True diff --git a/launcher/sys_config/__init__.py b/launcher/sys_config/__init__.py index f81abf3..94853c0 100644 --- a/launcher/sys_config/__init__.py +++ b/launcher/sys_config/__init__.py @@ -47,7 +47,7 @@ class SysConfig: # logger.error(f"配置文件未找到: {self.config_path}") except Exception: pass - # logger.error(f"加载配置文件时出错: {str(e)}") + # logger.error(f"加载配置文件时出错: {repr(e)}") def get(self, key): return self.config.get(key) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index fae921a..c67ee37 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -17,7 +17,7 @@ from launcher.file.extract import extract_7z_file from launcher.file.utils import ensure_directory_exists from launcher.log import logger from launcher.sys_config import sys_config -from launcher.webview.events import custom_event +from launcher.webview.events import custom_event, LogType command_list = { "download_git": lambda: init_download("git", download_git_url, os.getcwd()), @@ -35,11 +35,11 @@ command_list = { } -def read_stream(stream, log_func): +def read_stream(stream, log_type): def process_lines(text_io): for line in iter(text_io.readline, ''): text = line.rstrip('\n') - custom_event(f"{text.strip()}\n") + custom_event(log_type, f"{text.strip()}") detected_encoding = 'utf-8' text_io = io.TextIOWrapper(stream, encoding=detected_encoding, errors='replace') @@ -128,14 +128,16 @@ class Api: command = command() if callable(command): return "success" if command() else "failed" - custom_event(command + "\n") + if cwd is not None: + custom_event(LogType.execute_command, f"路径：{cwd}") + custom_event(LogType.execute_command, command) try: with subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=cwd, bufsize=0, universal_newlines=False ) as p: - stdout_thread = threading.Thread(target=read_stream, args=(p.stdout, logger.info)) - stderr_thread = threading.Thread(target=read_stream, args=(p.stderr, logger.error)) + stdout_thread = threading.Thread(target=read_stream, args=(p.stdout, LogType.command_out)) + stderr_thread = threading.Thread(target=read_stream, args=(p.stderr, LogType.command_out)) stdout_thread.start() stderr_thread.start() @@ -149,4 +151,4 @@ class Api: return "failed" except Exception as e: logger.exception(e) - custom_event(str(e)) + custom_event(LogType.error, repr(e)) diff --git a/launcher/webview/events.py b/launcher/webview/events.py index a28fd4f..cb4d714 100644 --- a/launcher/webview/events.py +++ b/launcher/webview/events.py @@ -1,11 +1,32 @@ import json +from enum import Enum import launcher from launcher.log import logger -def custom_event(data): - logger.info(data) +class LogType(Enum): + info = "信息" + error = "错误" + execute_command = "执行命令" + command_out = "命令输出" + + +def custom_event(log_type, data): + data = f"[{log_type.value}] {data}" + + match log_type: + case LogType.info: + logger.info(data) + case LogType.error: + logger.error(data) + case LogType.execute_command: + logger.info(data) + case LogType.command_out: + logger.info(data) + case _: + logger.info(data) + data = json.dumps({"log": data + "\n"}) js = f"var event = new CustomEvent('log', {{detail: {data}}}); window.dispatchEvent(event);" launcher.webview.window.evaluate_js(js) diff --git a/ui/package-lock.json b/ui/package-lock.json index 3e30e87..7010b68 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -8,6 +8,7 @@ "name": "ui", "version": "0.0.0", "dependencies": { + "highlight.js": "^11.11.1", "pinia": "^2.2.8", "vue": "^3.5.11" }, @@ -2075,11 +2076,9 @@ } }, "node_modules/highlight.js": { - "version": "11.10.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.10.0.tgz", - "integrity": "sha512-SYVnVFswQER+zu1laSya563s+F8VDGt7o35d4utbamowvUNLLMovFqwCLSocpZTz3MgaSRA1IbqRWZv97dtErQ==", - "dev": true, - "license": "BSD-3-Clause", + "version": "11.11.1", + "resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.1.tgz", + "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==", "engines": { "node": ">=12.0.0" } diff --git a/ui/package.json b/ui/package.json index 4e707b9..ccf202c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -11,6 +11,7 @@ "format": "prettier --write src/" }, "dependencies": { + "highlight.js": "^11.11.1", "pinia": "^2.2.8", "vue": "^3.5.11" }, diff --git a/ui/src/components/LogComponent.vue b/ui/src/components/LogComponent.vue index 8b19c0d..7fc5d72 100644 --- a/ui/src/components/LogComponent.vue +++ b/ui/src/components/LogComponent.vue @@ -1,14 +1,40 @@ @@ -23,10 +49,27 @@ const log_ele = inject('log_ele') height: 100% !important; box-sizing: border-box; } + +.selectable-log { + user-select: text; +} From 478bcd5f434c9742c423facd265b122edeec003f Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 28 Dec 2024 20:14:01 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E6=89=A7=E8=A1=8C=E5=91=BD=E4=BB=A4=E6=97=B6=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=91=BD=E4=BB=A4=E8=BE=93=E5=87=BA=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/file/utils.py | 14 ++++++++++++++ launcher/webview/api.py | 42 +++++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/launcher/file/utils.py b/launcher/file/utils.py index cd8a378..9bb040b 100644 --- a/launcher/file/utils.py +++ b/launcher/file/utils.py @@ -14,3 +14,17 @@ def ensure_directory_exists(directory): """确保目录存在，如果不存在则创建""" if not os.path.exists(directory): os.makedirs(directory) + + +def check_command_path(command, cwd=None): + """检查命令路径是否存在exe文件 + :return 是否存在,命令exe文件全路径 + """ + command_path = command.split(" ")[0] + if command_path == "start": + return True, None + exec_command_path = os.getcwd() + if cwd: + exec_command_path = os.path.join(exec_command_path, cwd) + full_command_path = os.path.abspath(os.path.join(exec_command_path, command_path)) + ".exe" + return os.path.exists(full_command_path), full_command_path diff --git a/launcher/webview/api.py b/launcher/webview/api.py index c67ee37..ac440c8 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -14,7 +14,7 @@ from launcher.constants import download_git_url, download_python_url, get_new_ve mirror_list from launcher.file.download import init_download, download_file from launcher.file.extract import extract_7z_file -from launcher.file.utils import ensure_directory_exists +from launcher.file.utils import ensure_directory_exists, check_command_path from launcher.log import logger from launcher.sys_config import sys_config from launcher.webview.events import custom_event, LogType @@ -35,11 +35,27 @@ command_list = { } -def read_stream(stream, log_type): +def parse_stderr(stderr_output): + error_keywords = { + "fatal: destination path 'mower-ng' already exists and is not an empty directory.": "mower-ng文件夹已存在并且非空。", + "index.lock': File exists": "上一个git命令正在执行，请等待执行结束或在任务管理器中杀掉git进程，并确保上方提示的index.lock文件删除后再次运行。", + "Could not resolve host": "网络出现错误，请检查网络是否通畅。", + "ReadTimeoutError": "网络连接超时，请检查网络连接或尝试更换镜像源。", + "No space left on device": "磁盘空间不足。", + } + for keyword, message in error_keywords.items(): + if keyword in stderr_output: + return message + return "未定义的错误" + + +def read_stream(stream, log_type, output_list=None): def process_lines(text_io): for line in iter(text_io.readline, ''): - text = line.rstrip('\n') - custom_event(log_type, f"{text.strip()}") + text = line.rstrip('\n').strip() + custom_event(log_type, text) + if output_list is not None: + output_list.append(text) detected_encoding = 'utf-8' text_io = io.TextIOWrapper(stream, encoding=detected_encoding, errors='replace') @@ -129,26 +145,36 @@ class Api: if callable(command): return "success" if command() else "failed" if cwd is not None: - custom_event(LogType.execute_command, f"路径：{cwd}") + custom_event(LogType.info, f"命令执行目录：{cwd}") custom_event(LogType.execute_command, command) + # 执行命令前先判断命令路径是否存在 + exist, command_path = check_command_path(command, cwd) + if not exist: + custom_event(LogType.error, f"命令路径不存在：{command_path} 请尝试依赖修复并重新初始化。") + return "failed" try: + stdout_stderr = [] with subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=cwd, bufsize=0, universal_newlines=False ) as p: stdout_thread = threading.Thread(target=read_stream, args=(p.stdout, LogType.command_out)) - stderr_thread = threading.Thread(target=read_stream, args=(p.stderr, LogType.command_out)) + stderr_thread = threading.Thread(target=read_stream, + args=(p.stderr, LogType.command_out, stdout_stderr)) stdout_thread.start() stderr_thread.start() stdout_thread.join() stderr_thread.join() + if p.returncode == 0: return "success" else: - logger.error(f"{command} 运行失败") + error_message = parse_stderr("\n".join(stdout_stderr)) + custom_event(LogType.error, f"命令执行失败，{error_message}") return "failed" except Exception as e: logger.exception(e) - custom_event(LogType.error, repr(e)) + custom_event(LogType.error, str(e)) + return "failed" From 5cdf9d752fe0aa2ba1326150cd241d2ecfb9d4b4 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 28 Dec 2024 20:15:04 +0800 Subject: [PATCH 11/29] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96=E6=97=B6=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/webview/api.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index ac440c8..a869430 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -125,18 +125,24 @@ class Api: os._exit(0) def rm_site_packages(self): - site_packages_path = Path("./python/Lib/site-packages") - if site_packages_path.exists(): - rmtree(site_packages_path) - return "site-packages目录移除成功" - return "python\\Lib\\site-packages目录不存在" + try: + site_packages_path = Path("./python/Lib/site-packages") + if site_packages_path.exists(): + rmtree(site_packages_path) + return "site-packages目录移除成功" + return "python\\Lib\\site-packages目录不存在" + except Exception as e: + return repr(e) def rm_python_scripts(self): - python_scripts_path = Path("./python/Scripts") - if python_scripts_path.exists(): - rmtree(python_scripts_path) - return "Scripts目录移除成功" - return "python\\Scripts目录不存在" + try: + python_scripts_path = Path("./python/Scripts") + if python_scripts_path.exists(): + rmtree(python_scripts_path) + return "Scripts目录移除成功" + return "python\\Scripts目录不存在" + except Exception as e: + return repr(e) def run(self, command, cwd=None): command = command_list[command] From 8ed883202b8555d1addaf0193eee79cdbebdac1d Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 28 Dec 2024 21:05:28 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E6=9E=84=E5=BB=BA=EF=BC=9Arequirements?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0pyinstaller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.in | 1 + requirements.txt | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/requirements.in b/requirements.in index 6e921b6..e8f09e4 100644 --- a/requirements.in +++ b/requirements.in @@ -2,3 +2,4 @@ pywebview==5.1 requests==2.32.3 py7zr==0.22.0 pydantic==2.10.3 +pyinstaller==6.11.1 diff --git a/requirements.txt b/requirements.txt index f44f0c6..7dbbb07 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,8 @@ # --index-url https://pypi.tuna.tsinghua.edu.cn/simple +altgraph==0.17.4 + # via pyinstaller annotated-types==0.7.0 # via pydantic bottle==0.13.2 @@ -26,6 +28,12 @@ inflate64==1.0.0 # via py7zr multivolumefile==0.2.3 # via py7zr +packaging==24.2 + # via + # pyinstaller + # pyinstaller-hooks-contrib +pefile==2023.2.7 + # via pyinstaller proxy-tools==0.1.0 # via pywebview psutil==6.1.0 @@ -42,12 +50,18 @@ pydantic==2.10.3 # via -r requirements.in pydantic-core==2.27.1 # via pydantic +pyinstaller==6.11.1 + # via -r requirements.in +pyinstaller-hooks-contrib==2024.11 + # via pyinstaller pyppmd==1.1.0 # via py7zr pythonnet==3.0.5 # via pywebview pywebview==5.1 # via -r requirements.in +pywin32-ctypes==0.2.3 + # via pyinstaller pyzstd==0.16.2 # via py7zr requests==2.32.3 @@ -61,3 +75,6 @@ typing-extensions==4.12.2 # pywebview urllib3==2.2.3 # via requests + +# The following packages are considered to be unsafe in a requirements file: +# setuptools From 0661b6bbc31d02ab2798fc99b1bb89c578e258f0 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 28 Dec 2024 21:05:35 +0800 Subject: [PATCH 13/29] =?UTF-8?q?=E5=8F=91=E5=B8=83v0.5=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/sys_config/config_dist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/sys_config/config_dist.json b/launcher/sys_config/config_dist.json index a9c2eb5..b382c15 100644 --- a/launcher/sys_config/config_dist.json +++ b/launcher/sys_config/config_dist.json @@ -1,5 +1,5 @@ { - "version": "v0.4", + "version": "v0.5", "url": "ui/dist/index.html", "log_level": "ERROR", "debug": false From 9295d9f2cfcd6f775d5976c97801c54029caab04 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Tue, 7 Jan 2025 13:29:00 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=201.?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9A=84=E4=B8=AD=E6=96=87=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BE=AE=E8=BD=AF=E9=9B=85=E9=BB=91=202.?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=E6=8C=89=E9=92=AE=E5=A4=96?= =?UTF-8?q?=E8=BE=B9=E8=B7=9D=E8=B0=83=E6=95=B4=E5=88=B0=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AA=97=E5=B7=A6=E8=BE=B9=E8=B7=9D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=203.=E6=89=A9=E5=A4=A7=E9=BB=98=E8=AE=A4=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=EF=BC=8C=E4=BD=BF=E5=BE=97PyPI=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=88=9D=E5=A7=8B=E5=B1=95=E7=A4=BA=E5=88=B0=E4=B8=80?= =?UTF-8?q?=E8=A1=8C=204.=E8=A1=A8=E5=8D=95label=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=9E=82=E7=9B=B4=E5=B1=85=E4=B8=AD=205.=E8=AE=BE=E7=BD=AEtab?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E2=80=9C=E6=96=B0=E2=80=9D=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=9E=82=E7=9B=B4=E5=B1=85=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E4=B8=8D=E8=83=BD=E5=BD=B1=E5=93=8D=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=8F=E7=9A=84=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/webview/__init__.py | 2 +- ui/src/App.vue | 26 ++++++++++++--- ui/src/components/LogComponent.vue | 52 ++++++++++++++---------------- ui/src/main.js | 1 + ui/src/pages/Settings.vue | 3 +- ui/src/pages/Update.vue | 5 +-- ui/src/styles/global.css | 43 ++++++++++++++++++++++++ ui/src/styles/styles.js | 3 ++ 8 files changed, 99 insertions(+), 36 deletions(-) create mode 100644 ui/src/styles/global.css create mode 100644 ui/src/styles/styles.js diff --git a/launcher/webview/__init__.py b/launcher/webview/__init__.py index 1129706..f450a28 100644 --- a/launcher/webview/__init__.py +++ b/launcher/webview/__init__.py @@ -9,5 +9,5 @@ window = None def start_webview(): global window window = webview.create_window(f"mower-ng launcher {sys_config.get('version')}", sys_config.get('url'), - js_api=Api()) + js_api=Api(), width=850, height=600) webview.start(debug=sys_config.get('debug')) diff --git a/ui/src/App.vue b/ui/src/App.vue index 06d73a2..cffa4df 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -89,6 +89,7 @@ provide('new_version', new_version) class="container" v-model:value="conf.page" @update:value="set_page" + justify-content="center" > @@ -96,15 +97,17 @@ provide('new_version', new_version) @@ -117,4 +120,17 @@ provide('new_version', new_version) width: 100vw; height: 100vh; } +.suffix-container { + margin: 0 4px 6px 4px; +} +.tab-content { + position: relative; +} +.tag { + margin-left: 4px; + position: absolute; + top: 50%; + left: 100%; + transform: translateY(-50%); +} diff --git a/ui/src/components/LogComponent.vue b/ui/src/components/LogComponent.vue index 7fc5d72..47d1339 100644 --- a/ui/src/components/LogComponent.vue +++ b/ui/src/components/LogComponent.vue @@ -5,27 +5,44 @@ import hljs from 'highlight.js/lib/core' const log = inject('log') const log_ele = inject('log_ele') +const chinesePattern = { + className: 'chinese', + begin: /[\u4e00-\u9fa5]+/ +} + hljs.registerLanguage('naive-log', () => ({ contains: [ { className: 'info', - begin: /\[信息\]/, - end: /$/ + begin: /^\[信息\]/, + end: /$/, + returnBegin: true, + returnEnd: true, + contains: [chinesePattern] }, { className: 'error', - begin: /\[错误\]/, - end: /$/ + begin: /^\[错误\]/, + end: /$/, + returnBegin: true, + returnEnd: true, + contains: [chinesePattern] }, { className: 'execute_command', - begin: /\[执行命令\]/, - end: /$/ + begin: /^\[执行命令\]/, + end: /$/, + returnBegin: true, + returnEnd: true, + contains: [chinesePattern] }, { className: 'command_out', - begin: /\[命令输出\]/, - end: /$/ + begin: /^\[命令输出\]/, + end: /$/, + returnBegin: true, + returnEnd: true, + contains: [chinesePattern] } ] })) @@ -54,22 +71,3 @@ hljs.registerLanguage('naive-log', () => ({ user-select: text; } - - diff --git a/ui/src/main.js b/ui/src/main.js index e8343a7..132098e 100644 --- a/ui/src/main.js +++ b/ui/src/main.js @@ -1,5 +1,6 @@ import 'vfonts/Lato.css' import 'vfonts/FiraCode.css' +import './styles/global.css' import { createApp } from 'vue' import { createPinia } from 'pinia' diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue index cd21d17..120ff2c 100644 --- a/ui/src/pages/Settings.vue +++ b/ui/src/pages/Settings.vue @@ -1,5 +1,6 @@ @@ -34,4 +31,4 @@ function manager() { width: 120px; height: 48px; } - + \ No newline at end of file diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue index 120ff2c..5428726 100644 --- a/ui/src/pages/Settings.vue +++ b/ui/src/pages/Settings.vue @@ -91,5 +91,6 @@ async function check_update() { + diff --git a/ui/src/stores/config.js b/ui/src/stores/config.js index f20625c..e33269a 100644 --- a/ui/src/stores/config.js +++ b/ui/src/stores/config.js @@ -3,10 +3,12 @@ import { defineStore } from 'pinia' export const useConfigStore = defineStore('config', () => { class Config { constructor(conf) { + // 整体 Total this.page = conf.page + this.is_already_show_doc = conf.is_already_show_doc + // 更新代码 UpdatePart this.branch = conf.branch this.mirror = conf.mirror - this.is_already_show_doc = conf.is_already_show_doc } } From 25f9915fccb31544a3f2bd06013f072bd20fc7f5 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 25 Jan 2025 17:49:17 +0800 Subject: [PATCH 16/29] =?UTF-8?q?ruff=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher.py | 3 +-- launcher/config/conf.py | 2 ++ launcher/constants.py | 4 ++- launcher/file/download.py | 22 ++++++++++----- launcher/file/extract.py | 12 ++++++--- launcher/file/utils.py | 6 +++-- launcher/log.py | 6 ++--- launcher/sys_config/__init__.py | 13 ++++----- launcher/webview/__init__.py | 11 +++++--- launcher/webview/api.py | 48 ++++++++++++++++++++++----------- 10 files changed, 84 insertions(+), 43 deletions(-) diff --git a/launcher.py b/launcher.py index 115cc4f..5e92a69 100644 --- a/launcher.py +++ b/launcher.py @@ -9,8 +9,7 @@ mimetypes.add_type("text/html", ".html") mimetypes.add_type("text/css", ".css") mimetypes.add_type("application/javascript", ".js") -if __name__ == '__main__': - +if __name__ == "__main__": # 如果当前路径存在临时文件夹，则删除 if Path(update_tmp_folder).exists(): shutil.rmtree(update_tmp_folder) diff --git a/launcher/config/conf.py b/launcher/config/conf.py index e411765..3f9eff2 100644 --- a/launcher/config/conf.py +++ b/launcher/config/conf.py @@ -17,6 +17,7 @@ class ConfModel(BaseModel): class Total(ConfModel): """整体""" + # 所在页面 page: str = "init" # 是否已展示帮助文档 @@ -25,6 +26,7 @@ class Total(ConfModel): class UpdatePart(ConfModel): """更新代码""" + # mower-ng 代码分支 branch: str = "slow" # PyPI 仓库镜像 diff --git a/launcher/constants.py b/launcher/constants.py index 213679a..8d9d0d4 100644 --- a/launcher/constants.py +++ b/launcher/constants.py @@ -10,7 +10,9 @@ update_tmp_folder = "download_tmp" upgrade_script_name = "upgrade.bat" # 获取最新版本发布信息 -get_new_version_url = "https://git.zhaozuohong.vip/api/v1/repos/mower-ng/launcher/releases/latest" +get_new_version_url = ( + "https://git.zhaozuohong.vip/api/v1/repos/mower-ng/launcher/releases/latest" +) # 下载新版本压缩包名 file_name = "launcher.7z" diff --git a/launcher/file/download.py b/launcher/file/download.py index 2acf26a..03825f8 100644 --- a/launcher/file/download.py +++ b/launcher/file/download.py @@ -25,7 +25,7 @@ def download_file(download_name, download_url, destination_folder): response = requests.get(download_url, stream=True) if response.status_code == 200: - total_size = int(response.headers.get('content-length', 0)) + total_size = int(response.headers.get("content-length", 0)) downloaded_size = 0 start_time = time.time() last_update_time = time.time() # 记录上次更新时间 @@ -43,7 +43,9 @@ def download_file(download_name, download_url, destination_folder): else: download_speed = 0 - progress_percent = (downloaded_size / total_size) * 100 if total_size != 0 else 0 + progress_percent = ( + (downloaded_size / total_size) * 100 if total_size != 0 else 0 + ) # 检查是否需要更新进度信息，每1秒更新一次 if current_time - last_update_time >= 1: @@ -52,19 +54,25 @@ def download_file(download_name, download_url, destination_folder): formatted_total_size = format_size(total_size) formatted_speed = format_size(download_speed) + "/s" - custom_event(LogType.info, - f"下载进度: {progress_percent:.2f}% ({formatted_downloaded_size}/{formatted_total_size}), 下载速度: {formatted_speed}") + custom_event( + LogType.info, + f"下载进度: {progress_percent:.2f}% ({formatted_downloaded_size}/{formatted_total_size}), 下载速度: {formatted_speed}", + ) last_update_time = current_time # 更新上次更新时间 end_time = time.time() total_elapsed_time = end_time - start_time - average_download_speed = downloaded_size / total_elapsed_time if total_elapsed_time != 0 else 0 + average_download_speed = ( + downloaded_size / total_elapsed_time if total_elapsed_time != 0 else 0 + ) # 格式化输出 formatted_total_elapsed_time = f"{total_elapsed_time:.2f} 秒" formatted_average_download_speed = format_size(average_download_speed) + "/s" - custom_event(LogType.info, - f"下载完成: {filename}, 耗时: {formatted_total_elapsed_time}, 下载速度: {formatted_average_download_speed}") + custom_event( + LogType.info, + f"下载完成: {filename}, 耗时: {formatted_total_elapsed_time}, 下载速度: {formatted_average_download_speed}", + ) else: custom_event(LogType.error, f"下载失败: {response.status_code}") return False diff --git a/launcher/file/extract.py b/launcher/file/extract.py index 1588c41..a1c523c 100644 --- a/launcher/file/extract.py +++ b/launcher/file/extract.py @@ -37,7 +37,9 @@ class MyExtractCallback(ExtractCallback): pass -def extract_7z_file(file_name, file_path, destination_folder, delete_after_extract=True): +def extract_7z_file( + file_name, file_path, destination_folder, delete_after_extract=True +): """ 解压7z文件到指定文件夹 :param file_name: 7z文件的名称 @@ -52,14 +54,16 @@ def extract_7z_file(file_name, file_path, destination_folder, delete_after_extra custom_event(LogType.info, f"开始解压文件: {file_name}") try: start_time = time.time() - with py7zr.SevenZipFile(file_path, mode='r') as z: + with py7zr.SevenZipFile(file_path, mode="r") as z: callback = MyExtractCallback() z.extractall(path=destination_folder, callback=callback) end_time = time.time() total_elapsed_time = end_time - start_time formatted_total_elapsed_time = f"{total_elapsed_time:.2f} 秒" - custom_event(LogType.info, - f"解压完成: {file_name}, 总大小: {format_size(callback.total_size)}, 耗时: {formatted_total_elapsed_time}") + custom_event( + LogType.info, + f"解压完成: {file_name}, 总大小: {format_size(callback.total_size)}, 耗时: {formatted_total_elapsed_time}", + ) except Exception as e: custom_event(LogType.error, f"解压失败: {repr(e)}") return False diff --git a/launcher/file/utils.py b/launcher/file/utils.py index 9bb040b..5ab58dc 100644 --- a/launcher/file/utils.py +++ b/launcher/file/utils.py @@ -3,7 +3,7 @@ import os def format_size(size_bytes): """格式化文件大小为人类可读的形式""" - for unit in ['B', 'KB', 'MB', 'GB', 'TB']: + for unit in ["B", "KB", "MB", "GB", "TB"]: if size_bytes < 1024: return f"{size_bytes:.2f} {unit}" size_bytes /= 1024 @@ -26,5 +26,7 @@ def check_command_path(command, cwd=None): exec_command_path = os.getcwd() if cwd: exec_command_path = os.path.join(exec_command_path, cwd) - full_command_path = os.path.abspath(os.path.join(exec_command_path, command_path)) + ".exe" + full_command_path = ( + os.path.abspath(os.path.join(exec_command_path, command_path)) + ".exe" + ) return os.path.exists(full_command_path), full_command_path diff --git a/launcher/log.py b/launcher/log.py index 1797c98..7588b05 100644 --- a/launcher/log.py +++ b/launcher/log.py @@ -9,13 +9,13 @@ from launcher.sys_config import sys_config # 配置日志 def setup_logger(): - log_level = sys_config.get('log_level') + log_level = sys_config.get("log_level") logger = logging.getLogger("launcher.log") logger.setLevel(log_level) # 设置标准输出编码为 UTF-8 - sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8') + sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8") # 控制台输出 console_handler = logging.StreamHandler() @@ -24,7 +24,7 @@ def setup_logger(): # 文件输出 file_path = os.path.join(os.getcwd(), "launcher.log") file_handler = RotatingFileHandler( - file_path, maxBytes=5 * 1024 * 1024, backupCount=3, encoding='utf-8' + file_path, maxBytes=5 * 1024 * 1024, backupCount=3, encoding="utf-8" ) file_handler.setLevel(logging.INFO) diff --git a/launcher/sys_config/__init__.py b/launcher/sys_config/__init__.py index 94853c0..b7be326 100644 --- a/launcher/sys_config/__init__.py +++ b/launcher/sys_config/__init__.py @@ -7,6 +7,7 @@ class SysConfig: """ 读取系统配置文件 """ + # 版本 version: str # ui路径 @@ -22,25 +23,25 @@ class SysConfig: self.load_config() def get_config_path(self): - if getattr(sys, 'frozen', False): + if getattr(sys, "frozen", False): # logger.error("打包配置") # 如果是打包后的可执行文件 base_path = sys._MEIPASS - config_subdir = 'launcher/sys_config' # 添加子目录 - config_filename = 'config_dist.json' + config_subdir = "launcher/sys_config" # 添加子目录 + config_filename = "config_dist.json" else: # logger.error("本地配置") # 如果是本地开发环境 base_path = os.path.dirname(__file__) - config_subdir = '' # 本地开发环境不需要子目录 - config_filename = 'config_local.json' + config_subdir = "" # 本地开发环境不需要子目录 + config_filename = "config_local.json" config_path = os.path.join(base_path, config_subdir, config_filename) return config_path def load_config(self): try: - with open(self.config_path, 'r', encoding='utf-8') as file: + with open(self.config_path, "r", encoding="utf-8") as file: self.config = json.load(file) except FileNotFoundError: pass diff --git a/launcher/webview/__init__.py b/launcher/webview/__init__.py index f450a28..09ae4d6 100644 --- a/launcher/webview/__init__.py +++ b/launcher/webview/__init__.py @@ -8,6 +8,11 @@ window = None def start_webview(): global window - window = webview.create_window(f"mower-ng launcher {sys_config.get('version')}", sys_config.get('url'), - js_api=Api(), width=850, height=600) - webview.start(debug=sys_config.get('debug')) + window = webview.create_window( + f"mower-ng launcher {sys_config.get('version')}", + sys_config.get("url"), + js_api=Api(), + width=850, + height=600, + ) + webview.start(debug=sys_config.get("debug")) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index bee397a..1960b38 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -9,8 +9,14 @@ from subprocess import Popen import requests from launcher import config -from launcher.constants import download_git_url, download_python_url, get_new_version_url, upgrade_script_name, \ - mirror_list, file_name +from launcher.constants import ( + download_git_url, + download_python_url, + get_new_version_url, + upgrade_script_name, + mirror_list, + file_name, +) from launcher.file.download import init_download, download_file from launcher.file.extract import extract_7z_file from launcher.file.utils import ensure_directory_exists, check_command_path @@ -20,7 +26,9 @@ from launcher.webview.events import custom_event, LogType command_list = { "download_git": lambda: init_download("git", download_git_url, os.getcwd()), - "download_python": lambda: init_download("python", download_python_url, os.getcwd()), + "download_python": lambda: init_download( + "python", download_python_url, os.getcwd() + ), "lfs": "git\\bin\\git lfs install", "ensurepip": "python\\python -m ensurepip --default-pip", "clone": "git\\bin\\git -c lfs.concurrenttransfers=100 clone https://git.zhaozuohong.vip/mower-ng/mower-ng.git --branch slow", @@ -49,9 +57,7 @@ def parse_stderr(stderr_output): def check_command_end(command_key, output): - end_keywords = { - "webview": {"WebSocket客户端建立连接": "mower_ng已成功运行"} - } + end_keywords = {"webview": {"WebSocket客户端建立连接": "mower_ng已成功运行"}} if command_key in end_keywords: keywords = end_keywords[command_key] for keyword in keywords: @@ -62,7 +68,6 @@ def check_command_end(command_key, output): class Api: - def load_config(self): logger.info("读取配置文件") return config.conf.model_dump() @@ -146,30 +151,43 @@ class Api: # 执行命令前先判断命令路径是否存在 exist, command_path = check_command_path(command, cwd) if not exist: - custom_event(LogType.error, f"命令路径不存在：{command_path} 请尝试依赖修复并重新初始化。") + custom_event( + LogType.error, + f"命令路径不存在：{command_path} 请尝试依赖修复并重新初始化。", + ) return "failed" try: stdout_stderr = [] with subprocess.Popen( - command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=cwd, bufsize=0, - universal_newlines=False + command, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + shell=True, + cwd=cwd, + bufsize=0, + universal_newlines=False, ) as p: + def process_lines(text_io): - for line in iter(text_io.readline, ''): - text = line.rstrip('\n').strip() + for line in iter(text_io.readline, ""): + text = line.rstrip("\n").strip() custom_event(LogType.command_out, text) if stdout_stderr is not None: stdout_stderr.append(text) if check_command_end(command_key, text): break - detected_encoding = 'utf-8' - text_io = io.TextIOWrapper(p.stdout, encoding=detected_encoding, errors='replace') + detected_encoding = "utf-8" + text_io = io.TextIOWrapper( + p.stdout, encoding=detected_encoding, errors="replace" + ) try: process_lines(text_io) except UnicodeDecodeError: p.stdout.seek(0) # 重新将流指针重置到开头 - text_io = io.TextIOWrapper(p.stdout, encoding='gbk', errors='replace') + text_io = io.TextIOWrapper( + p.stdout, encoding="gbk", errors="replace" + ) process_lines(text_io) finally: text_io.close() From 942d93417b79c2b0415dc66631d0373176d65bf8 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Tue, 28 Jan 2025 16:13:53 +0800 Subject: [PATCH 17/29] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9C=80=E5=A4=9A?= =?UTF-8?q?=E4=BF=9D=E7=95=99200=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/App.vue | 23 +++++++++++++++-------- ui/src/components/FloatButton.vue | 2 +- ui/src/components/LogComponent.vue | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ui/src/App.vue b/ui/src/App.vue index cffa4df..eb2e815 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -34,15 +34,19 @@ async function initialize_config() { await init_version() } -const log = ref('') +const log = ref([]) provide('log', log) const log_ele = ref(null) provide('log_ele', log_ele) -watch(log, () => { - nextTick(() => { - log_ele.value?.scrollTo({ position: 'bottom' }) - }) -}) +watch( + log, + () => { + nextTick(() => { + log_ele.value?.scrollTo({ position: 'bottom' }) + }) + }, + { deep: true } +) onMounted(() => { if (window.pywebview && pywebview.api) { @@ -53,12 +57,15 @@ onMounted(() => { }) } window.addEventListener('log', (e) => { - log.value += e.detail.log + log.value.push(e.detail.log) + if (log.value.length > 200) { + log.value.shift() + } }) }) function set_page(value) { - log.value = '' + log.value.splice(0) } const running = ref(false) diff --git a/ui/src/components/FloatButton.vue b/ui/src/components/FloatButton.vue index 06f16c1..de0ff86 100644 --- a/ui/src/components/FloatButton.vue +++ b/ui/src/components/FloatButton.vue @@ -11,7 +11,7 @@ const current_state = inject('current_state') const notification = useNotification() async function start() { - log.value = '' + log.value = [] running.value = true for (const [i, step] of steps.value.entries()) { current_step.value = i + 1 diff --git a/ui/src/components/LogComponent.vue b/ui/src/components/LogComponent.vue index 47d1339..b16c676 100644 --- a/ui/src/components/LogComponent.vue +++ b/ui/src/components/LogComponent.vue @@ -51,7 +51,7 @@ hljs.registerLanguage('naive-log', () => ({ From dc32d7e53e30384b2b36b08c0d42811ec7e231aa Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 23 Feb 2025 18:11:26 +0800 Subject: [PATCH 18/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E5=90=88=E5=B9=B6=E5=A4=9A=E5=BC=80=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- launcher/config/conf.py | 25 ++- launcher/constants.py | 3 + launcher/file/utils.py | 7 +- launcher/instances/__init__.py | 0 launcher/instances/manager.py | 129 ++++++++++++++ launcher/sys_config/config_dist.json | 2 +- launcher/sys_config/config_local.json | 2 +- launcher/webview/api.py | 62 ++++++- ui/src/pages/Launch.vue | 238 ++++++++++++++++++++++++-- ui/src/stores/config.js | 20 ++- 11 files changed, 456 insertions(+), 34 deletions(-) create mode 100644 launcher/instances/__init__.py create mode 100644 launcher/instances/manager.py diff --git a/.gitignore b/.gitignore index 768ee45..7ccfbfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /conf.yml /conf.json /dist +/instances/ # Byte-compiled / optimized / DLL files __pycache__/ @@ -66,7 +67,6 @@ db.sqlite3 db.sqlite3-journal # Flask stuff: -instance/ .webassets-cache # Scrapy stuff: diff --git a/launcher/config/conf.py b/launcher/config/conf.py index 3f9eff2..a5df264 100644 --- a/launcher/config/conf.py +++ b/launcher/config/conf.py @@ -1,3 +1,5 @@ +from typing import List + from pydantic import BaseModel, model_validator from pydantic_core import PydanticUndefined @@ -7,9 +9,10 @@ class ConfModel(BaseModel): @classmethod def nested_defaults(cls, data): for name, field in cls.model_fields.items(): + expected_type = field.annotation if name not in data: if field.default is PydanticUndefined: - data[name] = field.annotation() + data[name] = expected_type else: data[name] = field.default return data @@ -33,8 +36,28 @@ class UpdatePart(ConfModel): mirror: str = "aliyun" +class LaunchPart(ConfModel): + """启动程序""" + + class Instance(ConfModel): + """实例""" + + # 是否选中 + checked: bool = False + # 实例名 + name: str = "" + # 实例路径 + path: str = "" + + # 实例列表 + instances: List[Instance] = [] + # 是否展示日志窗口 + is_show_log: bool = False + + class Conf( Total, UpdatePart, + LaunchPart, ): pass diff --git a/launcher/constants.py b/launcher/constants.py index 8d9d0d4..3e519e2 100644 --- a/launcher/constants.py +++ b/launcher/constants.py @@ -27,3 +27,6 @@ mirror_list = { "tuna": "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple", "sjtu": "https://mirror.sjtu.edu.cn/pypi/web/simple", } + +# 实例文件夹名 +instances_folder_name = "instances" diff --git a/launcher/file/utils.py b/launcher/file/utils.py index 5ab58dc..b9dd968 100644 --- a/launcher/file/utils.py +++ b/launcher/file/utils.py @@ -20,13 +20,14 @@ def check_command_path(command, cwd=None): """检查命令路径是否存在exe文件 :return 是否存在,命令exe文件全路径 """ - command_path = command.split(" ")[0] - if command_path == "start": + command_name = command.split(" ")[0] + system_command = ["start", "explorer"] + if command_name in system_command: return True, None exec_command_path = os.getcwd() if cwd: exec_command_path = os.path.join(exec_command_path, cwd) full_command_path = ( - os.path.abspath(os.path.join(exec_command_path, command_path)) + ".exe" + os.path.abspath(os.path.join(exec_command_path, command_name)) + ".exe" ) return os.path.exists(full_command_path), full_command_path diff --git a/launcher/instances/__init__.py b/launcher/instances/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/launcher/instances/manager.py b/launcher/instances/manager.py new file mode 100644 index 0000000..f0ff759 --- /dev/null +++ b/launcher/instances/manager.py @@ -0,0 +1,129 @@ +import json +import os +import shutil +import uuid + +from launcher import config +from launcher.config.conf import LaunchPart +from launcher.constants import instances_folder_name +from launcher.webview.events import custom_event, LogType + + +def add_instance(): + instances_path = os.path.join(os.getcwd(), instances_folder_name) + if not os.path.exists(instances_path): + os.makedirs(instances_path) + instance_folder_name = str(uuid.uuid4()) + instance_folder_path = os.path.join(instances_path, instance_folder_name) + if os.path.exists(instance_folder_path): + raise Exception("创建实例目录失败") + os.makedirs(instance_folder_path) + custom_event(LogType.info, f"创建实例目录成功: {instance_folder_path}") + return instance_folder_path + + +def migrate_instance(source_folder): + """通用配置迁移方法 + Args: + source_folder: 源配置目录路径 + target_folder: 目标配置目录路径 + """ + try: + if not os.path.exists(source_folder): + custom_event(LogType.error, f"源配置目录不存在: {source_folder}") + return {"status": False, "message": f"源配置目录不存在{source_folder}"} + + target_folder = add_instance() + + # 需要复制的目录和文件列表 + copy_items = [("tmp", True), ("conf.yml", False), ("plan.json", False)] + + for item, is_dir in copy_items: + src = os.path.join(source_folder, item) + dst = os.path.join(target_folder, item) + + if is_dir: + if os.path.exists(src): + shutil.copytree(src, dst, dirs_exist_ok=True) + else: + if os.path.exists(src): + shutil.copy2(src, dst) + + custom_event(LogType.info, f"{source_folder} 配置成功迁移至 {target_folder}") + return {"status": True, "data": target_folder, "message": "配置迁移成功"} + + except Exception as e: + custom_event(LogType.error, f"配置迁移失败: {str(e)}") + return {"status": False, "message": str(e)} + + +def migrate_instances_config(): + try: + config_path = os.path.join(os.getcwd(), "mower-ng", "instances.json") + + if not os.path.exists(config_path): + custom_event(LogType.error, f"多开配置文件不存在{config_path}") + return {"status": False, "message": "多开配置文件不存在"} + + with open(config_path, "r", encoding="utf-8") as f: + instances_data = json.loads(f.read()) + custom_event(LogType.info, f"读取多开配置: {instances_data}") + + valid_instances = [] + error_messages = [] + + for index, item in enumerate(instances_data, 1): + try: + # 基础结构验证 + if not isinstance(item, dict): + raise ValueError("配置项必须是字典类型") + + # 必填字段检查 + required_fields = ["name", "path"] + for field in required_fields: + if field not in item: + raise ValueError(f"缺少必要字段: {field}") + + # 路径有效性验证 + if not os.path.exists(item["path"]): + raise ValueError(f"配置路径不存在{item['path']}") + + # 执行配置迁移 + migration_result = migrate_instance(item["path"]) + + if not migration_result["status"]: + raise Exception(f"路径迁移失败: {migration_result['message']}") + + # 转换为实例模型 + instance = LaunchPart.Instance( + name=item["name"].strip(), path=migration_result["data"] + ) + + valid_instances.append(instance) + + except Exception as e: + error_msg = f"第{index}项: {str(e)}" + error_messages.append(error_msg) + custom_event(LogType.error, error_msg) + + # 保存有效配置 + if valid_instances: + config.conf.instances.extend(valid_instances) + config.save_conf() + + message = f"成功导入{len(valid_instances)}个实例" + ( + f"，存在{len(error_messages)}个错误项" if error_messages else "" + ) + custom_event(LogType.info, message) + return { + "status": not bool(error_messages), + "data": len(valid_instances), + "message": message, + } + + except json.JSONDecodeError as e: + custom_event(LogType.error, f"JSON解析失败: {str(e)}") + return {"status": False, "message": "配置文件格式错误"} + except Exception as e: + custom_event(LogType.error, f"迁移多开配置失败: {str(e)}") + return {"status": False, "message": str(e)} diff --git a/launcher/sys_config/config_dist.json b/launcher/sys_config/config_dist.json index b382c15..1764210 100644 --- a/launcher/sys_config/config_dist.json +++ b/launcher/sys_config/config_dist.json @@ -1,6 +1,6 @@ { "version": "v0.5", "url": "ui/dist/index.html", - "log_level": "ERROR", + "log_level": "INFO", "debug": false } \ No newline at end of file diff --git a/launcher/sys_config/config_local.json b/launcher/sys_config/config_local.json index d74400e..e42e05a 100644 --- a/launcher/sys_config/config_local.json +++ b/launcher/sys_config/config_local.json @@ -1,6 +1,6 @@ { "version": "dev", "url": "http://localhost:5173/", - "log_level": "INFO", + "log_level": "DEBUG", "debug": true } \ No newline at end of file diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 1960b38..b24ab1d 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -1,6 +1,8 @@ import io import os +import shutil import subprocess +import threading from _winapi import CREATE_NO_WINDOW from pathlib import Path from shutil import rmtree @@ -9,6 +11,7 @@ from subprocess import Popen import requests from launcher import config +from launcher.config.conf import LaunchPart from launcher.constants import ( download_git_url, download_python_url, @@ -16,10 +19,12 @@ from launcher.constants import ( upgrade_script_name, mirror_list, file_name, + instances_folder_name, ) from launcher.file.download import init_download, download_file from launcher.file.extract import extract_7z_file from launcher.file.utils import ensure_directory_exists, check_command_path +from launcher.instances import manager from launcher.log import logger from launcher.sys_config import sys_config from launcher.webview.events import custom_event, LogType @@ -37,8 +42,8 @@ command_list = { "reset": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=200 reset --hard origin/{config.conf.branch}", "pip_tools_install": lambda: f"..\\python\\Scripts\\pip install --no-cache-dir -i {mirror_list[config.conf.mirror]} pip-tools --no-warn-script-location", "pip_sync": lambda: f"..\\python\\Scripts\\pip-sync -i {mirror_list[config.conf.mirror]} requirements.txt", - "webview": "..\\python\\pythonw webview_ui.py", - "manager": "start ..\\python\\pythonw manager.py", + "webview": lambda instance_path="": f'..\\python\\pythonw webview_ui.py "{instance_path}"', + "open_folder": lambda folder_path: f"explorer {folder_path}", } @@ -69,11 +74,11 @@ def check_command_end(command_key, output): class Api: def load_config(self): - logger.info("读取配置文件") + logger.debug("读取配置文件") return config.conf.model_dump() def save_config(self, conf): - logger.info(f"更新配置文件{conf}") + logger.debug(f"更新配置文件{conf}") config.conf = config.Conf(**conf) config.save_conf() @@ -139,10 +144,13 @@ class Api: except Exception as e: return repr(e) - def run(self, command_key, cwd=None): + def run(self, command_key, cwd=None, params={}): command = command_list[command_key] if callable(command): - command = command() + try: + command = command(**params) + except TypeError: + command = command() if callable(command): return "success" if command() else "failed" if cwd is not None: @@ -202,3 +210,45 @@ class Api: logger.exception(e) custom_event(LogType.error, str(e)) return "failed" + + def add_instance(self): + return manager.add_instance() + + def delete_instance(self, path): + instances_dir = os.path.join(os.getcwd(), instances_folder_name) + abs_path = os.path.abspath(path) + if os.path.commonpath( + [abs_path, instances_dir] + ) == instances_dir and os.path.exists(abs_path): + shutil.rmtree(abs_path) + + def start_checked_instance(self): + checked_instances = [ + instance for instance in config.conf.instances if instance.checked + ] + if not checked_instances: + custom_event(LogType.warning, "没有选中的实例") + return [{"status": False, "message": "No checked instances"}] + + def _run_instance(instance: LaunchPart.Instance): + self.run( + "webview", + "mower-ng", + {"instance_path": instance.path}, + ) + + # 创建并启动线程 目前进程依然有阻塞，待优化 + for instance in checked_instances: + thread = threading.Thread( + target=_run_instance, args=(instance,), daemon=True + ) + thread.start() + + def migrate_default_instance(self): + """迁移默认实例文件到新实例""" + source_path = os.path.join(os.getcwd(), "mower-ng") + return manager.migrate_instance(source_path) + + def migrate_instances_config(self): + """迁移多开配置""" + return manager.migrate_instances_config() diff --git a/ui/src/pages/Launch.vue b/ui/src/pages/Launch.vue index c84940c..3c15f37 100644 --- a/ui/src/pages/Launch.vue +++ b/ui/src/pages/Launch.vue @@ -1,34 +1,238 @@ \ No newline at end of file +.instance-list { + overflow: auto; +} +.log { + min-height: 40vh; + max-height: 40vh; + margin-top: auto; +} +.top { + align-items: center; +} +.is_show_log_switch { + margin-right: 20px; +} + diff --git a/ui/src/stores/config.js b/ui/src/stores/config.js index e33269a..80484fe 100644 --- a/ui/src/stores/config.js +++ b/ui/src/stores/config.js @@ -1,6 +1,14 @@ import { defineStore } from 'pinia' export const useConfigStore = defineStore('config', () => { + class Instance { + constructor(instance) { + this.checked = instance.checked + this.name = instance.name + this.path = instance.path + } + } + class Config { constructor(conf) { // 整体 Total @@ -9,21 +17,25 @@ export const useConfigStore = defineStore('config', () => { // 更新代码 UpdatePart this.branch = conf.branch this.mirror = conf.mirror + // 启动程序 LaunchPart + this.instances = [] + this.is_show_log = conf.is_show_log + Object.assign(this, conf) } } - const config = ref({}) + const config = reactive({}) async function load_config() { const conf = await pywebview.api.load_config() - config.value = new Config(conf) - console.log('config.value', config.value) + Object.assign(config, new Config(conf)) + console.log('响应式配置已更新', config) } watch( config, () => { - pywebview.api.save_config(config.value) + pywebview.api.save_config(config) }, { deep: true } ) From 4153164c4994b7ff08b85d1d52e44cb803144647 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 23 Feb 2025 18:11:58 +0800 Subject: [PATCH 19/29] =?UTF-8?q?=E5=8F=91=E5=B8=83v0.6=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/sys_config/config_dist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/sys_config/config_dist.json b/launcher/sys_config/config_dist.json index 1764210..9c9c5fd 100644 --- a/launcher/sys_config/config_dist.json +++ b/launcher/sys_config/config_dist.json @@ -1,5 +1,5 @@ { - "version": "v0.5", + "version": "v0.6", "url": "ui/dist/index.html", "log_level": "INFO", "debug": false From c94d6d5494e2a550990260fb5e9fa20a42547e32 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 23 Feb 2025 20:09:32 +0800 Subject: [PATCH 20/29] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9A=E6=89=93=E5=8C=85=E5=90=8E=E8=BF=90=E8=A1=8C=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E6=97=B6=E7=BC=96=E7=A0=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/webview/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index b24ab1d..5842e9f 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -42,7 +42,7 @@ command_list = { "reset": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=200 reset --hard origin/{config.conf.branch}", "pip_tools_install": lambda: f"..\\python\\Scripts\\pip install --no-cache-dir -i {mirror_list[config.conf.mirror]} pip-tools --no-warn-script-location", "pip_sync": lambda: f"..\\python\\Scripts\\pip-sync -i {mirror_list[config.conf.mirror]} requirements.txt", - "webview": lambda instance_path="": f'..\\python\\pythonw webview_ui.py "{instance_path}"', + "webview": lambda instance_path="": f'..\\python\\pythonw -X utf8 webview_ui.py "{instance_path}"', "open_folder": lambda folder_path: f"explorer {folder_path}", } From f5011e00513e0400a44d3a3c18472c2a87c6324e Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 23 Feb 2025 20:28:31 +0800 Subject: [PATCH 21/29] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9A=E6=89=93=E5=BC=80=E5=AE=9E=E4=BE=8B=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E6=97=B6=E5=BC=82=E5=B8=B8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/webview/api.py | 8 +++++++- ui/src/pages/Launch.vue | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 5842e9f..227f82e 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -43,7 +43,6 @@ command_list = { "pip_tools_install": lambda: f"..\\python\\Scripts\\pip install --no-cache-dir -i {mirror_list[config.conf.mirror]} pip-tools --no-warn-script-location", "pip_sync": lambda: f"..\\python\\Scripts\\pip-sync -i {mirror_list[config.conf.mirror]} requirements.txt", "webview": lambda instance_path="": f'..\\python\\pythonw -X utf8 webview_ui.py "{instance_path}"', - "open_folder": lambda folder_path: f"explorer {folder_path}", } @@ -252,3 +251,10 @@ class Api: def migrate_instances_config(self): """迁移多开配置""" return manager.migrate_instances_config() + + def open_folder(self, path): + if not os.path.exists(path): + custom_event(LogType.error, f"路径不存在：{path}") + else: + os.startfile(path) + custom_event(LogType.info, f"成功打开文件夹：{path}") diff --git a/ui/src/pages/Launch.vue b/ui/src/pages/Launch.vue index 3c15f37..faaacff 100644 --- a/ui/src/pages/Launch.vue +++ b/ui/src/pages/Launch.vue @@ -62,7 +62,7 @@ function end_update_instance_name() { update_instance_name_index.value = null } function open_folder(path) { - pywebview.api.run('open_folder', null, { folder_path: path }) + pywebview.api.open_folder(path) } function start_instance(instance) { pywebview.api.run('webview', 'mower-ng', { From 501259b420c6994c3502cfefa930b4926ffa1b54 Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sun, 23 Feb 2025 21:00:43 +0800 Subject: [PATCH 22/29] =?UTF-8?q?=E5=8F=91=E5=B8=83v0.6.1=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/sys_config/config_dist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/sys_config/config_dist.json b/launcher/sys_config/config_dist.json index 9c9c5fd..2649876 100644 --- a/launcher/sys_config/config_dist.json +++ b/launcher/sys_config/config_dist.json @@ -1,5 +1,5 @@ { - "version": "v0.6", + "version": "v0.6.1", "url": "ui/dist/index.html", "log_level": "INFO", "debug": false From de2c2af2bd8abda93167a680bd2b0f32b9b48ffc Mon Sep 17 00:00:00 2001 From: li-xiaochen <397721316@qq.com> Date: Sat, 8 Mar 2025 11:28:22 +0800 Subject: [PATCH 23/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0zhaozuohong.vip=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/config/conf.py | 22 ++++++++++++++- launcher/constants.py | 7 +++-- launcher/utils.py | 12 +++++++++ launcher/webview/api.py | 37 ++++++++++++++++++++++---- ui/src/components/BaseMirrorOption.vue | 30 +++++++++++++++++++++ ui/src/pages/Init.vue | 5 ++++ ui/src/pages/Settings.vue | 13 ++++++--- ui/src/pages/Update.vue | 9 ++++--- ui/src/stores/config.js | 2 ++ 9 files changed, 123 insertions(+), 14 deletions(-) create mode 100644 launcher/utils.py create mode 100644 ui/src/components/BaseMirrorOption.vue diff --git a/launcher/config/conf.py b/launcher/config/conf.py index a5df264..cfeca5c 100644 --- a/launcher/config/conf.py +++ b/launcher/config/conf.py @@ -1,4 +1,4 @@ -from typing import List +from typing import List, Literal, get_args, get_origin from pydantic import BaseModel, model_validator from pydantic_core import PydanticUndefined @@ -15,6 +15,18 @@ class ConfModel(BaseModel): data[name] = expected_type else: data[name] = field.default + value = data[name] + + # 检查 Literal 类型并修正 + if get_origin(expected_type) is Literal: + valid_literals = get_args(expected_type) + if value not in valid_literals: + # 修正为默认值 + data[name] = ( + field.default + if field.default is not PydanticUndefined + else None + ) return data @@ -55,9 +67,17 @@ class LaunchPart(ConfModel): is_show_log: bool = False +class OtherPart(ConfModel): + """其他配置""" + + # xx.zhaozuohong.vip镜像 (访问xx.zhaozuohong.vip url时，0=原路径 1=在.zhaozuohong.vip前添加-cf前缀) + base_mirror: Literal["0", "1"] = "0" + + class Conf( Total, UpdatePart, LaunchPart, + OtherPart, ): pass diff --git a/launcher/constants.py b/launcher/constants.py index 3e519e2..507139e 100644 --- a/launcher/constants.py +++ b/launcher/constants.py @@ -8,18 +8,21 @@ constants.py update_tmp_folder = "download_tmp" # 更新脚本名 upgrade_script_name = "upgrade.bat" +# 下载新版本压缩包名 +file_name = "launcher.7z" # 获取最新版本发布信息 get_new_version_url = ( "https://git.zhaozuohong.vip/api/v1/repos/mower-ng/launcher/releases/latest" ) -# 下载新版本压缩包名 -file_name = "launcher.7z" # 下载地址 download_git_url = "https://list.zhaozuohong.vip/mower-ng/git.7z" download_python_url = "https://list.zhaozuohong.vip/mower-ng/python.7z" +# mower-ng git链接 +mower_ng_git_url = "https://git.zhaozuohong.vip/mower-ng/mower-ng.git" + # pip镜像地址 mirror_list = { "pypi": "https://pypi.org/simple", diff --git a/launcher/utils.py b/launcher/utils.py new file mode 100644 index 0000000..bb56ecc --- /dev/null +++ b/launcher/utils.py @@ -0,0 +1,12 @@ +from launcher import config + + +def build_base_url(url: str) -> str: + """ + 构建xx.zhaozuohong.vip，如果配置base_mirror是1，在.zhaozuohong.vip前添加-cf前缀 + :param url: 带有xx.zhaozuohong.vip的url字符串 + :return: 构建完成的url + """ + if config.conf.base_mirror == "1": + url = url.replace(".zhaozuohong.vip", "-cf.zhaozuohong.vip") + return url diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 227f82e..f7769f2 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -3,6 +3,7 @@ import os import shutil import subprocess import threading +import time from _winapi import CREATE_NO_WINDOW from pathlib import Path from shutil import rmtree @@ -20,6 +21,7 @@ from launcher.constants import ( mirror_list, file_name, instances_folder_name, + mower_ng_git_url, ) from launcher.file.download import init_download, download_file from launcher.file.extract import extract_7z_file @@ -27,17 +29,22 @@ from launcher.file.utils import ensure_directory_exists, check_command_path from launcher.instances import manager from launcher.log import logger from launcher.sys_config import sys_config +from launcher.utils import build_base_url from launcher.webview.events import custom_event, LogType command_list = { - "download_git": lambda: init_download("git", download_git_url, os.getcwd()), + "download_git": lambda: init_download( + "git", build_base_url(download_git_url), os.getcwd() + ), "download_python": lambda: init_download( - "python", download_python_url, os.getcwd() + "python", build_base_url(download_python_url), os.getcwd() ), "lfs": "git\\bin\\git lfs install", "ensurepip": "python\\python -m ensurepip --default-pip", - "clone": "git\\bin\\git -c lfs.concurrenttransfers=100 clone https://git.zhaozuohong.vip/mower-ng/mower-ng.git --branch slow", - "fetch": lambda: f"..\\git\\bin\\git fetch origin {config.conf.branch} --progress", + "clone": lambda: f"git\\bin\\git -c lfs.concurrenttransfers=100 clone {build_base_url(mower_ng_git_url)} --branch slow", + "set_remote": lambda: f"..\\git\\bin\\git remote set-url origin {build_base_url(mower_ng_git_url)}", + "set_lfs": lambda: f"..\\git\\bin\\git config lfs.url {build_base_url(mower_ng_git_url)}/info/lfs", + "fetch": lambda: f"..\\git\\bin\\git fetch {build_base_url(mower_ng_git_url)} {config.conf.branch} --progress", "switch": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=100 switch -f {config.conf.branch} --progress", "reset": lambda: f"..\\git\\bin\\git -c lfs.concurrenttransfers=200 reset --hard origin/{config.conf.branch}", "pip_tools_install": lambda: f"..\\python\\Scripts\\pip install --no-cache-dir -i {mirror_list[config.conf.mirror]} pip-tools --no-warn-script-location", @@ -86,11 +93,12 @@ class Api: def get_new_version(self): logger.info("获取最新版本号") - response = requests.get(get_new_version_url) + response = requests.get(build_base_url(get_new_version_url)) return response.json() # 更新启动器本身 def update_self(self, download_url): + download_url = build_base_url(download_url) logger.info(f"开始更新启动器 {download_url}") current_path = os.getcwd() download_tmp_folder = os.path.join(current_path, "download_tmp") @@ -258,3 +266,22 @@ class Api: else: os.startfile(path) custom_event(LogType.info, f"成功打开文件夹：{path}") + + def test_base_url_connect(self): + url = build_base_url(get_new_version_url) + custom_event(LogType.info, f"开始测试URL连接：{url}") + try: + start_time = time.time() + response = requests.get(url) + end_time = time.time() + if response.status_code == 200: + elapsed_time_ms = (end_time - start_time) * 1000 + custom_event( + LogType.info, f"测试成功，响应时间为 {elapsed_time_ms:.2f} 毫秒" + ) + else: + custom_event( + LogType.error, f"测试失败: HTTP状态码 {response.status_code}" + ) + except requests.exceptions.RequestException as e: + custom_event(LogType.error, f"发生错误: {e}") diff --git a/ui/src/components/BaseMirrorOption.vue b/ui/src/components/BaseMirrorOption.vue new file mode 100644 index 0000000..8d1037d --- /dev/null +++ b/ui/src/components/BaseMirrorOption.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/ui/src/pages/Init.vue b/ui/src/pages/Init.vue index ac577ad..0120bfe 100644 --- a/ui/src/pages/Init.vue +++ b/ui/src/pages/Init.vue @@ -1,4 +1,6 @@