🔨 提取GitHub相关操作

HibiKier · Sep 7, 2024 · d379e3a · d379e3a
1 parent fe11ff0
commit d379e3a
Show file tree

Hide file tree

Showing 14 changed files with 401 additions and 318 deletions.
diff --git a/tests/builtin_plugins/auto_update/test_check_update.py b/tests/builtin_plugins/auto_update/test_check_update.py
@@ -26,6 +26,20 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
         url="https://api.github.com/repos/HibiKier/zhenxun_bot/releases/latest",
         name="release_latest",
     ).respond(json=get_response_json("release_latest.json"))
+
+    mocked_api.head(
+        url="https://raw.githubusercontent.com/",
+        name="head_raw",
+    ).respond(text="")
+    mocked_api.head(
+        url="https://github.com/",
+        name="head_github",
+    ).respond(text="")
+    mocked_api.head(
+        url="https://codeload.github.com/",
+        name="head_codeload",
+    ).respond(text="")
+
     mocked_api.get(
         url="https://raw.githubusercontent.com/HibiKier/zhenxun_bot/dev/__version__",
         name="dev_branch_version",
@@ -75,13 +89,13 @@ def init_mocked_api(mocked_api: MockRouter) -> None:
         content=tar_buffer.getvalue(),
     )
     mocked_api.get(
-        url="https://ghproxy.cc/https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/dev.zip",
+        url="https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/dev.zip",
         name="dev_download_url",
     ).respond(
         content=zip_bytes.getvalue(),
     )
     mocked_api.get(
-        url="https://ghproxy.cc/https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/main.zip",
+        url="https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/main.zip",
         name="main_download_url",
     ).respond(
         content=zip_bytes.getvalue(),
@@ -306,7 +320,6 @@ async def test_check_update_release(
         )
         ctx.should_finished(_matcher)
     assert mocked_api["release_latest"].called
-    assert mocked_api["release_download_url"].called
     assert mocked_api["release_download_url_redirect"].called
 
     assert (mock_backup_path / PYPROJECT_FILE_STRING).exists()

diff --git a/zhenxun/builtin_plugins/auto_update/_data_source.py b/zhenxun/builtin_plugins/auto_update/_data_source.py
@@ -10,10 +10,10 @@
 from zhenxun.services.log import logger
 from zhenxun.utils.http_utils import AsyncHttpx
 from zhenxun.utils.platform import PlatformUtils
+from zhenxun.utils.github_utils.models import RepoInfo
+from zhenxun.utils.github_utils import parse_github_url
 
 from .config import (
-    DEV_URL,
-    MAIN_URL,
     TMP_PATH,
     BASE_PATH,
     BACKUP_PATH,
@@ -25,6 +25,7 @@
     BASE_PATH_STRING,
     DOWNLOAD_GZ_FILE,
     DOWNLOAD_ZIP_FILE,
+    DEFAULT_GITHUB_URL,
     PYPROJECT_LOCK_FILE,
     REQ_TXT_FILE_STRING,
     PYPROJECT_FILE_STRING,
@@ -169,23 +170,19 @@ async def update(cls, bot: Bot, user_id: str, version_type: str) -> str | None:
         cur_version = cls.__get_version()
         url = None
         new_version = None
-        if version_type == "dev":
-            url = DEV_URL
-            new_version = await cls.__get_version_from_branch("dev")
-            if new_version:
-                new_version = new_version.split(":")[-1].strip()
-        elif version_type == "main":
-            url = MAIN_URL
-            new_version = await cls.__get_version_from_branch("main")
+        repo_info = parse_github_url(DEFAULT_GITHUB_URL)
+        if version_type in {"dev", "main"}:
+            repo_info.branch = version_type
+            new_version = await cls.__get_version_from_repo(repo_info)
             if new_version:
                 new_version = new_version.split(":")[-1].strip()
+            url = await repo_info.get_archive_download_url()
         elif version_type == "release":
             data = await cls.__get_latest_data()
             if not data:
                 return "获取更新版本失败..."
-            url = data.get("tarball_url")
-            new_version = data.get("name")
-            url = (await AsyncHttpx.get(url)).headers.get("Location")  # type: ignore
+            new_version = data.get("name", "")
+            url = await repo_info.get_release_source_download_url_tgz(new_version)
         if not url:
             return "获取版本下载链接失败..."
         if TMP_PATH.exists():
@@ -247,7 +244,7 @@ async def __get_latest_data(cls) -> dict:
         return {}
 
     @classmethod
-    async def __get_version_from_branch(cls, branch: str) -> str:
+    async def __get_version_from_repo(cls, repo_info: RepoInfo) -> str:
         """从指定分支获取版本号
 
         参数:
@@ -256,11 +253,11 @@ async def __get_version_from_branch(cls, branch: str) -> str:
         返回:
             str: 版本号
         """
-        version_url = f"https://raw.githubusercontent.com/HibiKier/zhenxun_bot/{branch}/__version__"
+        version_url = await repo_info.get_raw_download_url(path="__version__")
         try:
             res = await AsyncHttpx.get(version_url)
             if res.status_code == 200:
                 return res.text.strip()
         except Exception as e:
-            logger.error(f"获取 {branch} 分支版本失败", e=e)
+            logger.error(f"获取 {repo_info.branch} 分支版本失败", e=e)
         return "未知版本"
diff --git a/zhenxun/builtin_plugins/auto_update/config.py b/zhenxun/builtin_plugins/auto_update/config.py
@@ -2,8 +2,7 @@
 
 from zhenxun.configs.path_config import TEMP_PATH
 
-DEV_URL = "https://ghproxy.cc/https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/dev.zip"
-MAIN_URL = "https://ghproxy.cc/https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/main.zip"
+DEFAULT_GITHUB_URL = "https://github.com/HibiKier/zhenxun_bot/tree/main"
 RELEASE_URL = "https://api.github.com/repos/HibiKier/zhenxun_bot/releases/latest"
 
 VERSION_FILE_STRING = "__version__"
@@ -23,8 +22,10 @@
 
 BACKUP_PATH = Path() / "backup"
 
-DOWNLOAD_GZ_FILE = TMP_PATH / "download_latest_file.tar.gz"
-DOWNLOAD_ZIP_FILE = TMP_PATH / "download_latest_file.zip"
+DOWNLOAD_GZ_FILE_STRING = "download_latest_file.tar.gz"
+DOWNLOAD_ZIP_FILE_STRING = "download_latest_file.zip"
+DOWNLOAD_GZ_FILE = TMP_PATH / DOWNLOAD_GZ_FILE_STRING
+DOWNLOAD_ZIP_FILE = TMP_PATH / DOWNLOAD_ZIP_FILE_STRING
 
 REPLACE_FOLDERS = [
     "builtin_plugins",

diff --git a/zhenxun/builtin_plugins/plugin_store/config.py b/zhenxun/builtin_plugins/plugin_store/config.py
@@ -1,4 +1,3 @@
-import re
 from pathlib import Path
 
 BASE_PATH = Path() / "zhenxun"
@@ -10,21 +9,3 @@
 
 EXTRA_GITHUB_URL = "https://github.com/zhenxun-org/zhenxun_bot_plugins_index/tree/index"
 """插件库索引github仓库地址"""
-
-GITHUB_REPO_URL_PATTERN = re.compile(
-    r"^https://github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+)(/tree/(?P<branch>[^/]+))?$"
-)
-"""github仓库地址正则"""
-
-JSD_PACKAGE_API_FORMAT = (
-    "https://data.jsdelivr.com/v1/packages/gh/{owner}/{repo}@{branch}"
-)
-"""jsdelivr包地址格式"""
-
-GIT_API_TREES_FORMAT = (
-    "https://api.github.com/repos/{owner}/{repo}/git/trees/{branch}?recursive=1"
-)
-"""git api trees地址格式"""
-
-CACHED_API_TTL = 300
-"""缓存api ttl"""
diff --git a/zhenxun/builtin_plugins/plugin_store/data_source.py b/zhenxun/builtin_plugins/plugin_store/data_source.py
@@ -8,14 +8,11 @@
 from zhenxun.services.log import logger
 from zhenxun.utils.http_utils import AsyncHttpx
 from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.utils.github_utils import parse_github_url
+from zhenxun.utils.github_utils.models import BaseAPI, PackageApi
+from zhenxun.builtin_plugins.plugin_store.models import StorePluginInfo
 from zhenxun.utils.image_utils import RowStyle, BuildImage, ImageTemplate
 from zhenxun.builtin_plugins.auto_update.config import REQ_TXT_FILE_STRING
-from zhenxun.builtin_plugins.plugin_store.models import (
-    BaseAPI,
-    RepoInfo,
-    PackageApi,
-    StorePluginInfo,
-)
 
 from .config import BASE_PATH, EXTRA_GITHUB_URL, DEFAULT_GITHUB_URL
 
@@ -81,12 +78,12 @@ async def __get_data(cls) -> dict[str, StorePluginInfo]:
         返回:
             dict: 插件信息数据
         """
-        default_github_url = await RepoInfo.parse_github_url(
+        default_github_url = await parse_github_url(
             DEFAULT_GITHUB_URL
-        ).get_download_url_with_path("plugins.json")
-        extra_github_url = await RepoInfo.parse_github_url(
+        ).get_raw_download_url("plugins.json")
+        extra_github_url = await parse_github_url(
             EXTRA_GITHUB_URL
-        ).get_download_url_with_path("plugins.json")
+        ).get_raw_download_url("plugins.json")
         res = await AsyncHttpx.get(default_github_url)
         res2 = await AsyncHttpx.get(extra_github_url)
 
@@ -214,7 +211,7 @@ async def install_plugin_with_repo(
         package_api: PackageApi
         files: list[str]
         package_info: BaseAPI
-        repo_info = RepoInfo.parse_github_url(github_url)
+        repo_info = parse_github_url(github_url)
         logger.debug(f"成功获取仓库信息: {repo_info}", "插件管理")
         for package_api in PackageApi:
             try:
@@ -231,9 +228,7 @@ async def install_plugin_with_repo(
             module_path=module_path.replace(".", "/") + ("" if is_dir else ".py"),
             is_dir=is_dir,
         )
-        download_urls = [
-            await repo_info.get_download_url_with_path(file) for file in files
-        ]
+        download_urls = [await repo_info.get_raw_download_url(file) for file in files]
         base_path = BASE_PATH / "plugins" if is_external else BASE_PATH
         download_paths: list[Path | str] = [base_path / file for file in files]
         logger.debug(f"插件下载路径: {download_paths}", "插件管理")
@@ -248,7 +243,7 @@ async def install_plugin_with_repo(
             req_files.extend(package_info.get_files("requirement.txt", False))
             logger.debug(f"获取插件依赖文件列表: {req_files}", "插件管理")
             req_download_urls = [
-                await repo_info.get_download_url_with_path(file) for file in req_files
+                await repo_info.get_raw_download_url(file) for file in req_files
             ]
             req_paths: list[Path | str] = [plugin_path / file for file in req_files]
             logger.debug(f"插件依赖文件下载路径: {req_paths}", "插件管理")