diff --git a/plugin_test/pluginloader.py b/plugin_test/pluginloader.py index 768e521..80bc996 100644 --- a/plugin_test/pluginloader.py +++ b/plugin_test/pluginloader.py @@ -7,8 +7,6 @@ import imp import os PluginFolder = "./plugins" -MainModule = "__init__" - def getPlugins(): plugins = [] @@ -16,7 +14,7 @@ def getPlugins(): for i in possibleplugins: location = os.path.join(PluginFolder, i) # plugins have to be a subdir with MainModule, if not skip - if not os.path.isdir(location) or not MainModule + ".py" in os.listdir(location): + if not os.path.isdir(location) or not i + ".py" in os.listdir(location): continue logging.debug("found plugin: "+i) @@ -28,10 +26,10 @@ def getPlugins(): logging.debug("use Plugin: "+str(usePlugin)) if usePlugin: - info = imp.find_module(MainModule, [location]) + info = imp.find_module(i, [location]) plugins.append({"name": i, "info": info}) logging.debug("append Plugin: "+i) return plugins def loadPlugin(plugin): - return imp.load_module(MainModule, *plugin["info"]) \ No newline at end of file + return imp.load_module(plugin["name"], *plugin["info"]) \ No newline at end of file diff --git a/plugin_test/plugins/BosMon/__init__.py b/plugin_test/plugins/BosMon/BosMon.py similarity index 100% rename from plugin_test/plugins/BosMon/__init__.py rename to plugin_test/plugins/BosMon/BosMon.py diff --git a/plugin_test/plugins/none/__init__.py b/plugin_test/plugins/none/none.py similarity index 100% rename from plugin_test/plugins/none/__init__.py rename to plugin_test/plugins/none/none.py diff --git a/plugin_test/plugins/template/__init__.py b/plugin_test/plugins/template/template.py similarity index 100% rename from plugin_test/plugins/template/__init__.py rename to plugin_test/plugins/template/template.py