ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-24 17:15:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🔀 Merge pull request #92

Browse Source 
Refactor: 更新内置 register_adapter 逻辑
This commit is contained in:
Ju4tCode 2020-12-02 13:45:07 +08:00 committed by GitHub
commit 0d5930fc3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nonebot/__init__.py
View File

@ -138,7 +138,6 @@ def get_bots() -> Union[NoReturn, Dict[str, Bot]]:
from nonebot.utils import escape_tag from nonebot.utils import escape_tag
from nonebot.config import Env, Config from nonebot.config import Env, Config
from nonebot.log import logger, default_filter from nonebot.log import logger, default_filter
from nonebot.adapters.cqhttp import Bot as CQBot
def init(*, _env_file: Optional[str] = None, **kwargs): def init(*, _env_file: Optional[str] = None, **kwargs):
@ -184,9 +183,6 @@ def init(*, _env_file: Optional[str] = None, **kwargs):
importlib.import_module(config.driver), "Driver") importlib.import_module(config.driver), "Driver")
_driver = DriverClass(env, config) _driver = DriverClass(env, config)
# register build-in adapters
_driver.register_adapter("cqhttp", CQBot)
def run(host: Optional[str] = None, def run(host: Optional[str] = None,
port: Optional[int] = None, port: Optional[int] = None,

3
nonebot/drivers/__init__.py
View File

@ -123,7 +123,8 @@ class BaseDriver(abc.ABC):
* ``*args`` * ``*args``
* ``**kwargs`` * ``**kwargs``
""" """
raise NotImplementedError logger.opt(colors=True).debug(
f"<g>Loaded adapters: {', '.join(self._adapters)}</g>")
@abc.abstractmethod @abc.abstractmethod
async def _handle_http(self): async def _handle_http(self):

1
nonebot/drivers/fastapi.py
View File

@ -98,6 +98,7 @@ class Driver(BaseDriver):
app: Optional[str] = None, app: Optional[str] = None,
**kwargs): **kwargs):
"""使用 ``uvicorn`` 启动 FastAPI""" """使用 ``uvicorn`` 启动 FastAPI"""
super().run(host, port, app, **kwargs)
LOGGING_CONFIG = { LOGGING_CONFIG = {
"version": 1, "version": 1,
"disable_existing_loggers": False, "disable_existing_loggers": False,

5
tests/bot.py
View File

@ -4,6 +4,7 @@ import sys
sys.path.insert(0, os.path.abspath("..")) sys.path.insert(0, os.path.abspath(".."))
import nonebot import nonebot
from nonebot.adapters.cqhttp import Bot
from nonebot.log import logger, default_format from nonebot.log import logger, default_format
# test custom log # test custom log
@ -15,6 +16,8 @@ logger.add("error.log",
nonebot.init(custom_config2="config on init") nonebot.init(custom_config2="config on init")
app = nonebot.get_asgi() app = nonebot.get_asgi()
driver = nonebot.get_driver()
driver.register_adapter("cqhttp", Bot)
# load builtin plugin # load builtin plugin
nonebot.load_builtin_plugins() nonebot.load_builtin_plugins()
@ -25,7 +28,7 @@ nonebot.load_plugins("test_plugins")
print(nonebot.require("test_export")) print(nonebot.require("test_export"))
# modify some config / config depends on loaded configs # modify some config / config depends on loaded configs
config = nonebot.get_driver().config config = driver.config
config.custom_config3 = config.custom_config1 config.custom_config3 = config.custom_config1
config.custom_config4 = "New custom config" config.custom_config4 = "New custom config"