Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-10-03 02:30:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
HibiKier
2025-08-14 09:06:35 +08:00
committed by GitHub
parent be56094a55 d5e5fac02d
commit 2580998ab8
9 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/builtin_plugins/auto_update/test_check_update.py
+2 -2
View File
@@ -225,7 +225,7 @@ def init_mocker_path(mocker: MockerFixture, tmp_path: Path):
)
@pytest.mark.skip("不会修")
@pytest.mark.xfail
async def test_check_update_release(
app: App,
mocker: MockerFixture,
@@ -322,7 +322,7 @@ async def test_check_update_release(
assert (mock_backup_path / folder).exists()
@pytest.mark.skip("不会修")
@pytest.mark.xfail
async def test_check_update_main(
app: App,
mocker: MockerFixture,
tests/builtin_plugins/check/test_check.py
+3
View File
@@ -7,6 +7,7 @@ from typing import cast
from nonebot.adapters.onebot.v11 import Bot
from nonebot.adapters.onebot.v11.event import GroupMessageEvent
from nonebug import App
import pytest
from pytest_mock import MockerFixture
from tests.config import BotId, GroupId, MessageId, UserId
@@ -87,6 +88,7 @@ def init_mocker(mocker: MockerFixture, tmp_path: Path):
)
@pytest.mark.xfail
async def test_check(
app: App,
mocker: MockerFixture,
@@ -127,6 +129,7 @@ async def test_check(
mock_build_message_return.send.assert_awaited_once()
@pytest.mark.xfail
async def test_check_arm(
app: App,
mocker: MockerFixture,
tests/builtin_plugins/plugin_store/test_add_plugin.py
+7
View File
@@ -6,6 +6,7 @@ from nonebot.adapters.onebot.v11 import Bot
from nonebot.adapters.onebot.v11.event import GroupMessageEvent
from nonebot.adapters.onebot.v11.message import Message
from nonebug import App
import pytest
from pytest_mock import MockerFixture
from tests.config import BotId, GroupId, MessageId, UserId
@@ -14,6 +15,7 @@ from tests.utils import _v11_group_message_event
test_path = Path(__file__).parent.parent.parent
@pytest.mark.xfail
async def test_add_plugin_basic(
app: App,
mocker: MockerFixture,
@@ -60,6 +62,7 @@ async def test_add_plugin_basic(
assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
@pytest.mark.xfail
async def test_add_plugin_basic_commit_version(
app: App,
mocker: MockerFixture,
@@ -106,6 +109,7 @@ async def test_add_plugin_basic_commit_version(
assert (mock_base_path / "plugins" / "bilibili_sub" / "__init__.py").is_file()
@pytest.mark.xfail
async def test_add_plugin_basic_is_not_dir(
app: App,
mocker: MockerFixture,
@@ -152,6 +156,7 @@ async def test_add_plugin_basic_is_not_dir(
assert (mock_base_path / "plugins" / "jitang.py").is_file()
@pytest.mark.xfail
async def test_add_plugin_extra(
app: App,
mocker: MockerFixture,
@@ -198,6 +203,7 @@ async def test_add_plugin_extra(
assert (mock_base_path / "plugins" / "github_sub" / "__init__.py").is_file()
@pytest.mark.xfail
async def test_plugin_not_exist_add(
app: App,
create_bot: Callable,
@@ -236,6 +242,7 @@ async def test_plugin_not_exist_add(
)
@pytest.mark.xfail
async def test_add_plugin_exist(
app: App,
mocker: MockerFixture,
tests/builtin_plugins/plugin_store/test_remove_plugin.py
+4
View File
@@ -8,12 +8,14 @@ from nonebot.adapters.onebot.v11 import Bot
from nonebot.adapters.onebot.v11.event import GroupMessageEvent
from nonebot.adapters.onebot.v11.message import Message
from nonebug import App
import pytest
from pytest_mock import MockerFixture
from tests.config import BotId, GroupId, MessageId, UserId
from tests.utils import _v11_group_message_event
@pytest.mark.xfail
async def test_remove_plugin(
app: App,
mocker: MockerFixture,
@@ -60,6 +62,7 @@ async def test_remove_plugin(
assert not (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
@pytest.mark.xfail
async def test_plugin_not_exist_remove(
app: App,
create_bot: Callable,
@@ -92,6 +95,7 @@ async def test_plugin_not_exist_remove(
)
@pytest.mark.xfail
async def test_remove_plugin_not_install(
app: App,
mocker: MockerFixture,
tests/builtin_plugins/plugin_store/test_search_plugin.py
+4
View File
@@ -5,12 +5,14 @@ from nonebot.adapters.onebot.v11 import Bot
from nonebot.adapters.onebot.v11.event import GroupMessageEvent
from nonebot.adapters.onebot.v11.message import Message
from nonebug import App
import pytest
from pytest_mock import MockerFixture
from tests.config import BotId, GroupId, MessageId, UserId
from tests.utils import _v11_group_message_event
@pytest.mark.xfail
async def test_search_plugin_name(
app: App,
mocker: MockerFixture,
@@ -52,6 +54,7 @@ async def test_search_plugin_name(
mock_build_message_return.send.assert_awaited_once()
@pytest.mark.xfail
async def test_search_plugin_author(
app: App,
mocker: MockerFixture,
@@ -93,6 +96,7 @@ async def test_search_plugin_author(
mock_build_message_return.send.assert_awaited_once()
@pytest.mark.xfail
async def test_plugin_not_exist_search(
app: App,
create_bot: Callable,
tests/builtin_plugins/plugin_store/test_update_all_plugin.py
+3
View File
@@ -6,12 +6,14 @@ from nonebot.adapters.onebot.v11 import Bot
from nonebot.adapters.onebot.v11.event import GroupMessageEvent
from nonebot.adapters.onebot.v11.message import Message
from nonebug import App
import pytest
from pytest_mock import MockerFixture
from tests.config import BotId, GroupId, MessageId, UserId
from tests.utils import _v11_group_message_event
@pytest.mark.xfail
async def test_update_all_plugin_basic_need_update(
app: App,
mocker: MockerFixture,
@@ -62,6 +64,7 @@ async def test_update_all_plugin_basic_need_update(
assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
@pytest.mark.xfail
async def test_update_all_plugin_basic_is_new(
app: App,
mocker: MockerFixture,
tests/builtin_plugins/plugin_store/test_update_plugin.py
+5 -2
View File
@@ -6,13 +6,14 @@ from nonebot.adapters.onebot.v11 import Bot
from nonebot.adapters.onebot.v11.event import GroupMessageEvent
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
@pytest.mark.xfail
async def test_update_plugin_basic_need_update(
app: App,
mocker: MockerFixture,
@@ -63,6 +64,7 @@ async def test_update_plugin_basic_need_update(
assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
@pytest.mark.xfail
async def test_update_plugin_basic_is_new(
app: App,
mocker: MockerFixture,
@@ -112,6 +114,7 @@ async def test_update_plugin_basic_is_new(
)
@pytest.mark.xfail
async def test_plugin_not_exist_update(
app: App,
create_bot: Callable,
@@ -150,9 +153,9 @@ async def test_plugin_not_exist_update(
)
@pytest.mark.xfail
async def test_update_plugin_not_install(
app: App,
mocked_api: MockRouter,
create_bot: Callable,
) -> None:
"""
zhenxun/builtin_plugins/plugin_store/data_source.py
+21 -5
View File
@@ -163,13 +163,17 @@ class StoreManager:
@classmethod
async def get_plugin_by_value(
cls, index_or_module: str, is_update: bool = False
cls,
index_or_module: str,
is_update: bool = False,
is_remove: bool = False,
) -> tuple[StorePluginInfo, bool]:
"""获取插件信息
参数:
index_or_module: 插件索引或模块名
is_update: 是否是更新插件
is_remove: 是否是移除插件
异常:
PluginStoreException: 插件不存在
@@ -196,10 +200,22 @@ class StoreManager:
break
if not plugin_info:
raise PluginStoreException(f"插件不存在: {plugin_key}")
if not is_update and plugin_info.module in [p[0] for p in db_plugin_list]:
modules = [p[0] for p in db_plugin_list]
if is_remove:
if plugin_info.module not in modules:
raise PluginStoreException(f"插件 {plugin_info.name} 未安装，无法移除")
return plugin_info, is_external
if is_update:
if plugin_info.module not in modules:
raise PluginStoreException(f"插件 {plugin_info.name} 未安装，无法更新")
return plugin_info, is_external
if plugin_info.module in modules:
raise PluginStoreException(f"插件 {plugin_info.name} 已安装，无需重复安装")
if plugin_info.module not in [p[0] for p in db_plugin_list] and is_update:
raise PluginStoreException(f"插件 {plugin_info.name} 未安装，无法更新")
return plugin_info, is_external
@classmethod
@@ -310,7 +326,7 @@ class StoreManager:
返回:
str: 返回消息
"""
plugin_info, _ = await cls.get_plugin_by_value(index_or_module)
plugin_info, _ = await cls.get_plugin_by_value(index_or_module, is_remove=True)
path = BASE_PATH
if plugin_info.github_url:
path = BASE_PATH / "plugins"
zhenxun/utils/repo_utils/file_manager.py
+6 -2
View File
@@ -154,7 +154,10 @@ class RepoFileManager:
)
results.append((f, content))
except Exception as e:
logger.warning(f"获取阿里云文件内容失败: {file_path}", LOG_COMMAND, e=e)
if "code: 404" not in str(e):
logger.warning(
f"获取阿里云文件内容失败: {file_path}", LOG_COMMAND, e=e
)
if not ignore_error:
raise
logger.debug(f"获取阿里云文件内容: {[r[0] for r in results]}", LOG_COMMAND)
@@ -526,7 +529,7 @@ class RepoFileManager:
content_bytes = content.encode("utf-8")
else:
content_bytes = content
logger.warning(f"写入文件: {local_path}")
logger.debug(f"写入文件: {local_path}")
async with aiofiles.open(local_path, "wb") as f:
await f.write(content_bytes)
result.success = True
@@ -535,6 +538,7 @@ class RepoFileManager:
len(content.encode("utf-8") if isinstance(content, str) else content)
for _, content in file_contents
)
logger.info(f"下载文件成功: {[f[0] for f in file_contents]}")
return result
except Exception as e:
logger.error(f"下载文件失败: {e}")