From 2894309fa6e1b39578449755915d2d7f460cf140 Mon Sep 17 00:00:00 2001
From: Rock Chin <1010553892@qq.com>
Date: Tue, 17 Jan 2023 15:43:28 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/plugin/host.py   | 37 ++++++++++++++++++++-----------------
 pkg/qqbot/manager.py |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkg/plugin/host.py b/pkg/plugin/host.py
index fea638aa..45af559d 100644
--- a/pkg/plugin/host.py
+++ b/pkg/plugin/host.py
@@ -75,22 +75,24 @@ def initialize_plugins():
             continue
         try:
             plugin['instance'] = plugin["class"](plugin_host=context.get_plugin_host())
+            logging.info("插件 {} 已初始化".format(plugin['name']))
         except:
             logging.error("插件{}初始化时发生错误: {}".format(plugin['name'], sys.exc_info()))
 
 
 def unload_plugins():
     """ 卸载插件 """
-    for plugin in __plugins__.values():
-        if plugin['enabled'] and plugin['instance'] is not None:
-            if not hasattr(plugin['instance'], '__del__'):
-                logging.warning("插件{}没有定义析构函数".format(plugin['name']))
-            else:
-                try:
-                    plugin['instance'].__del__()
-                    logging.info("卸载插件: {}".format(plugin['name']))
-                except:
-                    logging.error("插件{}卸载时发生错误: {}".format(plugin['name'], sys.exc_info()))
+    # for plugin in __plugins__.values():
+    #     if plugin['enabled'] and plugin['instance'] is not None:
+    #         if not hasattr(plugin['instance'], '__del__'):
+    #             logging.warning("插件{}没有定义析构函数".format(plugin['name']))
+    #         else:
+    #             try:
+    #                 plugin['instance'].__del__()
+    #                 logging.info("卸载插件: {}".format(plugin['name']))
+    #                 plugin['instance'] = None
+    #             except:
+    #                 logging.error("插件{}卸载时发生错误: {}".format(plugin['name'], sys.exc_info()))
 
 
 def install_plugin(repo_url: str):
@@ -242,13 +244,14 @@ class PluginHost:
             if not plugin['enabled']:
                 continue
 
-            if plugin['instance'] is None:
-                # 从关闭状态切到开启状态之后，重新加载插件
-                try:
-                    plugin['instance'] = plugin["class"]()
-                except:
-                    logging.error("插件{}初始化时发生错误: {}".format(plugin['name'], sys.exc_info()))
-                    continue
+            # if plugin['instance'] is None:
+            #     # 从关闭状态切到开启状态之后，重新加载插件
+            #     try:
+            #         plugin['instance'] = plugin["class"](plugin_host=self)
+            #         logging.info("插件 {} 已初始化".format(plugin['name']))
+            #     except:
+            #         logging.error("插件 {} 初始化时发生错误: {}".format(plugin['name'], sys.exc_info()))
+            #         continue
 
             for hook in plugin['hooks'].get(event_name, []):
                 try:
diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py
index 40b02eb4..c69ac230 100644
--- a/pkg/qqbot/manager.py
+++ b/pkg/qqbot/manager.py
@@ -4,7 +4,7 @@ import os
 import threading
 
 import mirai.models.bus
-from mirai import At, GroupMessage, MessageEvent, Mirai, Plain, StrangerMessage, WebSocketAdapter, HTTPAdapter, \
+from mirai import At, GroupMessage, MessageEvent, Mirai, StrangerMessage, WebSocketAdapter, HTTPAdapter, \
     FriendMessage, Image
 
 import pkg.openai.session