mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-15 14:22:55 +08:00
✨ 移除Gitee相关逻辑，优化插件商店数据源配置
This commit is contained in:
HibiKier
parent
fd27501e65
commit
f91317cddf
@ -10,13 +10,4 @@ DEFAULT_GITHUB_URL = "https://github.com/zhenxun-org/zhenxun_bot_plugins/tree/ma
|
||||
EXTRA_GITHUB_URL = "https://github.com/zhenxun-org/zhenxun_bot_plugins_index/tree/index"
|
||||
"""插件库索引github仓库地址"""
|
||||
|
||||
GITEE_RAW_URL = "https://gitee.com/two_Dimension/zhenxun_bot_plugins/raw/main"
|
||||
"""GITEE仓库文件内容"""
|
||||
|
||||
GITEE_CONTENTS_URL = (
|
||||
"https://gitee.com/api/v5/repos/two_Dimension/zhenxun_bot_plugins/contents"
|
||||
)
|
||||
"""GITEE仓库文件列表获取"""
|
||||
|
||||
|
||||
LOG_COMMAND = "插件商店"
|
||||
|
||||
@ -5,7 +5,7 @@ from aiocache import cached
|
||||
import ujson as json
|
||||
|
||||
from zhenxun.builtin_plugins.auto_update.config import REQ_TXT_FILE_STRING
|
||||
from zhenxun.builtin_plugins.plugin_store.models import GiteeContents, StorePluginInfo
|
||||
from zhenxun.builtin_plugins.plugin_store.models import StorePluginInfo
|
||||
from zhenxun.models.plugin_info import PluginInfo
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.plugin_init import PluginInitManager
|
||||
@ -20,8 +20,6 @@ from .config import (
|
||||
BASE_PATH,
|
||||
DEFAULT_GITHUB_URL,
|
||||
EXTRA_GITHUB_URL,
|
||||
GITEE_CONTENTS_URL,
|
||||
GITEE_RAW_URL,
|
||||
LOG_COMMAND,
|
||||
)
|
||||
|
||||
@ -76,24 +74,6 @@ class StoreManager:
|
||||
)
|
||||
return []
|
||||
|
||||
@classmethod
|
||||
async def get_gitee_plugins(cls) -> list[StorePluginInfo]:
|
||||
"""获取gitcode插件列表信息
|
||||
|
||||
返回:
|
||||
list[StorePluginInfo]: 插件列表数据
|
||||
"""
|
||||
url = f"{GITEE_RAW_URL}/plugins.json"
|
||||
response = await AsyncHttpx.get(url, check_status_code=200)
|
||||
if response.status_code == 200:
|
||||
logger.info("获取gitee插件列表成功", LOG_COMMAND)
|
||||
return [StorePluginInfo(**detail) for detail in json.loads(response.text)]
|
||||
else:
|
||||
logger.warning(
|
||||
f"获取gitee插件列表失败: {response.status_code}", LOG_COMMAND
|
||||
)
|
||||
return []
|
||||
|
||||
@classmethod
|
||||
async def get_extra_plugins(cls) -> list[StorePluginInfo]:
|
||||
"""获取额外插件列表信息
|
||||
@ -124,7 +104,7 @@ class StoreManager:
|
||||
返回:
|
||||
list[StorePluginInfo]: 插件信息数据
|
||||
"""
|
||||
plugins = await cls.get_github_plugins() or await cls.get_gitee_plugins()
|
||||
plugins = await cls.get_github_plugins()
|
||||
extra_plugins = await cls.get_extra_plugins()
|
||||
return [*plugins, *extra_plugins]
|
||||
|
||||
@ -230,56 +210,13 @@ class StoreManager:
|
||||
github_url_split = plugin_info.github_url.split("/tree/")
|
||||
plugin_info.github_url = f"{github_url_split[0]}/tree/{version_split[1]}"
|
||||
logger.info(f"正在安装插件 {plugin_key}...", LOG_COMMAND)
|
||||
download_type = "GITHUB"
|
||||
try:
|
||||
await cls.install_plugin_with_repo(
|
||||
plugin_info.github_url,
|
||||
plugin_info.module_path,
|
||||
plugin_info.is_dir,
|
||||
is_external,
|
||||
)
|
||||
except Exception as e:
|
||||
download_type = "GITEE"
|
||||
logger.error(f"GITHUB 插件 {plugin_key} 更新失败", LOG_COMMAND, e=e)
|
||||
await cls.install_plugin_with_gitee(plugin_info.module_path, plugin_info.is_dir)
|
||||
return f"插件 {download_type} {plugin_key} 安装成功! 重启后生效"
|
||||
|
||||
@classmethod
|
||||
async def __get_download_files(cls, url: str, data_list: list[tuple[str, str]]):
|
||||
response = await AsyncHttpx.get(url)
|
||||
response.raise_for_status()
|
||||
for item in [GiteeContents(**item) for item in response.json()]:
|
||||
if item.type == "dir":
|
||||
await cls.__get_download_files(item.url, data_list)
|
||||
else:
|
||||
data_list.append((item.path, item.download_url))
|
||||
|
||||
@classmethod
|
||||
async def install_plugin_with_gitee(cls, module_path: str, is_dir: bool):
|
||||
module_path = module_path.replace(".", "/")
|
||||
data_list = []
|
||||
if is_dir:
|
||||
DIR_URL = f"{GITEE_CONTENTS_URL}/{module_path}"
|
||||
await cls.__get_download_files(DIR_URL, data_list)
|
||||
else:
|
||||
FILE_URL = f"{GITEE_RAW_URL}/{module_path}.py"
|
||||
data_list.append((f"{module_path}.py", FILE_URL))
|
||||
if not data_list:
|
||||
raise ValueError("获取插件文件失败（目录为空），请检查地址是否正确")
|
||||
download_urls = []
|
||||
download_paths = []
|
||||
requirement_file = None
|
||||
for item in data_list:
|
||||
file_path = BASE_PATH / Path(item[0])
|
||||
if file_path.is_file():
|
||||
file_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
download_urls.append(item[1])
|
||||
download_paths.append(file_path)
|
||||
if "requirement" in item[0] and str(item[0]).endswith(".txt"):
|
||||
requirement_file = file_path
|
||||
await AsyncHttpx.gather_download_file(download_urls, download_paths)
|
||||
if requirement_file:
|
||||
VirtualEnvPackageManager.install_requirement(requirement_file)
|
||||
await cls.install_plugin_with_repo(
|
||||
plugin_info.github_url,
|
||||
plugin_info.module_path,
|
||||
plugin_info.is_dir,
|
||||
is_external,
|
||||
)
|
||||
return f"插件 {plugin_key} 安装成功! 重启后生效"
|
||||
|
||||
@classmethod
|
||||
async def install_plugin_with_repo(
|
||||
@ -441,16 +378,16 @@ class StoreManager:
|
||||
返回:
|
||||
str: 返回消息
|
||||
"""
|
||||
data: dict[str, StorePluginInfo] = await cls.get_data()
|
||||
plugin_list: list[StorePluginInfo] = await cls.get_data()
|
||||
try:
|
||||
plugin_key = await cls._resolve_plugin_key(plugin_id)
|
||||
except ValueError as e:
|
||||
return str(e)
|
||||
logger.info(f"尝试更新插件 {plugin_key}", LOG_COMMAND)
|
||||
plugin_info = data[plugin_key]
|
||||
plugin_list = await cls.get_loaded_plugins("module", "version")
|
||||
suc_plugin = {p[0]: (p[1] or "Unknown") for p in plugin_list}
|
||||
if plugin_info.module not in [p[0] for p in plugin_list]:
|
||||
plugin_info = next(p for p in plugin_list if p.module == plugin_key)
|
||||
db_plugin_list = await cls.get_loaded_plugins("module", "version")
|
||||
suc_plugin = {p[0]: (p[1] or "Unknown") for p in db_plugin_list}
|
||||
if plugin_info.module not in [p[0] for p in db_plugin_list]:
|
||||
return f"插件 {plugin_key} 未安装，无法更新"
|
||||
logger.debug(f"当前插件列表: {suc_plugin}", LOG_COMMAND)
|
||||
if cls.check_version_is_new(plugin_info, suc_plugin):
|
||||
@ -459,21 +396,13 @@ class StoreManager:
|
||||
if plugin_info.github_url is None:
|
||||
plugin_info.github_url = DEFAULT_GITHUB_URL
|
||||
is_external = False
|
||||
download_type = "GITHUB"
|
||||
try:
|
||||
await cls.install_plugin_with_repo(
|
||||
plugin_info.github_url,
|
||||
plugin_info.module_path,
|
||||
plugin_info.is_dir,
|
||||
is_external,
|
||||
)
|
||||
except Exception as e:
|
||||
download_type = "GITEE"
|
||||
logger.error(f"GITHUB 插件 {plugin_key} 更新失败", LOG_COMMAND, e=e)
|
||||
await cls.install_plugin_with_gitee(
|
||||
plugin_info.module_path, plugin_info.is_dir
|
||||
)
|
||||
return f"插件 {download_type} {plugin_key} 更新成功! 重启后生效"
|
||||
await cls.install_plugin_with_repo(
|
||||
plugin_info.github_url,
|
||||
plugin_info.module_path,
|
||||
plugin_info.is_dir,
|
||||
is_external,
|
||||
)
|
||||
return f"插件 {plugin_key} 更新成功! 重启后生效"
|
||||
|
||||
@classmethod
|
||||
async def update_all_plugin(cls) -> str:
|
||||
@ -516,22 +445,12 @@ class StoreManager:
|
||||
if plugin_info.github_url is None:
|
||||
plugin_info.github_url = DEFAULT_GITHUB_URL
|
||||
is_external = False
|
||||
try:
|
||||
await cls.install_plugin_with_repo(
|
||||
plugin_info.github_url,
|
||||
plugin_info.module_path,
|
||||
plugin_info.is_dir,
|
||||
is_external,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(
|
||||
f"GITHUB 插件 {plugin_info.name}({plugin_info.module}) 更新失败",
|
||||
LOG_COMMAND,
|
||||
e=e,
|
||||
)
|
||||
await cls.install_plugin_with_gitee(
|
||||
plugin_info.module_path, plugin_info.is_dir
|
||||
)
|
||||
await cls.install_plugin_with_repo(
|
||||
plugin_info.github_url,
|
||||
plugin_info.module_path,
|
||||
plugin_info.is_dir,
|
||||
is_external,
|
||||
)
|
||||
update_success_list.append(plugin_info.name)
|
||||
except Exception as e:
|
||||
logger.error(
|
||||
|
||||
@ -454,9 +454,9 @@ class ConfigsManager:
|
||||
else config.default_value
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(
|
||||
logger.debug(
|
||||
f"配置项类型转换 MODULE: [<u><y>{module}</y></u>]"
|
||||
f" | KEY: [<u><y>{key}</y></u>]",
|
||||
f" | KEY: [<u><y>{key}</y></u>] 将使用原始值",
|
||||
e=e,
|
||||
)
|
||||
value = config.value or config.default_value
|
||||
|
||||
@ -21,6 +21,9 @@ CACHED_API_TTL = 300
|
||||
RAW_CONTENT_FORMAT = "https://raw.githubusercontent.com/{owner}/{repo}/{branch}/{path}"
|
||||
"""raw content格式"""
|
||||
|
||||
GITEE_RAW_CONTENT_FORMAT = "https://gitee.com/{owner}/{repo}/raw/main/{path}"
|
||||
"""gitee raw content格式"""
|
||||
|
||||
ARCHIVE_URL_FORMAT = "https://github.com/{owner}/{repo}/archive/refs/heads/{branch}.zip"
|
||||
"""archive url格式"""
|
||||
|
||||
|
||||
@ -4,6 +4,7 @@ from zhenxun.utils.http_utils import AsyncHttpx
|
||||
|
||||
from .const import (
|
||||
ARCHIVE_URL_FORMAT,
|
||||
GITEE_RAW_CONTENT_FORMAT,
|
||||
RAW_CONTENT_FORMAT,
|
||||
RELEASE_ASSETS_FORMAT,
|
||||
RELEASE_SOURCE_FORMAT,
|
||||
@ -21,6 +22,7 @@ async def __get_fastest_formats(formats: dict[str, str]) -> list[str]:
|
||||
async def get_fastest_raw_formats() -> list[str]:
|
||||
"""获取最快的raw下载地址格式"""
|
||||
formats: dict[str, str] = {
|
||||
"https://gitee.com/": GITEE_RAW_CONTENT_FORMAT,
|
||||
"https://raw.githubusercontent.com/": RAW_CONTENT_FORMAT,
|
||||
"https://ghproxy.cc/": f"https://ghproxy.cc/{RAW_CONTENT_FORMAT}",
|
||||
"https://gh-proxy.com/": f"https://gh-proxy.com/{RAW_CONTENT_FORMAT}",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user