|
@@ -59,10 +59,14 @@ class PluginManager:
|
|
|
if os.path.isdir(plugin_path):
|
|
if os.path.isdir(plugin_path):
|
|
|
# 判断插件是否包含同名.py文件
|
|
# 判断插件是否包含同名.py文件
|
|
|
main_module_path = os.path.join(plugin_path, plugin_name+".py")
|
|
main_module_path = os.path.join(plugin_path, plugin_name+".py")
|
|
|
- if os.path.isfile(main_module_path) and conf().get("plugins") and plugin_name in conf().get("plugins"):
|
|
|
|
|
|
|
+ if os.path.isfile(main_module_path):
|
|
|
# 导入插件
|
|
# 导入插件
|
|
|
import_path = "{}.{}.{}".format(plugins_dir, plugin_name, plugin_name)
|
|
import_path = "{}.{}.{}".format(plugins_dir, plugin_name, plugin_name)
|
|
|
- main_module = importlib.import_module(import_path)
|
|
|
|
|
|
|
+ try:
|
|
|
|
|
+ main_module = importlib.import_module(import_path)
|
|
|
|
|
+ except Exception as e:
|
|
|
|
|
+ logger.warn("Failed to import plugin %s: %s" % (plugin_name, e))
|
|
|
|
|
+ continue
|
|
|
pconf = self.pconf
|
|
pconf = self.pconf
|
|
|
new_plugins = []
|
|
new_plugins = []
|
|
|
modified = False
|
|
modified = False
|