Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev
This commit is contained in:
@@ -122,6 +122,7 @@ class ActionModifier:
|
|||||||
|
|
||||||
# === 统一日志记录 ===
|
# === 统一日志记录 ===
|
||||||
all_removals = removals_s1 + removals_s2
|
all_removals = removals_s1 + removals_s2
|
||||||
|
removals_summary: str = ""
|
||||||
if all_removals:
|
if all_removals:
|
||||||
removals_summary = " | ".join([f"{name}({reason})" for name, reason in all_removals])
|
removals_summary = " | ".join([f"{name}({reason})" for name, reason in all_removals])
|
||||||
|
|
||||||
|
|||||||
@@ -115,10 +115,13 @@ class PluginManager:
|
|||||||
plugin_dir = self._find_plugin_directory(plugin_class)
|
plugin_dir = self._find_plugin_directory(plugin_class)
|
||||||
if plugin_dir:
|
if plugin_dir:
|
||||||
self.plugin_paths[plugin_name] = plugin_dir # 更新路径
|
self.plugin_paths[plugin_name] = plugin_dir # 更新路径
|
||||||
plugin_instance = plugin_class(plugin_dir=plugin_dir) # 实例化插件(可能因为缺少manifest而失败)
|
else:
|
||||||
if not plugin_instance:
|
return False, 1
|
||||||
logger.error(f"插件 {plugin_name} 实例化失败")
|
|
||||||
return False, 1
|
plugin_instance = plugin_class(plugin_dir=plugin_dir) # 实例化插件(可能因为缺少manifest而失败)
|
||||||
|
if not plugin_instance:
|
||||||
|
logger.error(f"插件 {plugin_name} 实例化失败")
|
||||||
|
return False, 1
|
||||||
# 检查插件是否启用
|
# 检查插件是否启用
|
||||||
if not plugin_instance.enable_plugin:
|
if not plugin_instance.enable_plugin:
|
||||||
logger.info(f"插件 {plugin_name} 已禁用,跳过加载")
|
logger.info(f"插件 {plugin_name} 已禁用,跳过加载")
|
||||||
|
|||||||
Reference in New Issue
Block a user