From d7747e3b0efb201405678a633f369dce4716a96b Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Tue, 5 Aug 2025 10:37:16 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8Dweb=20zip=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auto_update/test_check_update.py | 118 +++++++++--------- .../builtin_plugins/auto_update/__init__.py | 3 +- .../auto_update/_data_source.py | 2 +- zhenxun/builtin_plugins/web_ui/config.py | 10 -- .../builtin_plugins/web_ui/public/__init__.py | 29 ++--- .../web_ui/public/data_source.py | 44 ------- zhenxun/utils/manager/zhenxun_repo_manager.py | 33 +++-- zhenxun/utils/repo_utils/base_manager.py | 3 +- 8 files changed, 98 insertions(+), 144 deletions(-) delete mode 100644 zhenxun/builtin_plugins/web_ui/public/data_source.py diff --git a/tests/builtin_plugins/auto_update/test_check_update.py b/tests/builtin_plugins/auto_update/test_check_update.py index 832c867c..c40e0cb6 100644 --- a/tests/builtin_plugins/auto_update/test_check_update.py +++ b/tests/builtin_plugins/auto_update/test_check_update.py @@ -65,26 +65,29 @@ def init_mocked_api(mocked_api: MockRouter) -> None: tar_buffer = io.BytesIO() zip_bytes = io.BytesIO() - from zhenxun.builtin_plugins.auto_update.config import ( - PYPROJECT_FILE_STRING, - PYPROJECT_LOCK_FILE_STRING, - REPLACE_FOLDERS, - REQ_TXT_FILE_STRING, - ) + from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager # 指定要添加到压缩文件中的文件路径列表 file_paths: list[str] = [ - PYPROJECT_FILE_STRING, - PYPROJECT_LOCK_FILE_STRING, - REQ_TXT_FILE_STRING, + ZhenxunRepoManager.config.PYPROJECT_FILE_STRING, + ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING, + ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING, ] # 打开一个tarfile对象，写入到上面创建的BytesIO对象中 with tarfile.open(mode="w:gz", fileobj=tar_buffer) as tar: - add_files_and_folders_to_tar(tar, file_paths, folders=REPLACE_FOLDERS) + add_files_and_folders_to_tar( + tar, + file_paths, + folders=ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS, + ) with zipfile.ZipFile(zip_bytes, mode="w", compression=zipfile.ZIP_DEFLATED) as zipf: - add_files_and_folders_to_zip(zipf, file_paths, folders=REPLACE_FOLDERS) + add_files_and_folders_to_zip( + zipf, + file_paths, + folders=ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS, + ) mocked_api.get( url="https://codeload.github.com/HibiKier/zhenxun_bot/legacy.tar.gz/refs/tags/v0.2.2", @@ -199,52 +202,47 @@ def add_directory_to_tar(tarinfo, tar): def init_mocker_path(mocker: MockerFixture, tmp_path: Path): - from zhenxun.builtin_plugins.auto_update.config import ( - PYPROJECT_FILE_STRING, - PYPROJECT_LOCK_FILE_STRING, - REQ_TXT_FILE_STRING, - VERSION_FILE_STRING, - ) + from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager mocker.patch( "zhenxun.utils.manager.virtual_env_package_manager.VirtualEnvPackageManager.install_requirement", return_value=None, ) mock_tmp_path = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.TMP_PATH", + "zhenxun.configs.path_config.TEMP_PATH", new=tmp_path / "auto_update", ) mock_base_path = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.BASE_PATH", + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_CODE_PATH", new=tmp_path / "zhenxun", ) mock_backup_path = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.BACKUP_PATH", + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_BACKUP_PATH", new=tmp_path / "backup", ) mock_download_gz_file = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.DOWNLOAD_GZ_FILE", + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_DOWNLOAD_FILE", new=mock_tmp_path / "download_latest_file.tar.gz", ) mock_download_zip_file = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.DOWNLOAD_ZIP_FILE", + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_UNZIP_PATH", new=mock_tmp_path / "download_latest_file.zip", ) mock_pyproject_file = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.PYPROJECT_FILE", - new=tmp_path / PYPROJECT_FILE_STRING, + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.PYPROJECT_FILE", + new=tmp_path / ZhenxunRepoManager.config.PYPROJECT_FILE_STRING, ) mock_pyproject_lock_file = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.PYPROJECT_LOCK_FILE", - new=tmp_path / PYPROJECT_LOCK_FILE_STRING, + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE", + new=tmp_path / ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING, ) mock_req_txt_file = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.REQ_TXT_FILE", - new=tmp_path / REQ_TXT_FILE_STRING, + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.REQUIREMENTS_FILE", + new=tmp_path / ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING, ) mock_version_file = mocker.patch( - "zhenxun.builtin_plugins.auto_update._data_source.VERSION_FILE", - new=tmp_path / VERSION_FILE_STRING, + "zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE_STRING", + new=tmp_path / ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE_STRING, ) open(mock_version_file, "w").write("__version__: v0.2.2") return ( @@ -271,12 +269,7 @@ async def test_check_update_release( 测试检查更新（release） """ from zhenxun.builtin_plugins.auto_update import _matcher - from zhenxun.builtin_plugins.auto_update.config import ( - PYPROJECT_FILE_STRING, - PYPROJECT_LOCK_FILE_STRING, - REPLACE_FOLDERS, - REQ_TXT_FILE_STRING, - ) + from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager init_mocked_api(mocked_api=mocked_api) @@ -295,7 +288,7 @@ async def test_check_update_release( # 确保目录下有一个子目录，以便 os.listdir() 能返回一个目录名 mock_tmp_path.mkdir(parents=True, exist_ok=True) - for folder in REPLACE_FOLDERS: + for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS: (mock_base_path / folder).mkdir(parents=True, exist_ok=True) mock_pyproject_file.write_bytes(b"") @@ -305,7 +298,7 @@ async def test_check_update_release( async with app.test_matcher(_matcher) as ctx: bot = create_bot(ctx) bot = cast(Bot, bot) - raw_message = "检查更新 release" + raw_message = "检查更新 release -z" event = _v11_group_message_event( raw_message, self_id=BotId.QQ_BOT, @@ -324,14 +317,14 @@ async def test_check_update_release( ctx.should_call_api( "send_msg", _v11_private_message_send( - message="检测真寻已更新，版本更新：v0.2.2\n开始更新...", + message="检测真寻已更新，当前版本：v0.2.2\n开始更新...", user_id=UserId.SUPERUSER, ), ) ctx.should_call_send( event=event, message=Message( - "版本更新完成\n版本: v0.2.2 -> v0.2.2\n请重新启动真寻以完成更新!" + "版本更新完成！\n版本: v0.2.2 -> v0.2.2\n请重新启动真寻以完成更新!" ), result=None, bot=bot, @@ -340,9 +333,13 @@ async def test_check_update_release( assert mocked_api["release_latest"].called assert mocked_api["release_download_url_redirect"].called - assert (mock_backup_path / PYPROJECT_FILE_STRING).exists() - assert (mock_backup_path / PYPROJECT_LOCK_FILE_STRING).exists() - assert (mock_backup_path / REQ_TXT_FILE_STRING).exists() + assert (mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_FILE_STRING).exists() + assert ( + mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING + ).exists() + assert ( + mock_backup_path / ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING + ).exists() assert not mock_download_gz_file.exists() assert not mock_download_zip_file.exists() @@ -351,9 +348,9 @@ async def test_check_update_release( assert mock_pyproject_lock_file.read_bytes() == b"new" assert mock_req_txt_file.read_bytes() == b"new" - for folder in REPLACE_FOLDERS: + for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS: assert not (mock_base_path / folder).exists() - for folder in REPLACE_FOLDERS: + for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS: assert (mock_backup_path / folder).exists() @@ -368,12 +365,7 @@ async def test_check_update_main( 测试检查更新（正式环境） """ from zhenxun.builtin_plugins.auto_update import _matcher - from zhenxun.builtin_plugins.auto_update.config import ( - PYPROJECT_FILE_STRING, - PYPROJECT_LOCK_FILE_STRING, - REPLACE_FOLDERS, - REQ_TXT_FILE_STRING, - ) + from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager init_mocked_api(mocked_api=mocked_api) @@ -391,7 +383,7 @@ async def test_check_update_main( # 确保目录下有一个子目录，以便 os.listdir() 能返回一个目录名 mock_tmp_path.mkdir(parents=True, exist_ok=True) - for folder in REPLACE_FOLDERS: + for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS: (mock_base_path / folder).mkdir(parents=True, exist_ok=True) mock_pyproject_file.write_bytes(b"") @@ -401,7 +393,7 @@ async def test_check_update_main( async with app.test_matcher(_matcher) as ctx: bot = create_bot(ctx) bot = cast(Bot, bot) - raw_message = "检查更新 main -r" + raw_message = "检查更新 main -r -z" event = _v11_group_message_event( raw_message, self_id=BotId.QQ_BOT, @@ -420,26 +412,30 @@ async def test_check_update_main( ctx.should_call_api( "send_msg", _v11_private_message_send( - message="检测真寻已更新，版本更新：v0.2.2\n开始更新...", + message="检测真寻已更新，当前版本：v0.2.2\n开始更新...", user_id=UserId.SUPERUSER, ), ) ctx.should_call_send( event=event, message=Message( - "版本更新完成\n" + "版本更新完成！\n" "版本: v0.2.2 -> v0.2.2-e6f17c4\n" "请重新启动真寻以完成更新!\n" - "资源文件更新成功！" + "真寻资源更新完成!" ), result=None, bot=bot, ) ctx.should_finished(_matcher) assert mocked_api["main_download_url"].called - assert (mock_backup_path / PYPROJECT_FILE_STRING).exists() - assert (mock_backup_path / PYPROJECT_LOCK_FILE_STRING).exists() - assert (mock_backup_path / REQ_TXT_FILE_STRING).exists() + assert (mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_FILE_STRING).exists() + assert ( + mock_backup_path / ZhenxunRepoManager.config.PYPROJECT_LOCK_FILE_STRING + ).exists() + assert ( + mock_backup_path / ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING + ).exists() assert not mock_download_gz_file.exists() assert not mock_download_zip_file.exists() @@ -448,7 +444,7 @@ async def test_check_update_main( assert mock_pyproject_lock_file.read_bytes() == b"new" assert mock_req_txt_file.read_bytes() == b"new" - for folder in REPLACE_FOLDERS: + for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS: assert (mock_base_path / folder).exists() - for folder in REPLACE_FOLDERS: + for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS: assert (mock_backup_path / folder).exists() diff --git a/zhenxun/builtin_plugins/auto_update/__init__.py b/zhenxun/builtin_plugins/auto_update/__init__.py index e29efa90..0595066c 100644 --- a/zhenxun/builtin_plugins/auto_update/__init__.py +++ b/zhenxun/builtin_plugins/auto_update/__init__.py @@ -110,7 +110,8 @@ async def _( try: result += await UpdateManager.update_webui( source_str, # type: ignore - "dist", + "test", + True, ) except Exception as e: logger.error("WebUI更新失败...", "检查更新", session=session, e=e) diff --git a/zhenxun/builtin_plugins/auto_update/_data_source.py b/zhenxun/builtin_plugins/auto_update/_data_source.py index 62d2edab..f7752062 100644 --- a/zhenxun/builtin_plugins/auto_update/_data_source.py +++ b/zhenxun/builtin_plugins/auto_update/_data_source.py @@ -34,7 +34,7 @@ class UpdateManager: async def update_webui( cls, source: Literal["git", "ali"] | None, - branch: str = "main", + branch: str = "dist", force: bool = False, ): """更新WebUI diff --git a/zhenxun/builtin_plugins/web_ui/config.py b/zhenxun/builtin_plugins/web_ui/config.py index 4a88aad9..8182b60d 100644 --- a/zhenxun/builtin_plugins/web_ui/config.py +++ b/zhenxun/builtin_plugins/web_ui/config.py @@ -8,16 +8,6 @@ if sys.version_info >= (3, 11): else: from strenum import StrEnum -from zhenxun.configs.path_config import DATA_PATH, TEMP_PATH - -WEBUI_STRING = "web_ui" -PUBLIC_STRING = "public" - -WEBUI_DATA_PATH = DATA_PATH / WEBUI_STRING -PUBLIC_PATH = WEBUI_DATA_PATH / PUBLIC_STRING -TMP_PATH = TEMP_PATH / WEBUI_STRING - -WEBUI_DIST_GITHUB_URL = "https://github.com/HibiKier/zhenxun_bot_webui/tree/dist" app = nonebot.get_app() diff --git a/zhenxun/builtin_plugins/web_ui/public/__init__.py b/zhenxun/builtin_plugins/web_ui/public/__init__.py index 53d4914e..76e73538 100644 --- a/zhenxun/builtin_plugins/web_ui/public/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/public/__init__.py @@ -3,41 +3,38 @@ from fastapi.responses import FileResponse from fastapi.staticfiles import StaticFiles from zhenxun.services.log import logger - -from ..config import PUBLIC_PATH -from .data_source import COMMAND_NAME, update_webui_assets +from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager router = APIRouter() @router.get("/") async def index(): - return FileResponse(PUBLIC_PATH / "index.html") + return FileResponse(ZhenxunRepoManager.config.WEBUI_PATH / "index.html") @router.get("/favicon.ico") async def favicon(): - return FileResponse(PUBLIC_PATH / "favicon.ico") - - -@router.get("/79edfa81f3308a9f.jfif") -async def _(): - return FileResponse(PUBLIC_PATH / "79edfa81f3308a9f.jfif") + return FileResponse(ZhenxunRepoManager.config.WEBUI_PATH / "favicon.ico") async def init_public(app: FastAPI): try: - if not PUBLIC_PATH.exists(): - folders = await update_webui_assets() - else: - folders = [x.name for x in PUBLIC_PATH.iterdir() if x.is_dir()] + if not ZhenxunRepoManager.check_webui_exists(): + await ZhenxunRepoManager.webui_update(branch="test") + folders = [ + x.name for x in ZhenxunRepoManager.config.WEBUI_PATH.iterdir() if x.is_dir() + ] app.include_router(router) for pathname in folders: logger.debug(f"挂载文件夹: {pathname}") app.mount( f"/{pathname}", - StaticFiles(directory=PUBLIC_PATH / pathname, check_dir=True), + StaticFiles( + directory=ZhenxunRepoManager.config.WEBUI_PATH / pathname, + check_dir=True, + ), name=f"public_{pathname}", ) except Exception as e: - logger.error("初始化 WebUI资源 失败", COMMAND_NAME, e=e) + logger.error("初始化 WebUI资源 失败", "WebUI", e=e) diff --git a/zhenxun/builtin_plugins/web_ui/public/data_source.py b/zhenxun/builtin_plugins/web_ui/public/data_source.py deleted file mode 100644 index 51b29533..00000000 --- a/zhenxun/builtin_plugins/web_ui/public/data_source.py +++ /dev/null @@ -1,44 +0,0 @@ -from pathlib import Path -import shutil -import zipfile - -from nonebot.utils import run_sync - -from zhenxun.services.log import logger -from zhenxun.utils.github_utils import GithubUtils -from zhenxun.utils.http_utils import AsyncHttpx - -from ..config import PUBLIC_PATH, TMP_PATH, WEBUI_DIST_GITHUB_URL - -COMMAND_NAME = "WebUI资源管理" - - -async def update_webui_assets(): - webui_assets_path = TMP_PATH / "webui_assets.zip" - download_url = await GithubUtils.parse_github_url( - WEBUI_DIST_GITHUB_URL - ).get_archive_download_urls() - logger.info("开始下载 webui_assets 资源...", COMMAND_NAME) - if await AsyncHttpx.download_file( - download_url, webui_assets_path, follow_redirects=True - ): - logger.info("下载 webui_assets 成功...", COMMAND_NAME) - return await _file_handle(webui_assets_path) - raise Exception("下载 webui_assets 失败", COMMAND_NAME) - - -@run_sync -def _file_handle(webui_assets_path: Path): - logger.debug("开始解压 webui_assets...", COMMAND_NAME) - if webui_assets_path.exists(): - tf = zipfile.ZipFile(webui_assets_path) - tf.extractall(TMP_PATH) - logger.debug("解压 webui_assets 成功...", COMMAND_NAME) - else: - raise Exception("解压 webui_assets 失败，文件不存在...", COMMAND_NAME) - download_file_path = next(f for f in TMP_PATH.iterdir() if f.is_dir()) - shutil.rmtree(PUBLIC_PATH, ignore_errors=True) - shutil.copytree(download_file_path / "dist", PUBLIC_PATH, dirs_exist_ok=True) - logger.debug("复制 webui_assets 成功...", COMMAND_NAME) - shutil.rmtree(TMP_PATH, ignore_errors=True) - return [x.name for x in PUBLIC_PATH.iterdir() if x.is_dir()] diff --git a/zhenxun/utils/manager/zhenxun_repo_manager.py b/zhenxun/utils/manager/zhenxun_repo_manager.py index 3db37540..145e8b52 100644 --- a/zhenxun/utils/manager/zhenxun_repo_manager.py +++ b/zhenxun/utils/manager/zhenxun_repo_manager.py @@ -65,7 +65,7 @@ class ZhenxunRepoConfig: # WEB UI 相关配置 WEBUI_GIT = "https://github.com/HibiKier/zhenxun_bot_webui.git" - WEBUI_DIST_GITHUB_URL = "https://github.com/HibiKier/zhenxun_bot_webui/tree/dist" + WEBUI_DIST_GITHUB_URL = "https://github.com/HibiKier/zhenxun_bot_webui/tree/test" WEBUI_DOWNLOAD_FILE_STRING = "webui_assets.zip" WEBUI_DOWNLOAD_FILE = TEMP_PATH / WEBUI_DOWNLOAD_FILE_STRING WEBUI_UNZIP_PATH = TEMP_PATH / "web_ui" @@ -85,6 +85,12 @@ class ZhenxunRepoConfig: REQUIREMENTS_FILE_STRING = "requirements.txt" REQUIREMENTS_FILE = Path() / REQUIREMENTS_FILE_STRING + PYPROJECT_FILE_STRING = "pyproject.toml" + PYPROJECT_FILE = Path() / PYPROJECT_FILE_STRING + + PYPROJECT_LOCK_FILE_STRING = "poetry.lock" + PYPROJECT_LOCK_FILE = Path() / PYPROJECT_LOCK_FILE_STRING + class ZhenxunRepoManagerClass: """真寻仓库管理器""" @@ -99,6 +105,8 @@ class ZhenxunRepoManagerClass: 参数: folder_path: 文件夹路径 """ + if not folder_path.exists(): + return for filename in os.listdir(folder_path): file_path = folder_path / filename try: @@ -347,7 +355,7 @@ class ZhenxunRepoManagerClass: bool: 是否存在 """ if self.config.RESOURCE_PATH.exists(): - font_path = self.config.RESOURCE_PATH / "fonts" + font_path = self.config.RESOURCE_PATH / "font" if font_path.exists() and os.listdir(font_path): return True return False @@ -438,10 +446,16 @@ class ZhenxunRepoManagerClass: # ==================== Web UI 管理相关方法 ==================== + def check_webui_exists(self) -> bool: + """检查 Web UI 资源是否存在""" + return bool( + self.config.WEBUI_PATH.exists() and os.listdir(self.config.WEBUI_PATH) + ) + async def webui_download_zip(self): """下载 WEBUI_ASSETS 资源""" download_url = await GithubUtils.parse_github_url( - self.config.WEBUI_GIT + self.config.WEBUI_DIST_GITHUB_URL ).get_archive_download_urls() logger.info("开始下载 WEBUI_ASSETS 资源...", LOG_COMMAND) if await AsyncHttpx.download_file( @@ -469,16 +483,17 @@ class ZhenxunRepoManagerClass: str: 更新结果 """ if not self.config.WEBUI_DOWNLOAD_FILE.exists(): - raise FileNotFoundError("备份webui文件夹不存在") + raise FileNotFoundError("webui文件压缩包不存在") tf = None try: self.__backup_webui() self.__clear_folder(self.config.WEBUI_PATH) tf = zipfile.ZipFile(self.config.WEBUI_DOWNLOAD_FILE) tf.extractall(self.config.WEBUI_UNZIP_PATH) - logger.debug("解压文件压缩包完成...", LOG_COMMAND) - self.__copy_files(self.config.WEBUI_UNZIP_PATH, self.config.WEBUI_PATH) - logger.debug("复制 WEBUI_ASSETS 成功!", LOG_COMMAND) + logger.debug("Web UI 解压文件压缩包完成...", LOG_COMMAND) + unzip_dir = next(self.config.WEBUI_UNZIP_PATH.iterdir()) + self.__copy_files(unzip_dir, self.config.WEBUI_PATH) + logger.debug("Web UI 复制 WEBUI_ASSETS 成功!", LOG_COMMAND) shutil.rmtree(self.config.WEBUI_UNZIP_PATH, ignore_errors=True) except Exception as e: if self.config.WEBUI_BACKUP_PATH.exists(): @@ -497,7 +512,7 @@ class ZhenxunRepoManagerClass: await self.webui_unzip() async def webui_git_update( - self, source: Literal["git", "ali"], branch: str = "main", force: bool = False + self, source: Literal["git", "ali"], branch: str = "dist", force: bool = False ) -> RepoUpdateResult: """使用git或阿里云更新 Web UI @@ -524,7 +539,7 @@ class ZhenxunRepoManagerClass: async def webui_update( self, source: Literal["git", "ali"] = "ali", - branch: str = "main", + branch: str = "dist", force: bool = False, ): """更新 Web UI diff --git a/zhenxun/utils/repo_utils/base_manager.py b/zhenxun/utils/repo_utils/base_manager.py index aa69dff7..efe306b6 100644 --- a/zhenxun/utils/repo_utils/base_manager.py +++ b/zhenxun/utils/repo_utils/base_manager.py @@ -285,9 +285,8 @@ class BaseRepoManager(ABC): # 如果目录存在，检查是否是Git仓库 # 首先检查目录本身是否有.git文件夹 git_dir = local_path / ".git" - is_git_repo = git_dir.exists() and git_dir.is_dir() - if not is_git_repo: + if not git_dir.is_dir(): # 如果不是Git仓库，尝试初始化它 logger.info(f"目录 {local_path} 不是Git仓库，尝试初始化", LOG_COMMAND) init_success, _, init_stderr = await run_git_command(