mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-14 21:52:56 +08:00
7719be9866
* ✨ feat(env): 支持git更新 * ✨ feat(aliyun): 更新阿里云URL构建逻辑，支持组织名称并优化令牌解码处理 * ✨ feat(config): 修改错误提示信息，更新基础配置文件名称为.env.example * ⚡ 插件商店支持aliyun * ✨ feat(store): 优化插件数据获取逻辑，合并插件列表和额外插件列表 * 🐛 修复非git仓库的初始化更新 * ✨ feat(update): 增强更新提示信息，添加非git源的变更文件说明 * 🎨 代码格式化 * ✨ webui与resources支持git更新 * ✨ feat(update): 更新webui路径处理逻辑 * Fix/test_runwork (#2001) * fix(test): 修复测试工作流 - 修改自动更新模块中的导入路径 - 更新插件商店模块中的插件信息获取逻辑 - 优化插件添加、更新和移除流程 - 统一插件相关错误信息的格式 - 调整测试用例以适应新的插件管理逻辑 * test(builtin_plugins): 重构插件商店相关测试 - 移除 jsd 相关测试用例，只保留 gh（GitHub）的测试 - 删除了 test_plugin_store.py 文件，清理了插件商店的测试 - 更新了 test_search_plugin.py 中的插件版本号 - 调整了 test_update_plugin.py 中的已加载插件版本 - 移除了 StoreManager 类中的 is_external 变量 - 更新了 RepoFileManager 类中的文件获取逻辑，优先使用 GitHub * ✨ feat(submodule): 添加子模块管理功能，支持子模块的初始化、更新和信息获取 * ✨ feat(update): 移除资源管理器，重构更新逻辑，支持通过ZhenxunRepoManager进行资源和Web UI的更新 * test(auto_update): 修改更新检测消息格式 (#2003) - 移除了不必要的版本号后缀（如 "-e6f17c4"） - 统一了版本更新消息的格式，删除了冗余信息 * 🐛 修复web zip更新路径问题 * ⚡ 文件获取优化使用ali * Fix/test (#2008) * test: 修复bot测试 - 在 test_check_update.py 中跳过两个测试函数 - 移除 test_check.py 中的 mocked_api 参数和相关调用 - 删除 test_add_plugin.py 中的多个测试函数 - 移除 test_remove_plugin.py 中的 mocked_api 参数和相关调用 - 删除 test_search_plugin.py 中的多个测试函数 - 移除 test_update_all_plugin.py 和 test_update_plugin.py 中的 mocked_api 参数和相关调用 * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * 修复res zip更新路径问题 * 🐛 修复zhenxun更新zip占用问题 * ✨ feat(update): 优化资源更新逻辑，调整更新路径和消息处理 --------- Co-authored-by: molanp <104612722+molanp@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
422 lines
14 KiB
Python
422 lines
14 KiB
Python
from collections.abc import Callable
|
||
import io
|
||
import os
|
||
from pathlib import Path
|
||
import tarfile
|
||
from typing import cast
|
||
import zipfile
|
||
|
||
from nonebot.adapters.onebot.v11 import Bot
|
||
from nonebot.adapters.onebot.v11.message import Message
|
||
from nonebug import App
|
||
import pytest
|
||
from pytest_mock import MockerFixture
|
||
from respx import MockRouter
|
||
|
||
from tests.config import BotId, GroupId, MessageId, UserId
|
||
from tests.utils import (
|
||
_v11_group_message_event,
|
||
_v11_private_message_send,
|
||
get_reply_cq,
|
||
)
|
||
from tests.utils import get_response_json as _get_response_json
|
||
|
||
|
||
def get_response_json(file: str) -> dict:
|
||
return _get_response_json(Path() / "auto_update", file)
|
||
|
||
|
||
def init_mocked_api(mocked_api: MockRouter) -> None:
|
||
mocked_api.get(
|
||
url="https://api.github.com/repos/HibiKier/zhenxun_bot/releases/latest",
|
||
name="release_latest",
|
||
).respond(json=get_response_json("release_latest.json"))
|
||
|
||
tar_buffer = io.BytesIO()
|
||
zip_bytes = io.BytesIO()
|
||
|
||
from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
|
||
|
||
# 指定要添加到压缩文件中的文件路径列表
|
||
file_paths: list[str] = [
|
||
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=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=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",
|
||
name="release_download_url_redirect",
|
||
).respond(
|
||
content=tar_buffer.getvalue(),
|
||
)
|
||
mocked_api.get(
|
||
url="https://github.com/HibiKier/zhenxun_bot/archive/refs/heads/main.zip",
|
||
name="main_download_url",
|
||
).respond(
|
||
content=zip_bytes.getvalue(),
|
||
)
|
||
|
||
|
||
# TODO Rename this here and in `init_mocked_api`
|
||
def add_files_and_folders_to_zip(
|
||
zipf: zipfile.ZipFile, file_paths: list[str], folders: list[str] = []
|
||
):
|
||
"""Add files and folders to a zip archive.
|
||
|
||
This function creates a directory structure within the specified zip
|
||
archive and adds the provided files to it. It also creates additional
|
||
subdirectories as specified in the folders list.
|
||
|
||
Args:
|
||
zipf: The zip archive to which files and folders will be added.
|
||
file_paths: A list of file names to be added to the zip archive.
|
||
folders: An optional list of subdirectory names to be created
|
||
within the base folder.
|
||
"""
|
||
|
||
# 假设有一个文件夹名为 folder_name
|
||
folder_name = "my_folder/"
|
||
|
||
# 添加文件夹到 ZIP 中，注意 ZIP 中文件夹路径应以 '/' 结尾
|
||
zipf.writestr(folder_name, "") # 空内容表示这是一个文件夹
|
||
|
||
for file_path in file_paths:
|
||
# 将文件添加到 ZIP 中，路径为 folder_name + file_name
|
||
zipf.writestr(f"{folder_name}{os.path.basename(file_path)}", b"new")
|
||
base_folder = f"{folder_name}zhenxun/"
|
||
zipf.writestr(base_folder, "")
|
||
|
||
for folder in folders:
|
||
zipf.writestr(f"{base_folder}{folder}/", "")
|
||
|
||
|
||
# TODO Rename this here and in `init_mocked_api`
|
||
def add_files_and_folders_to_tar(
|
||
tar: tarfile.TarFile, file_paths: list[str], folders: list[str] = []
|
||
):
|
||
"""Add files and folders to a tar archive.
|
||
|
||
This function creates a directory structure within the specified tar
|
||
archive and adds the provided files to it. It also creates additional
|
||
subdirectories as specified in the folders list.
|
||
|
||
Args:
|
||
tar: The tar archive to which files and folders will be added.
|
||
file_paths: A list of file names to be added to the tar archive.
|
||
folders: An optional list of subdirectory names to be created
|
||
within the base folder.
|
||
"""
|
||
|
||
folder_name = "my_folder"
|
||
tarinfo = tarfile.TarInfo(folder_name)
|
||
add_directory_to_tar(tarinfo, tar)
|
||
# 读取并添加指定的文件
|
||
for file_path in file_paths:
|
||
# 创建TarInfo对象
|
||
tar_buffer = io.BytesIO(b"new")
|
||
tarinfo = tarfile.TarInfo(
|
||
f"{folder_name}/{file_path}"
|
||
) # 使用文件名作为tar中的名字
|
||
tarinfo.mode = 0o644 # 设置文件夹权限
|
||
tarinfo.size = len(tar_buffer.getvalue()) # 设置文件大小
|
||
|
||
# 添加文件
|
||
tar.addfile(tarinfo, fileobj=tar_buffer)
|
||
|
||
base_folder = f"{folder_name}/zhenxun"
|
||
tarinfo = tarfile.TarInfo(base_folder)
|
||
add_directory_to_tar(tarinfo, tar)
|
||
for folder in folders:
|
||
tarinfo = tarfile.TarInfo(f"{base_folder}{folder}")
|
||
add_directory_to_tar(tarinfo, tar)
|
||
|
||
|
||
# TODO Rename this here and in `_extracted_from_init_mocked_api_43`
|
||
def add_directory_to_tar(tarinfo, tar):
|
||
"""Add a directory entry to a tar archive.
|
||
|
||
This function modifies the provided tarinfo object to set its type
|
||
as a directory and assigns the appropriate permissions before adding
|
||
it to the specified tar archive.
|
||
|
||
Args:
|
||
tarinfo: The tarinfo object representing the directory.
|
||
tar: The tar archive to which the directory will be added.
|
||
"""
|
||
|
||
tarinfo.type = tarfile.DIRTYPE
|
||
tarinfo.mode = 0o755
|
||
tar.addfile(tarinfo)
|
||
|
||
|
||
def init_mocker_path(mocker: MockerFixture, tmp_path: Path):
|
||
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.configs.path_config.TEMP_PATH",
|
||
new=tmp_path / "auto_update",
|
||
)
|
||
mock_base_path = mocker.patch(
|
||
"zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_CODE_PATH",
|
||
new=tmp_path / "zhenxun",
|
||
)
|
||
mock_backup_path = mocker.patch(
|
||
"zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_BACKUP_PATH",
|
||
new=tmp_path / "backup",
|
||
)
|
||
mock_download_gz_file = mocker.patch(
|
||
"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.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.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.PYPROJECT_FILE",
|
||
new=tmp_path / ZhenxunRepoManager.config.PYPROJECT_FILE_STRING,
|
||
)
|
||
mock_pyproject_lock_file = mocker.patch(
|
||
"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.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.REQUIREMENTS_FILE",
|
||
new=tmp_path / ZhenxunRepoManager.config.REQUIREMENTS_FILE_STRING,
|
||
)
|
||
mock_version_file = mocker.patch(
|
||
"zhenxun.utils.manager.zhenxun_repo_manager.ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE",
|
||
new=tmp_path / ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE_STRING,
|
||
)
|
||
open(mock_version_file, "w").write("__version__: v0.2.2")
|
||
open(ZhenxunRepoManager.config.ZHENXUN_BOT_VERSION_FILE, "w").write(
|
||
"__version__: v0.2.2"
|
||
)
|
||
return (
|
||
mock_tmp_path,
|
||
mock_base_path,
|
||
mock_backup_path,
|
||
mock_download_gz_file,
|
||
mock_download_zip_file,
|
||
mock_pyproject_file,
|
||
mock_pyproject_lock_file,
|
||
mock_req_txt_file,
|
||
mock_version_file,
|
||
)
|
||
|
||
|
||
@pytest.mark.skip("不会修")
|
||
async def test_check_update_release(
|
||
app: App,
|
||
mocker: MockerFixture,
|
||
mocked_api: MockRouter,
|
||
create_bot: Callable,
|
||
tmp_path: Path,
|
||
) -> None:
|
||
"""
|
||
测试检查更新（release）
|
||
"""
|
||
from zhenxun.builtin_plugins.auto_update import _matcher
|
||
from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
|
||
|
||
init_mocked_api(mocked_api=mocked_api)
|
||
|
||
(
|
||
mock_tmp_path,
|
||
mock_base_path,
|
||
mock_backup_path,
|
||
mock_download_gz_file,
|
||
mock_download_zip_file,
|
||
mock_pyproject_file,
|
||
mock_pyproject_lock_file,
|
||
mock_req_txt_file,
|
||
mock_version_file,
|
||
) = init_mocker_path(mocker, tmp_path)
|
||
|
||
# 确保目录下有一个子目录，以便 os.listdir() 能返回一个目录名
|
||
mock_tmp_path.mkdir(parents=True, exist_ok=True)
|
||
|
||
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"")
|
||
mock_pyproject_lock_file.write_bytes(b"")
|
||
mock_req_txt_file.write_bytes(b"")
|
||
|
||
async with app.test_matcher(_matcher) as ctx:
|
||
bot = create_bot(ctx)
|
||
bot = cast(Bot, bot)
|
||
raw_message = "检查更新 release -z"
|
||
event = _v11_group_message_event(
|
||
raw_message,
|
||
self_id=BotId.QQ_BOT,
|
||
user_id=UserId.SUPERUSER,
|
||
group_id=GroupId.GROUP_ID_LEVEL_5,
|
||
message_id=MessageId.MESSAGE_ID,
|
||
to_me=True,
|
||
)
|
||
ctx.receive_event(bot, event)
|
||
ctx.should_call_send(
|
||
event=event,
|
||
message=Message(f"{get_reply_cq(MessageId.MESSAGE_ID)}正在进行检查更新..."),
|
||
result=None,
|
||
bot=bot,
|
||
)
|
||
ctx.should_call_api(
|
||
"send_msg",
|
||
_v11_private_message_send(
|
||
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请重新启动真寻以完成更新!"
|
||
),
|
||
result=None,
|
||
bot=bot,
|
||
)
|
||
ctx.should_finished(_matcher)
|
||
assert mocked_api["release_latest"].called
|
||
assert mocked_api["release_download_url_redirect"].called
|
||
|
||
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()
|
||
|
||
assert mock_pyproject_file.read_bytes() == b"new"
|
||
assert mock_pyproject_lock_file.read_bytes() == b"new"
|
||
assert mock_req_txt_file.read_bytes() == b"new"
|
||
|
||
for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
|
||
assert not (mock_base_path / folder).exists()
|
||
for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
|
||
assert (mock_backup_path / folder).exists()
|
||
|
||
|
||
@pytest.mark.skip("不会修")
|
||
async def test_check_update_main(
|
||
app: App,
|
||
mocker: MockerFixture,
|
||
mocked_api: MockRouter,
|
||
create_bot: Callable,
|
||
tmp_path: Path,
|
||
) -> None:
|
||
"""
|
||
测试检查更新（正式环境）
|
||
"""
|
||
from zhenxun.builtin_plugins.auto_update import _matcher
|
||
from zhenxun.utils.manager.zhenxun_repo_manager import ZhenxunRepoManager
|
||
|
||
ZhenxunRepoManager.zhenxun_zip_update = mocker.Mock(return_value="v0.2.2-e6f17c4")
|
||
|
||
init_mocked_api(mocked_api=mocked_api)
|
||
|
||
(
|
||
mock_tmp_path,
|
||
mock_base_path,
|
||
mock_backup_path,
|
||
mock_download_gz_file,
|
||
mock_download_zip_file,
|
||
mock_pyproject_file,
|
||
mock_pyproject_lock_file,
|
||
mock_req_txt_file,
|
||
mock_version_file,
|
||
) = init_mocker_path(mocker, tmp_path)
|
||
|
||
# 确保目录下有一个子目录，以便 os.listdir() 能返回一个目录名
|
||
mock_tmp_path.mkdir(parents=True, exist_ok=True)
|
||
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"")
|
||
mock_pyproject_lock_file.write_bytes(b"")
|
||
mock_req_txt_file.write_bytes(b"")
|
||
|
||
async with app.test_matcher(_matcher) as ctx:
|
||
bot = create_bot(ctx)
|
||
bot = cast(Bot, bot)
|
||
raw_message = "检查更新 main -r -z"
|
||
event = _v11_group_message_event(
|
||
raw_message,
|
||
self_id=BotId.QQ_BOT,
|
||
user_id=UserId.SUPERUSER,
|
||
group_id=GroupId.GROUP_ID_LEVEL_5,
|
||
message_id=MessageId.MESSAGE_ID,
|
||
to_me=True,
|
||
)
|
||
ctx.receive_event(bot, event)
|
||
ctx.should_call_send(
|
||
event=event,
|
||
message=Message(f"{get_reply_cq(MessageId.MESSAGE_ID)}正在进行检查更新..."),
|
||
result=None,
|
||
bot=bot,
|
||
)
|
||
ctx.should_call_api(
|
||
"send_msg",
|
||
_v11_private_message_send(
|
||
message="检测真寻已更新，当前版本：v0.2.2\n开始更新...",
|
||
user_id=UserId.SUPERUSER,
|
||
),
|
||
)
|
||
ctx.should_call_send(
|
||
event=event,
|
||
message=Message(
|
||
"版本更新完成！\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 / 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()
|
||
|
||
assert mock_pyproject_file.read_bytes() == b"new"
|
||
assert mock_pyproject_lock_file.read_bytes() == b"new"
|
||
assert mock_req_txt_file.read_bytes() == b"new"
|
||
|
||
for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
|
||
assert (mock_base_path / folder).exists()
|
||
for folder in ZhenxunRepoManager.config.ZHENXUN_BOT_UPDATE_FOLDERS:
|
||
assert (mock_backup_path / folder).exists()
|