From 13ef35f96f08da3373008bd3c091a23e14d52233 Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Thu, 6 Apr 2023 18:37:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=83=AD=E9=87=8D=E8=BD=BD=E5=90=8E!dra?= =?UTF-8?q?w=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 6 +++--- pkg/qqbot/cmds/{mgr.py => aamgr.py} | 0 pkg/qqbot/cmds/{func => funcs}/__init__.py | 0 pkg/qqbot/cmds/{func => funcs}/draw.py | 2 +- pkg/qqbot/cmds/plugin/plugin.py | 2 +- pkg/qqbot/cmds/session/default.py | 2 +- pkg/qqbot/cmds/session/del.py | 2 +- pkg/qqbot/cmds/session/delhst.py | 2 +- pkg/qqbot/cmds/session/last.py | 2 +- pkg/qqbot/cmds/session/list.py | 2 +- pkg/qqbot/cmds/session/next.py | 2 +- pkg/qqbot/cmds/session/prompt.py | 2 +- pkg/qqbot/cmds/session/resend.py | 2 +- pkg/qqbot/cmds/session/reset.py | 2 +- pkg/qqbot/cmds/system/cmd.py | 2 +- pkg/qqbot/cmds/system/cmds.py | 2 +- pkg/qqbot/cmds/system/help.py | 2 +- pkg/qqbot/cmds/system/reload.py | 2 +- pkg/qqbot/cmds/system/update.py | 2 +- pkg/qqbot/cmds/system/usage.py | 2 +- pkg/qqbot/cmds/system/version.py | 2 +- pkg/qqbot/command.py | 2 +- pkg/utils/reloader.py | 2 +- res/scripts/generate_cmdpriv_template.py | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) rename pkg/qqbot/cmds/{mgr.py => aamgr.py} (100%) rename pkg/qqbot/cmds/{func => funcs}/__init__.py (100%) rename pkg/qqbot/cmds/{func => funcs}/draw.py (95%) diff --git a/main.py b/main.py index 6cb5c4798..560186ff1 100644 --- a/main.py +++ b/main.py @@ -193,12 +193,12 @@ def start(first_time_init=False): import pkg.openai.session import pkg.qqbot.manager import pkg.openai.dprompt - import pkg.qqbot.cmds.mgr + import pkg.qqbot.cmds.aamgr try: pkg.openai.dprompt.register_all() - pkg.qqbot.cmds.mgr.register_all() - pkg.qqbot.cmds.mgr.apply_privileges() + pkg.qqbot.cmds.aamgr.register_all() + pkg.qqbot.cmds.aamgr.apply_privileges() except Exception as e: logging.error(e) traceback.print_exc() diff --git a/pkg/qqbot/cmds/mgr.py b/pkg/qqbot/cmds/aamgr.py similarity index 100% rename from pkg/qqbot/cmds/mgr.py rename to pkg/qqbot/cmds/aamgr.py diff --git a/pkg/qqbot/cmds/func/__init__.py b/pkg/qqbot/cmds/funcs/__init__.py similarity index 100% rename from pkg/qqbot/cmds/func/__init__.py rename to pkg/qqbot/cmds/funcs/__init__.py diff --git a/pkg/qqbot/cmds/func/draw.py b/pkg/qqbot/cmds/funcs/draw.py similarity index 95% rename from pkg/qqbot/cmds/func/draw.py rename to pkg/qqbot/cmds/funcs/draw.py index f8cee7547..aa0cf480d 100644 --- a/pkg/qqbot/cmds/func/draw.py +++ b/pkg/qqbot/cmds/funcs/draw.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import logging from mirai import Image diff --git a/pkg/qqbot/cmds/plugin/plugin.py b/pkg/qqbot/cmds/plugin/plugin.py index 8e313808a..9e99546dd 100644 --- a/pkg/qqbot/cmds/plugin/plugin.py +++ b/pkg/qqbot/cmds/plugin/plugin.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import os diff --git a/pkg/qqbot/cmds/session/default.py b/pkg/qqbot/cmds/session/default.py index 339828742..1e0945255 100644 --- a/pkg/qqbot/cmds/session/default.py +++ b/pkg/qqbot/cmds/session/default.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context @AbstractCommandNode.register( diff --git a/pkg/qqbot/cmds/session/del.py b/pkg/qqbot/cmds/session/del.py index ad0ca3f32..a997f06bd 100644 --- a/pkg/qqbot/cmds/session/del.py +++ b/pkg/qqbot/cmds/session/del.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import datetime diff --git a/pkg/qqbot/cmds/session/delhst.py b/pkg/qqbot/cmds/session/delhst.py index 9252caf18..3e0da85a0 100644 --- a/pkg/qqbot/cmds/session/delhst.py +++ b/pkg/qqbot/cmds/session/delhst.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context @AbstractCommandNode.register( diff --git a/pkg/qqbot/cmds/session/last.py b/pkg/qqbot/cmds/session/last.py index ade279cb4..bdf456bed 100644 --- a/pkg/qqbot/cmds/session/last.py +++ b/pkg/qqbot/cmds/session/last.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import datetime diff --git a/pkg/qqbot/cmds/session/list.py b/pkg/qqbot/cmds/session/list.py index 65e9e45d7..6c31a9be4 100644 --- a/pkg/qqbot/cmds/session/list.py +++ b/pkg/qqbot/cmds/session/list.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import datetime import json diff --git a/pkg/qqbot/cmds/session/next.py b/pkg/qqbot/cmds/session/next.py index 1323480f2..94622b0d5 100644 --- a/pkg/qqbot/cmds/session/next.py +++ b/pkg/qqbot/cmds/session/next.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import datetime diff --git a/pkg/qqbot/cmds/session/prompt.py b/pkg/qqbot/cmds/session/prompt.py index 46fdca9ac..d2629bd3d 100644 --- a/pkg/qqbot/cmds/session/prompt.py +++ b/pkg/qqbot/cmds/session/prompt.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import datetime diff --git a/pkg/qqbot/cmds/session/resend.py b/pkg/qqbot/cmds/session/resend.py index e5bb632ff..aa8b8032e 100644 --- a/pkg/qqbot/cmds/session/resend.py +++ b/pkg/qqbot/cmds/session/resend.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import datetime diff --git a/pkg/qqbot/cmds/session/reset.py b/pkg/qqbot/cmds/session/reset.py index 269cdb30b..5e5ba683a 100644 --- a/pkg/qqbot/cmds/session/reset.py +++ b/pkg/qqbot/cmds/session/reset.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import pkg.openai.session import pkg.utils.context diff --git a/pkg/qqbot/cmds/system/cmd.py b/pkg/qqbot/cmds/system/cmd.py index 431d8628a..c3e3fafe2 100644 --- a/pkg/qqbot/cmds/system/cmd.py +++ b/pkg/qqbot/cmds/system/cmd.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context, __command_list__ +from ..aamgr import AbstractCommandNode, Context, __command_list__ @AbstractCommandNode.register( diff --git a/pkg/qqbot/cmds/system/cmds.py b/pkg/qqbot/cmds/system/cmds.py index 96da56313..40d1cc2b2 100644 --- a/pkg/qqbot/cmds/system/cmds.py +++ b/pkg/qqbot/cmds/system/cmds.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context, __command_list__ +from ..aamgr import AbstractCommandNode, Context, __command_list__ @AbstractCommandNode.register( diff --git a/pkg/qqbot/cmds/system/help.py b/pkg/qqbot/cmds/system/help.py index 427a5537c..bda684d21 100644 --- a/pkg/qqbot/cmds/system/help.py +++ b/pkg/qqbot/cmds/system/help.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context @AbstractCommandNode.register( diff --git a/pkg/qqbot/cmds/system/reload.py b/pkg/qqbot/cmds/system/reload.py index ae72b6554..b3836f2e9 100644 --- a/pkg/qqbot/cmds/system/reload.py +++ b/pkg/qqbot/cmds/system/reload.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import threading @AbstractCommandNode.register( diff --git a/pkg/qqbot/cmds/system/update.py b/pkg/qqbot/cmds/system/update.py index b8ebfafb5..6c95bb36c 100644 --- a/pkg/qqbot/cmds/system/update.py +++ b/pkg/qqbot/cmds/system/update.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import threading import traceback diff --git a/pkg/qqbot/cmds/system/usage.py b/pkg/qqbot/cmds/system/usage.py index 9714eecad..7a9c3faa4 100644 --- a/pkg/qqbot/cmds/system/usage.py +++ b/pkg/qqbot/cmds/system/usage.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context import logging diff --git a/pkg/qqbot/cmds/system/version.py b/pkg/qqbot/cmds/system/version.py index f164f5bfd..8d493c99a 100644 --- a/pkg/qqbot/cmds/system/version.py +++ b/pkg/qqbot/cmds/system/version.py @@ -1,4 +1,4 @@ -from ..mgr import AbstractCommandNode, Context +from ..aamgr import AbstractCommandNode, Context @AbstractCommandNode.register( diff --git a/pkg/qqbot/command.py b/pkg/qqbot/command.py index 9081e58ee..dbb7bd35e 100644 --- a/pkg/qqbot/command.py +++ b/pkg/qqbot/command.py @@ -14,7 +14,7 @@ import pkg.utils.context import pkg.qqbot.message import pkg.utils.credit as credit # import pkg.qqbot.cmds.model as cmdmodel -import pkg.qqbot.cmds.mgr as cmdmgr +import pkg.qqbot.cmds.aamgr as cmdmgr from mirai import Image diff --git a/pkg/utils/reloader.py b/pkg/utils/reloader.py index 46399d090..f0df8b295 100644 --- a/pkg/utils/reloader.py +++ b/pkg/utils/reloader.py @@ -29,7 +29,7 @@ def reload_all(notify=True): main.stop() # 删除所有已注册的指令 - import pkg.qqbot.cmds.mgr as cmdsmgr + import pkg.qqbot.cmds.aamgr as cmdsmgr cmdsmgr.__command_list__ = {} cmdsmgr.__tree_index__ = {} diff --git a/res/scripts/generate_cmdpriv_template.py b/res/scripts/generate_cmdpriv_template.py index 6087a6417..7d7e40f83 100644 --- a/res/scripts/generate_cmdpriv_template.py +++ b/res/scripts/generate_cmdpriv_template.py @@ -1,4 +1,4 @@ -import pkg.qqbot.cmds.mgr as cmdsmgr +import pkg.qqbot.cmds.aamgr as cmdsmgr import json # 执行命令模块的注册