diff --git a/nonebot_bison/__init__.py b/nonebot_bison/__init__.py index a339e5f..8e5bbd9 100644 --- a/nonebot_bison/__init__.py +++ b/nonebot_bison/__init__.py @@ -10,11 +10,11 @@ from . import ( admin_page, bootstrap, config, - config_manager, platform, post, scheduler, send, + sub_manager, types, utils, ) @@ -38,7 +38,7 @@ __plugin_meta__ = PluginMetadata( __all__ = [ "admin_page", "config", - "config_manager", + "sub_manager", "post", "scheduler", "send", diff --git a/nonebot_bison/config_manager/__init__.py b/nonebot_bison/sub_manager/__init__.py similarity index 100% rename from nonebot_bison/config_manager/__init__.py rename to nonebot_bison/sub_manager/__init__.py diff --git a/nonebot_bison/config_manager/add_sub.py b/nonebot_bison/sub_manager/add_sub.py similarity index 100% rename from nonebot_bison/config_manager/add_sub.py rename to nonebot_bison/sub_manager/add_sub.py diff --git a/nonebot_bison/config_manager/del_sub.py b/nonebot_bison/sub_manager/del_sub.py similarity index 100% rename from nonebot_bison/config_manager/del_sub.py rename to nonebot_bison/sub_manager/del_sub.py diff --git a/nonebot_bison/config_manager/query_sub.py b/nonebot_bison/sub_manager/query_sub.py similarity index 100% rename from nonebot_bison/config_manager/query_sub.py rename to nonebot_bison/sub_manager/query_sub.py diff --git a/nonebot_bison/config_manager/utils.py b/nonebot_bison/sub_manager/utils.py similarity index 100% rename from nonebot_bison/config_manager/utils.py rename to nonebot_bison/sub_manager/utils.py diff --git a/tests/sub_manager/__init__.py b/tests/sub_manager/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_config_manager_abort.py b/tests/sub_manager/test_abort.py similarity index 95% rename from tests/test_config_manager_abort.py rename to tests/sub_manager/test_abort.py index 0d16314..cc44a7f 100644 --- a/tests/test_config_manager_abort.py +++ b/tests/sub_manager/test_abort.py @@ -4,8 +4,8 @@ from httpx import Response from nonebug.app import App from nonebug_saa import should_send_saa -from .platforms.utils import get_json -from .utils import BotReply, fake_admin_user, fake_group_message_event +from ..platforms.utils import get_json +from ..utils import BotReply, fake_admin_user, fake_group_message_event # 选择platform阶段中止 @@ -15,8 +15,8 @@ async def test_abort_add_on_platform(app: App, init_scheduler): from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" @@ -63,9 +63,9 @@ async def test_abort_add_on_id(app: App, init_scheduler): from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.weibo import Weibo + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" @@ -121,9 +121,9 @@ async def test_abort_add_on_cats(app: App, init_scheduler): from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.weibo import Weibo + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" @@ -197,9 +197,9 @@ async def test_abort_add_on_tag(app: App, init_scheduler): from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.weibo import Weibo + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" @@ -279,8 +279,8 @@ async def test_abort_del_sub(app: App, init_scheduler): from nonebot_plugin_saa import MessageFactory, TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import del_sub_matcher from nonebot_bison.platform import platform_manager + from nonebot_bison.sub_manager import del_sub_matcher from nonebot_bison.types import Target as T_Target await config.add_subscribe( diff --git a/tests/test_config_manager_add.py b/tests/sub_manager/test_add.py similarity index 96% rename from tests/test_config_manager_add.py rename to tests/sub_manager/test_add.py index 60efc8e..ada0a3d 100644 --- a/tests/test_config_manager_add.py +++ b/tests/sub_manager/test_add.py @@ -5,8 +5,8 @@ from nonebug.app import App from nonebug_saa import should_send_saa from pytest_mock import MockerFixture -from .platforms.utils import get_json -from .utils import ( +from ..platforms.utils import get_json +from ..utils import ( BotReply, add_reply_on_id_input_search, fake_admin_user, @@ -19,8 +19,8 @@ async def test_configurable_at_me_true_failed(app: App): from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import add_sub_matcher from nonebot_bison.plugin_config import plugin_config + from nonebot_bison.sub_manager import add_sub_matcher plugin_config.bison_to_me = True async with app.test_matcher(add_sub_matcher) as ctx: @@ -45,9 +45,9 @@ async def test_configurable_at_me_false(app: App): from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.plugin_config import plugin_config + from nonebot_bison.sub_manager import add_sub_matcher, common_platform plugin_config.bison_to_me = False async with app.test_matcher(add_sub_matcher) as ctx: @@ -73,9 +73,9 @@ async def test_add_with_target(app: App, init_scheduler): from nonebot_plugin_saa import TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.weibo import Weibo + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" @@ -196,9 +196,9 @@ async def test_add_with_target_no_cat(app: App, init_scheduler): from nonebot_plugin_saa import TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.ncm import NcmArtist + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ncm_router = respx.get("https://music.163.com/api/artist/albums/32540734") ncm_router.mock(return_value=Response(200, json=get_json("ncm_siren.json"))) @@ -257,8 +257,8 @@ async def test_add_no_target(app: App, init_scheduler): from nonebot_plugin_saa import TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager + from nonebot_bison.sub_manager import add_sub_matcher, common_platform async with app.test_matcher(add_sub_matcher) as ctx: bot = ctx.create_bot() @@ -306,8 +306,8 @@ async def test_platform_name_err(app: App): from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager + from nonebot_bison.sub_manager import add_sub_matcher, common_platform async with app.test_matcher(add_sub_matcher) as ctx: bot = ctx.create_bot() @@ -350,9 +350,9 @@ async def test_add_with_get_id(app: App): ) from nonebot_bison.config import config - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.weibo import Weibo + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" @@ -432,9 +432,9 @@ async def test_add_with_bilibili_target_parser(app: App, init_scheduler): from nonebot_plugin_saa import TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.bilibili import Bilibili + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://api.bilibili.com/x/web-interface/card?mid=161775300" @@ -554,9 +554,9 @@ async def test_add_with_bilibili_live_target_parser(app: App, init_scheduler): from nonebot_plugin_saa import TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.bilibili import Bilibililive + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://api.bilibili.com/x/web-interface/card?mid=161775300" @@ -647,9 +647,9 @@ async def test_add_with_bilibili_bangumi_target_parser(app: App, init_scheduler) from nonebot_plugin_saa import TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import add_sub_matcher, common_platform from nonebot_bison.platform import platform_manager from nonebot_bison.platform.bilibili import BilibiliBangumi + from nonebot_bison.sub_manager import add_sub_matcher, common_platform ak_list_router = respx.get( "https://api.bilibili.com/pgc/review/user?media_id=28235413" diff --git a/tests/test_config_manager_admin.py b/tests/sub_manager/test_admin.py similarity index 94% rename from tests/test_config_manager_admin.py rename to tests/sub_manager/test_admin.py index 5ce95d5..1aa427d 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/sub_manager/test_admin.py @@ -1,7 +1,7 @@ import pytest from nonebug import App -from .utils import fake_group_message_event, fake_private_message_event, fake_superuser +from ..utils import fake_group_message_event, fake_private_message_event, fake_superuser @pytest.mark.asyncio @@ -9,7 +9,7 @@ async def test_query_with_superuser_private(app: App): from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import group_manage_matcher + from nonebot_bison.sub_manager import group_manage_matcher async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) @@ -72,7 +72,7 @@ async def test_query_with_abort_on_idx(app: App): from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import group_manage_matcher + from nonebot_bison.sub_manager import group_manage_matcher async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) @@ -108,7 +108,7 @@ async def test_query_with_abort_on_command(app: App): from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import group_manage_matcher + from nonebot_bison.sub_manager import group_manage_matcher async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) @@ -153,7 +153,7 @@ async def test_query_with_superuser_group_tome(app: App): from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import group_manage_matcher + from nonebot_bison.sub_manager import group_manage_matcher async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) diff --git a/tests/test_config_manager_query_del.py b/tests/sub_manager/test_query_del.py similarity index 92% rename from tests/test_config_manager_query_del.py rename to tests/sub_manager/test_query_del.py index fa59362..9832549 100644 --- a/tests/test_config_manager_query_del.py +++ b/tests/sub_manager/test_query_del.py @@ -1,11 +1,9 @@ import pytest -import respx -from httpx import Response from nonebug.app import App from nonebug_saa import should_send_saa -from .platforms.utils import get_json -from .utils import fake_admin_user, fake_group_message_event +from ..platforms.utils import get_json +from ..utils import fake_admin_user, fake_group_message_event @pytest.mark.asyncio @@ -15,8 +13,8 @@ async def test_query_sub(app: App, init_scheduler): from nonebot_plugin_saa import MessageFactory, SupportedAdapters, TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import query_sub_matcher from nonebot_bison.platform import platform_manager + from nonebot_bison.sub_manager import query_sub_matcher from nonebot_bison.types import Target await config.add_subscribe( @@ -49,8 +47,8 @@ async def test_del_sub(app: App, init_scheduler): from nonebot_plugin_saa import MessageFactory, TargetQQGroup from nonebot_bison.config import config - from nonebot_bison.config_manager import del_sub_matcher from nonebot_bison.platform import platform_manager + from nonebot_bison.sub_manager import del_sub_matcher from nonebot_bison.types import Target await config.add_subscribe( @@ -100,8 +98,8 @@ async def test_del_empty_sub(app: App, init_scheduler): from nonebot.adapters.onebot.v11.message import Message from nonebot_bison.config import config - from nonebot_bison.config_manager import del_sub_matcher from nonebot_bison.platform import platform_manager + from nonebot_bison.sub_manager import del_sub_matcher async with app.test_matcher(del_sub_matcher) as ctx: bot = ctx.create_bot(base=Bot)