diff --git a/TMBot/__main__.py b/TMBot/__main__.py index 14cb934..3f232e3 100755 --- a/TMBot/__main__.py +++ b/TMBot/__main__.py @@ -47,7 +47,7 @@ def loglevel(level): plugConf = [] -def read_plugins_info(path): +def impor_plugin(path): plugins = [] if path.is_dir(): for file in path.glob('*.py'): @@ -91,8 +91,8 @@ def load_plugins(): global plugConf sys_plugins_path = Path(__file__).resolve().parent / 'utils/plugins' data_plugins_path = Path(__file__).resolve().parent.parent / 'TMBdata/plugins' - sys_plugins = read_plugins_info(sys_plugins_path) - data_plugins = read_plugins_info(data_plugins_path) + sys_plugins = impor_plugin(sys_plugins_path) + data_plugins = impor_plugin(data_plugins_path) plugConf = sys_plugins + data_plugins logging.info("所有插件已加载完成~") diff --git a/TMBot/utils/client.py b/TMBot/utils/client.py index 8672765..c7bf963 100755 --- a/TMBot/utils/client.py +++ b/TMBot/utils/client.py @@ -23,8 +23,8 @@ def start_client(): async def main(): async with client: logging.info(f'登录成功!在任意对话框发送 {prefix}help 获取帮助~') - from utils.utils import setup_event_handlers - setup_event_handlers(client) + from utils.utils import event_handler + event_handler(client) await client.run_until_disconnected() client.loop.run_until_complete(main()) diff --git a/TMBot/utils/utils.py b/TMBot/utils/utils.py index 2fb7244..a0f80d6 100755 --- a/TMBot/utils/utils.py +++ b/TMBot/utils/utils.py @@ -19,7 +19,7 @@ async def wrapped(): return wrapped return decorator -def setup_event_handlers(client): +def event_handler(client): config_path = Path(__file__).resolve().parent.parent.parent / 'TMBdata/config/config.json' with config_path.open() as f: config = json.load(f)