From 13692228c69455f7e9cdca95a0986b525ce0f3e4 Mon Sep 17 00:00:00 2001 From: snowy Date: Fri, 26 Jul 2024 14:35:47 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E6=B7=BB=E5=8A=A0=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E5=8F=8A=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=BD=BB=E9=9B=AA=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liteyuki/__init__.py | 4 ++++ liteyuki/bot/__init__.py | 5 +---- liteyuki/plugin/__init__.py | 3 ++- liteyuki/plugin/load.py | 5 +++++ liteyuki/plugins/plugin_loader/__init__.py | 7 +------ liteyuki/plugins/what_litaco/__init__.py | 10 ++++++++++ 6 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 liteyuki/plugins/what_litaco/__init__.py diff --git a/liteyuki/__init__.py b/liteyuki/__init__.py index c97c2715..ad7651f3 100644 --- a/liteyuki/__init__.py +++ b/liteyuki/__init__.py @@ -2,6 +2,10 @@ from liteyuki.bot import ( LiteyukiBot, get_bot ) +from liteyuki.plugin import ( + load_plugin, + load_plugins +) # def get_bot_instance() -> LiteyukiBot | None: # """ diff --git a/liteyuki/bot/__init__.py b/liteyuki/bot/__init__.py index 02eaf2d5..0efe18d9 100644 --- a/liteyuki/bot/__init__.py +++ b/liteyuki/bot/__init__.py @@ -4,6 +4,7 @@ from typing import Any, Coroutine, Optional import nonebot +import liteyuki from liteyuki.plugin.load import load_plugin, load_plugins from src.utils import ( adapter_manager, @@ -50,7 +51,6 @@ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ $$/ $$$$$$/ $$/ $$/ $$$$$$/ """ + "\033[0m") def run(self, *args, **kwargs): - if _MAIN_PROCESS: load_plugins("liteyuki/plugins") asyncio.run(self.lifespan.before_start()) @@ -177,9 +177,6 @@ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ $$/ $$$$$$/ $$/ $$/ $$$$$$/ def init_config(self): pass - def register_adapters(self, *args): - pass - def on_before_start(self, func: LIFESPAN_FUNC): """ 注册启动前的函数 diff --git a/liteyuki/plugin/__init__.py b/liteyuki/plugin/__init__.py index 485f28bd..7bb7edf6 100644 --- a/liteyuki/plugin/__init__.py +++ b/liteyuki/plugin/__init__.py @@ -1,10 +1,11 @@ from liteyuki.plugin.model import Plugin, PluginMetadata -from liteyuki.plugin.load import load_plugin, _plugins +from liteyuki.plugin.load import load_plugin, load_plugins, _plugins __all__ = [ "PluginMetadata", "Plugin", "load_plugin", + "load_plugins", ] diff --git a/liteyuki/plugin/load.py b/liteyuki/plugin/load.py index a3cdba97..e073c19c 100644 --- a/liteyuki/plugin/load.py +++ b/liteyuki/plugin/load.py @@ -22,6 +22,11 @@ from liteyuki.utils import path_to_module_name _plugins: dict[str, Plugin] = {} +__all__ = [ + "load_plugin", + "load_plugins", +] + def load_plugin(module_path: str | Path) -> Optional[Plugin]: """加载单个插件,可以是本地插件或是通过 `pip` 安装的插件。 diff --git a/liteyuki/plugins/plugin_loader/__init__.py b/liteyuki/plugins/plugin_loader/__init__.py index da89ac6a..11992593 100644 --- a/liteyuki/plugins/plugin_loader/__init__.py +++ b/liteyuki/plugins/plugin_loader/__init__.py @@ -1,9 +1,6 @@ import multiprocessing import time -import nonebot -from nonebot import get_driver - from liteyuki.plugin import PluginMetadata from liteyuki import get_bot @@ -11,12 +8,11 @@ __plugin_metadata__ = PluginMetadata( name="plugin_loader", description="轻雪插件加载器", usage="", - type="", + type="liteyuki-main", homepage="" ) from src.utils import TempConfig, common_db - liteyuki = get_bot() @@ -38,4 +34,3 @@ def _(): @liteyuki.on_after_nonebot_init async def _(): print("NoneBot初始化完成") - nonebot.load_plugin("src.liteyuki_main") diff --git a/liteyuki/plugins/what_litaco/__init__.py b/liteyuki/plugins/what_litaco/__init__.py new file mode 100644 index 00000000..c3e1c095 --- /dev/null +++ b/liteyuki/plugins/what_litaco/__init__.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +""" +Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved + +@Time : 2024/7/25 上午2:28 +@Author : snowykami +@Email : snowykami@outlook.com +@File : __init__.py +@Software: PyCharm +"""