From 95762bdddd403add00487805d064cd35372a545f Mon Sep 17 00:00:00 2001 From: HibiKier <45528451+HibiKier@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E8=A7=A3=E5=8E=8B=E4=B8=8E=E6=8C=82=E8=BD=BD=20(#1619?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/web_ui/public/__init__.py | 2 +- zhenxun/builtin_plugins/web_ui/public/data_source.py | 2 +- zhenxun/configs/utils/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zhenxun/builtin_plugins/web_ui/public/__init__.py b/zhenxun/builtin_plugins/web_ui/public/__init__.py index 7fea2e28..b4c51879 100644 --- a/zhenxun/builtin_plugins/web_ui/public/__init__.py +++ b/zhenxun/builtin_plugins/web_ui/public/__init__.py @@ -25,7 +25,7 @@ async def init_public(app: FastAPI): if not PUBLIC_PATH.exists(): folders = await update_webui_assets() else: - folders = [x.name for x in PUBLIC_PATH.iterdir()] + folders = [x.name for x in PUBLIC_PATH.iterdir() if x.is_dir()] app.include_router(router) for pathname in folders: logger.debug(f"挂载文件夹: {pathname}") diff --git a/zhenxun/builtin_plugins/web_ui/public/data_source.py b/zhenxun/builtin_plugins/web_ui/public/data_source.py index 9081265f..8134433c 100644 --- a/zhenxun/builtin_plugins/web_ui/public/data_source.py +++ b/zhenxun/builtin_plugins/web_ui/public/data_source.py @@ -35,7 +35,7 @@ def _file_handle(webui_assets_path: Path): logger.debug("解压 webui_assets 成功...", COMMAND_NAME) else: raise Exception("解压 webui_assets 失败,文件不存在...", COMMAND_NAME) - download_file_path = TMP_PATH / next(iter(TMP_PATH.iterdir())) + 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) diff --git a/zhenxun/configs/utils/__init__.py b/zhenxun/configs/utils/__init__.py index d23549bb..82d7ebca 100644 --- a/zhenxun/configs/utils/__init__.py +++ b/zhenxun/configs/utils/__init__.py @@ -441,7 +441,7 @@ class ConfigsManager: self._data[module] = config_group logger.info( f"加载配置完成,共加载 {len(temp_data)} 个配置组及对应" - " {count} 个配置项" + f" {count} 个配置项" ) def get_data(self) -> dict[str, ConfigGroup]: