✨ 添加对zip格式的资源包的支持，对function的支持

liteyuki/liteyuki_main/__init__.py

@@ -2,7 +2,7 @@ from nonebot.plugin import PluginMetadata
 
 from .core import *
 from .loader import *
-from .dev_tools import *
+from .dev import *
 
 __author__ = "snowykami"
 __plugin_meta__ = PluginMetadata(

liteyuki/liteyuki_main/core.py

@@ -80,12 +80,13 @@ async def _(matcher: Matcher, bot: T_Bot, event: T_MessageEvent):
 
     temp_data.data.update(
         {
-            "reload": True,
-            "reload_time": time.time(),
-            "reload_bot_id": bot.self_id,
-            "reload_session_type": event_utils.get_message_type(event),
-            "reload_session_id": (event.group_id if event.message_type == "group" else event.user_id) if not isinstance(event,satori.event.Event) else event.channel.id,
-            "delta_time": 0
+                "reload"             : True,
+                "reload_time"        : time.time(),
+                "reload_bot_id"      : bot.self_id,
+                "reload_session_type": event_utils.get_message_type(event),
+                "reload_session_id"  : (event.group_id if event.message_type == "group" else event.user_id) if not isinstance(event,
+                                                                                                                              satori.event.Event) else event.channel.id,
+                "delta_time"         : 0
         }
     )
 
@@ -188,6 +189,39 @@ async def _(matcher: Matcher):
     await matcher.finish("https://bot.liteyuki.icu/usage")
 
 
+@on_alconna(
+    command=Alconna(
+        "/function",
+        Args["function", str]["args", MultiVar(str), ()],
+    )
+).handle()
+async def _(result: Arparma, bot: T_Bot, event: T_MessageEvent, matcher: Matcher):
+    """
+    调用轻雪函数
+    Args:
+        result:
+        bot:
+        event:
+
+    Returns:
+
+    """
+    function_name = result.main_args.get("function")
+    args: tuple[str] = result.main_args.get("args", ())
+    _args = []
+    _kwargs = {}
+
+    for arg in args:
+        arg = arg.replace("\\=", "EQUAL_SIGN")
+        if "=" in arg:
+            key, value = arg.split("=", 1)
+            _kwargs[key] = value.replace("EQUAL_SIGN", "=")
+        else:
+            _args.append(arg.replace("EQUAL_SIGN", "="))
+
+
+
+
 @on_alconna(
     command=Alconna(
         "/api",
@@ -294,7 +328,7 @@ async def _(bot: T_Bot):
         reload_session_id = temp_data.data.get("reload_session_id", 0)
         delta_time = temp_data.data.get("delta_time", 0)
         common_db.save(temp_data)  # 更新数据
-        if isinstance(bot,satori.Bot):
+        if isinstance(bot, satori.Bot):
             await bot.send_message(
                 channel_id=reload_session_id,
                 message="Liteyuki reloaded in %.2f s" % delta_time
@@ -323,23 +357,23 @@ async def every_day_update():
             nonebot.logger.info(logs)
 
 
-# 安全的需要用户id的api
+# 需要用户id的api
 need_user_id = (
-    "send_private_msg",
-    "send_msg",
-    "set_group_card",
-    "set_group_special_title",
-    "get_stranger_info",
-    "get_group_member_info"
+        "send_private_msg",
+        "send_msg",
+        "set_group_card",
+        "set_group_special_title",
+        "get_stranger_info",
+        "get_group_member_info"
 )
 
 need_group_id = (
-    "send_group_msg",
-    "send_msg",
-    "set_group_card",
-    "set_group_name",
-    "set_group_special_title",
-    "get_group_member_info",
-    "get_group_member_list",
-    "get_group_honor_info"
+        "send_group_msg",
+        "send_msg",
+        "set_group_card",
+        "set_group_name",
+        "set_group_special_title",
+        "get_group_member_info",
+        "get_group_member_list",
+        "get_group_honor_info"
 )

liteyuki/liteyuki_main/dev.py

@@ -0,0 +1,55 @@
+import nonebot
+from watchdog.observers import Observer
+from watchdog.events import FileSystemEventHandler
+
+from liteyuki.utils.base.config import get_config
+from liteyuki.utils.base.reloader import Reloader
+from liteyuki.utils.base.resource import load_resources
+
+if get_config("debug", False):
+
+    src_directories = (
+            "liteyuki/liteyuki_main",
+            "liteyuki/plugins",
+            "liteyuki/utils",
+    )
+    src_excludes_extensions = (
+            "pyc",
+    )
+
+    res_directories = (
+            "liteyuki/resources",
+            "resources",
+    )
+
+    nonebot.logger.info("Liteyuki Reload is enable, watching for file changes...")
+
+    class CodeModifiedHandler(FileSystemEventHandler):
+        """
+        Handler for code file changes
+        """
+        def on_modified(self, event):
+            if event.src_path.endswith(src_excludes_extensions) or event.is_directory:
+                return
+            nonebot.logger.debug(f"{event.src_path} modified, reloading bot...")
+            Reloader.reload()
+
+
+    class ResourceModifiedHandler(FileSystemEventHandler):
+        """
+        Handler for resource file changes
+        """
+        def on_modified(self, event):
+            nonebot.logger.debug(f"{event.src_path} modified, reloading resource...")
+            load_resources()
+
+
+    code_modified_handler = CodeModifiedHandler()
+    resource_modified_handle = ResourceModifiedHandler()
+
+    observer = Observer()
+    for directory in src_directories:
+        observer.schedule(code_modified_handler, directory, recursive=True)
+    for directory in res_directories:
+        observer.schedule(resource_modified_handle, directory, recursive=True)
+    observer.start()

liteyuki/liteyuki_main/dev_tools.py

@@ -1,43 +0,0 @@
-import time
-
-import nonebot
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler
-
-from liteyuki.utils.base.config import get_config
-from liteyuki.utils.base.reloader import Reloader
-from liteyuki.utils.base.resource import load_resources
-
-if get_config("debug", False):
-    nonebot.logger.info("Liteyuki Reload is enable, watching for file changes...")
-
-
-    class CodeModifiedHandler(FileSystemEventHandler):
-        def on_modified(self, event):
-            if "liteyuki/resources" not in event.src_path.replace("\\", "/"):
-                nonebot.logger.debug(f"{event.src_path} has been modified, reloading bot...")
-                Reloader.reload()
-
-
-    class ResourceModifiedHandler(FileSystemEventHandler):
-        def on_modified(self, event):
-            if not event.is_directory:
-                nonebot.logger.debug(f"{event.src_path} has been modified, reloading resource...")
-                load_resources()
-
-
-    code_modified_handler = CodeModifiedHandler()
-    resource_modified_handle = ResourceModifiedHandler()
-
-    observer = Observer()
-    observer.schedule(resource_modified_handle, path="liteyuki/resources", recursive=True)
-    observer.schedule(resource_modified_handle, path="resources", recursive=True)
-    observer.schedule(code_modified_handler, path="liteyuki", recursive=True)
-    observer.start()
-
-# try:
-#     while True:
-#         time.sleep(1)
-# except KeyboardInterrupt:
-#     observer.stop()
-# observer.join()