move database.utils to database __init__.py

core/parser.py

@@ -8,7 +8,7 @@ from core.loader import Modules, ModulesAliases
 from core.logger import Logger
 from core.template import sendMessage, Nudge, kwargs_GetTrigger, kwargs_AsDisplay, RemoveDuplicateSpace
 from core.utils import remove_ineffective_text
-from database.utils import BotDBUtil
+from database import BotDBUtil
 
 command_prefix = ['~', '～']  # 消息前缀
 

database/__init__.py

@@ -0,0 +1,34 @@
+from database.orm import session
+from database.tables import EnabledModules
+from core.elements import Target
+
+
+class BotDBUtil:
+    class Module:
+        def __init__(self, kwargs):
+            self.kwargs = kwargs
+            self.query = session.query(EnabledModules).filter_by(TargetId=kwargs[Target].fromId).first()
+            self.enable_modules_list = self.query.EnabledModules.split('|') if self.query is not None else []
+            self.need_insert = True if self.query is None else False
+
+        def check_target_enabled_module(self, module_name) -> bool:
+            return True if module_name in self.enable_modules_list else False
+
+        def enable(self, module_name) -> bool:
+            self.enable_modules_list.append(module_name)
+            enabled_list = '|'.join(self.enable_modules_list)
+            if self.need_insert:
+                table = EnabledModules(TargetId=self.kwargs[Target].fromId, EnabledModules=enabled_list)
+                session.add_all([table])
+            else:
+                self.query.EnabledModules = enabled_list
+            session.commit()
+            return True
+
+        def disable(self, module_name) -> bool:
+            del self.enable_modules_list[module_name]
+            enabled_list = '|'.join(self.enable_modules_list)
+            if not self.need_insert:
+                self.query.EnabledModules = enabled_list
+                session.commit()
+            return True

database/utils.py

@@ -1,37 +0,0 @@
-from database.orm import session
-from database.tables import EnabledModules
-from core.elements import Target
-
-class BotDBUtil:
-    class Module:
-        def __init__(self, kwargs):
-            self.kwargs = kwargs
-            self.query = session.query(EnabledModules).filter_by(TargetId=kwargs[Target].fromId).first()
-            self.enable_modules_list = self.query.EnabledModules.split('|') if self.query is not None else []
-            self.need_insert = True if self.query is None else False
-
-        def check_target_enabled_module(self, module_name) -> bool:
-            return True if module_name in self.enable_modules_list else False
-
-        def enable(self, module_name):
-            self.enable_modules_list.append(module_name)
-            enabled_list = '|'.join(self.enable_modules_list)
-            if self.need_insert:
-                table = EnabledModules(TargetId=self.kwargs[Target].fromId, EnabledModules=enabled_list)
-                session.add_all([table])
-            else:
-                self.query.EnabledModules = enabled_list
-            session.commit()
-            return True
-
-        def disable(self, module_name):
-            del self.enable_modules_list[module_name]
-            enabled_list = '|'.join(self.enable_modules_list)
-            if not self.need_insert:
-                self.query.EnabledModules = enabled_list
-                session.commit()
-            return True
-
-
-
-

modules/core/__init__.py

@@ -6,7 +6,7 @@ from graia.application.message.elements.internal import Plain
 from core.template import check_permission, revokeMessage
 from core.elements import Target
 from core.template import sendMessage, wait_confirm
-from database.utils import BotDBUtil
+from database import BotDBUtil
 from core.decorator import command