diff --git a/.gitignore b/.gitignore index 7ccfbfe..768ee45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /conf.yml /conf.json /dist -/instances/ # Byte-compiled / optimized / DLL files __pycache__/ @@ -67,6 +66,7 @@ db.sqlite3 db.sqlite3-journal # Flask stuff: +instance/ .webassets-cache # Scrapy stuff: diff --git a/launcher.py b/launcher.py index 5e92a69..115cc4f 100644 --- a/launcher.py +++ b/launcher.py @@ -9,7 +9,8 @@ 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 cfeca5c..e411765 100644 --- a/launcher/config/conf.py +++ b/launcher/config/conf.py @@ -1,5 +1,3 @@ -from typing import List, Literal, get_args, get_origin - from pydantic import BaseModel, model_validator from pydantic_core import PydanticUndefined @@ -9,30 +7,16 @@ 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] = expected_type + data[name] = field.annotation() 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 class Total(ConfModel): """整体""" - # 所在页面 page: str = "init" # 是否已展示帮助文档 @@ -41,43 +25,14 @@ class Total(ConfModel): class UpdatePart(ConfModel): """更新代码""" - # mower-ng 代码分支 branch: str = "slow" # PyPI 仓库镜像 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 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 10766e8..da1c637 100644 --- a/launcher/constants.py +++ b/launcher/constants.py @@ -8,21 +8,14 @@ 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" -) +get_new_version_url = "https://git.zhaozuohong.vip/api/v1/repos/mower-ng/launcher/releases/latest" # 下载地址 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", @@ -30,18 +23,3 @@ 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" - -# cli命令 -cli_command = { - "status": "获取mower-ng实例状态", - "launch": "启动mower-ng进程", - "exit": "停止mower-ng进程", - "kill": "强制退出mower-ng进程", - "start": "开始运行调度器", - "stop": "停止运行调度器", - "webui": "在浏览器中打开网页面板", - "log": "通过WebSocket获取日志", -} diff --git a/launcher/file/download.py b/launcher/file/download.py index 03825f8..2acf26a 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,9 +43,7 @@ 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: @@ -54,25 +52,19 @@ 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 a1c523c..1588c41 100644 --- a/launcher/file/extract.py +++ b/launcher/file/extract.py @@ -37,9 +37,7 @@ 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文件的名称 @@ -54,16 +52,14 @@ def extract_7z_file( 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 b9dd968..9bb040b 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 @@ -20,14 +20,11 @@ def check_command_path(command, cwd=None): """检查命令路径是否存在exe文件 :return 是否存在,命令exe文件全路径 """ - command_name = command.split(" ")[0] - system_command = ["start", "explorer"] - if command_name in system_command: + 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_name)) + ".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/instances/__init__.py b/launcher/instances/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/launcher/instances/manager.py b/launcher/instances/manager.py deleted file mode 100644 index f0ff759..0000000 --- a/launcher/instances/manager.py +++ /dev/null @@ -1,129 +0,0 @@ -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/log.py b/launcher/log.py index 7588b05..1797c98 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 b7be326..94853c0 100644 --- a/launcher/sys_config/__init__.py +++ b/launcher/sys_config/__init__.py @@ -7,7 +7,6 @@ class SysConfig: """ 读取系统配置文件 """ - # 版本 version: str # ui路径 @@ -23,25 +22,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/sys_config/config_dist.json b/launcher/sys_config/config_dist.json index 499fad5..b382c15 100644 --- a/launcher/sys_config/config_dist.json +++ b/launcher/sys_config/config_dist.json @@ -1,6 +1,6 @@ { - "version": "v0.7.1", + "version": "v0.5", "url": "ui/dist/index.html", - "log_level": "INFO", + "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 e42e05a..d74400e 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": "DEBUG", + "log_level": "INFO", "debug": true } \ No newline at end of file diff --git a/launcher/utils.py b/launcher/utils.py deleted file mode 100644 index bb56ecc..0000000 --- a/launcher/utils.py +++ /dev/null @@ -1,12 +0,0 @@ -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/__init__.py b/launcher/webview/__init__.py index 09ae4d6..1129706 100644 --- a/launcher/webview/__init__.py +++ b/launcher/webview/__init__.py @@ -8,11 +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(), - 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()) + webview.start(debug=sys_config.get('debug')) diff --git a/launcher/webview/api.py b/launcher/webview/api.py index 8bb62a3..a869430 100644 --- a/launcher/webview/api.py +++ b/launcher/webview/api.py @@ -1,8 +1,7 @@ import io import os -import shutil import subprocess -import time +import threading from _winapi import CREATE_NO_WINDOW from pathlib import Path from shutil import rmtree @@ -11,46 +10,28 @@ 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, - instances_folder_name, - mower_ng_git_url, - cli_command, -) +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, 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", build_base_url(download_git_url), os.getcwd() - ), - "download_python": lambda: init_download( - "python", build_base_url(download_python_url), os.getcwd() - ), + "download_git": lambda: init_download("git", download_git_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": 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", + "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", "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", "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}"', - "cli": lambda path, - command: f'..\\python\\pythonw -X utf8 cli.py -p "{path}" {command}', + "webview": "start ..\\python\\pythonw webview_ui.py", + "manager": "start ..\\python\\pythonw manager.py", } @@ -68,24 +49,34 @@ def parse_stderr(stderr_output): return "未定义的错误" -def check_command_end(command_key, output): - end_keywords = {"webview": {"WebSocket客户端建立连接": "mower_ng已成功运行"}} - if command_key in end_keywords: - keywords = end_keywords[command_key] - for keyword in keywords: - if keyword in output: - custom_event(LogType.info, keywords[keyword]) - return True - return False +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').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') + 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() class Api: + def load_config(self): - logger.debug("读取配置文件") + logger.info("读取配置文件") return config.conf.model_dump() def save_config(self, conf): - logger.debug(f"更新配置文件{conf}") + logger.info(f"更新配置文件{conf}") config.conf = config.Conf(**conf) config.save_conf() @@ -94,13 +85,14 @@ class Api: def get_new_version(self): logger.info("获取最新版本号") - response = requests.get(build_base_url(get_new_version_url)) + response = requests.get(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}") + file_name = os.path.basename(download_url) + file_name = "launcher.7z" current_path = os.getcwd() download_tmp_folder = os.path.join(current_path, "download_tmp") # 确保 download_tmp 文件夹存在 @@ -152,13 +144,10 @@ class Api: except Exception as e: return repr(e) - def run(self, command_key, cwd=None, params={}): - command = command_list[command_key] + def run(self, command, cwd=None): + command = command_list[command] if callable(command): - try: - command = command(**params) - except TypeError: - command = command() + command = command() if callable(command): return "success" if command() else "failed" if cwd is not None: @@ -167,46 +156,23 @@ 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.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, stdout_stderr)) - def process_lines(text_io): - 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 + stdout_thread.start() + stderr_thread.start() - 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" - ) - process_lines(text_io) - finally: - text_io.close() + stdout_thread.join() + stderr_thread.join() if p.returncode == 0: return "success" @@ -218,90 +184,3 @@ 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 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() - - 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}") - - 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}") - - def cli_control(self, command: str, path: str): - """ - 统一的CLI控制接口，用于执行指定命令并可选地指定工作目录。 - - :param command_str: 要执行的命令字符串或命令键（如 "status", "launch" 等） - :param path: 实例路径 - """ - if command not in cli_command: - custom_event( - LogType.error, - f"无效的命令字符串或命令键：{command}，请检查输入。", - ) - return - try: - ret = self.run("cli", "mower-ng", {"command": command, "path": path}) - if command == "launch" and ret == "success": - self.run("cli", "mower-ng", {"command": "webui", "path": path}) - except Exception as e: - custom_event(LogType.error, f"{cli_command[command]} 失败 {repr(e)}") - - def batch_cli_control(self, command): - 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"}] - - for instance in checked_instances: - try: - custom_event(LogType.info, f"{instance.name} {cli_command[command]}") - self.cli_control(command, instance.path) - custom_event( - LogType.info, f"{instance.name} {cli_command[command]} 完成" - ) - except Exception as e: - custom_event( - LogType.error, - f"{instance.name} {cli_command[command]} 失败 {repr(e)}", - ) diff --git a/ui/src/App.vue b/ui/src/App.vue index eb2e815..06d73a2 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -34,19 +34,15 @@ 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' }) - }) - }, - { deep: true } -) +watch(log, () => { + nextTick(() => { + log_ele.value?.scrollTo({ position: 'bottom' }) + }) +}) onMounted(() => { if (window.pywebview && pywebview.api) { @@ -57,15 +53,12 @@ onMounted(() => { }) } window.addEventListener('log', (e) => { - log.value.push(e.detail.log) - if (log.value.length > 200) { - log.value.shift() - } + log.value += e.detail.log }) }) function set_page(value) { - log.value.splice(0) + log.value = '' } const running = ref(false) @@ -96,7 +89,6 @@ provide('new_version', new_version) class="container" v-model:value="conf.page" @update:value="set_page" - justify-content="center" > @@ -104,17 +96,15 @@ provide('new_version', new_version) @@ -127,17 +117,4 @@ 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/BaseMirrorOption.vue b/ui/src/components/BaseMirrorOption.vue deleted file mode 100644 index 8d1037d..0000000 --- a/ui/src/components/BaseMirrorOption.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/ui/src/components/FloatButton.vue b/ui/src/components/FloatButton.vue index de0ff86..06f16c1 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 b16c676..7fc5d72 100644 --- a/ui/src/components/LogComponent.vue +++ b/ui/src/components/LogComponent.vue @@ -5,44 +5,27 @@ 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: /$/, - returnBegin: true, - returnEnd: true, - contains: [chinesePattern] + begin: /\[信息\]/, + end: /$/ }, { className: 'error', - begin: /^\[错误\]/, - end: /$/, - returnBegin: true, - returnEnd: true, - contains: [chinesePattern] + begin: /\[错误\]/, + end: /$/ }, { className: 'execute_command', - begin: /^\[执行命令\]/, - end: /$/, - returnBegin: true, - returnEnd: true, - contains: [chinesePattern] + begin: /\[执行命令\]/, + end: /$/ }, { className: 'command_out', - begin: /^\[命令输出\]/, - end: /$/, - returnBegin: true, - returnEnd: true, - contains: [chinesePattern] + begin: /\[命令输出\]/, + end: /$/ } ] })) @@ -51,7 +34,7 @@ hljs.registerLanguage('naive-log', () => ({ @@ -71,3 +54,22 @@ hljs.registerLanguage('naive-log', () => ({ user-select: text; } + + diff --git a/ui/src/main.js b/ui/src/main.js index 647f8a5..e8343a7 100644 --- a/ui/src/main.js +++ b/ui/src/main.js @@ -1,5 +1,5 @@ +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/Init.vue b/ui/src/pages/Init.vue index 0120bfe..ac577ad 100644 --- a/ui/src/pages/Init.vue +++ b/ui/src/pages/Init.vue @@ -1,6 +1,4 @@ diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue index 89c3209..cd21d17 100644 --- a/ui/src/pages/Settings.vue +++ b/ui/src/pages/Settings.vue @@ -1,7 +1,5 @@