✨ webui与resources支持git更新

zhenxun/utils/manager/resource_manager.py

@@ -3,12 +3,14 @@ from pathlib import Path
 import shutil
 import zipfile
 
-from zhenxun.configs.path_config import FONT_PATH
+from zhenxun.configs.path_config import FONT_PATH, TEMP_PATH
 from zhenxun.services.log import logger
 from zhenxun.utils.github_utils import GithubUtils
 from zhenxun.utils.http_utils import AsyncHttpx
+from zhenxun.utils.repo_utils import AliyunRepoManager, GithubRepoManager
+from zhenxun.utils.repo_utils.utils import clean_git
 
-CMD_STRING = "ResourceManager"
+LOG_COMMAND = "ResourceManager"
 
 
 class DownloadResourceException(Exception):
@@ -20,29 +22,41 @@ class ResourceManager:
 
     RESOURCE_PATH = Path() / "resources"
 
-    TMP_PATH = Path() / "_resource_tmp"
+    TMP_PATH = TEMP_PATH / "_resource_tmp"
 
     ZIP_FILE = TMP_PATH / "resources.zip"
 
     UNZIP_PATH = None
 
     @classmethod
-    async def init_resources(cls, force: bool = False):
+    async def init_resources(
+        cls, force: bool = False, is_zip: bool = False, git_source: str = "ali"
+    ):
         if (FONT_PATH.exists() and os.listdir(FONT_PATH)) and not force:
             return
         if cls.TMP_PATH.exists():
             logger.debug(
-                "resources临时文件夹已存在，移除resources临时文件夹", CMD_STRING
+                "resources临时文件夹已存在，移除resources临时文件夹", LOG_COMMAND
             )
-            shutil.rmtree(cls.TMP_PATH)
-        cls.TMP_PATH.mkdir(parents=True, exist_ok=True)
-        try:
-            await cls.__download_resources()
+            await clean_git(cls.TMP_PATH)
+            shutil.rmtree(cls.TMP_PATH, ignore_errors=True)
+        if is_zip:
+            cls.TMP_PATH.mkdir(parents=True, exist_ok=True)
+            try:
+                await cls.__download_resources()
+                cls.file_handle()
+            except Exception as e:
+                logger.error("获取resources资源包失败", LOG_COMMAND, e=e)
+        else:
+            if git_source == "ali":
+                await AliyunRepoManager.update(cls.GITHUB_URL, cls.TMP_PATH)
+            else:
+                await GithubRepoManager.update(cls.GITHUB_URL, cls.TMP_PATH)
+            cls.UNZIP_PATH = cls.TMP_PATH / "resources"
             cls.file_handle()
-        except Exception as e:
-            logger.error("获取resources资源包失败", CMD_STRING, e=e)
         if cls.TMP_PATH.exists():
-            logger.debug("移除resources临时文件夹", CMD_STRING)
+            logger.debug("移除resources临时文件夹", LOG_COMMAND)
+            await clean_git(cls.TMP_PATH)
             shutil.rmtree(cls.TMP_PATH)
 
     @classmethod
@@ -68,17 +82,17 @@ class ResourceManager:
         """获取resources文件夹"""
         repo_info = GithubUtils.parse_github_url(cls.GITHUB_URL)
         url = await repo_info.get_archive_download_urls()
-        logger.debug("开始下载resources资源包...", CMD_STRING)
+        logger.debug("开始下载resources资源包...", LOG_COMMAND)
         if not await AsyncHttpx.download_file(url, cls.ZIP_FILE, stream=True):
             logger.error(
                 "下载resources资源包失败，请尝试重启重新下载或前往 "
                 "https://github.com/zhenxun-org/zhenxun-bot-resources 手动下载..."
             )
             raise DownloadResourceException("下载resources资源包失败...")
-        logger.debug("下载resources资源文件压缩包完成...", CMD_STRING)
+        logger.debug("下载resources资源文件压缩包完成...", LOG_COMMAND)
         tf = zipfile.ZipFile(cls.ZIP_FILE)
         tf.extractall(cls.TMP_PATH)
-        logger.debug("解压文件压缩包完成...", CMD_STRING)
+        logger.debug("解压文件压缩包完成...", LOG_COMMAND)
         download_file_path = cls.TMP_PATH / next(
             x for x in os.listdir(cls.TMP_PATH) if (cls.TMP_PATH / x).is_dir()
         )