diff options
Diffstat (limited to 'module/HookManager.py')
| -rw-r--r-- | module/HookManager.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/module/HookManager.py b/module/HookManager.py index 16f692d76..6fd1162a7 100644 --- a/module/HookManager.py +++ b/module/HookManager.py @@ -25,7 +25,7 @@ from threading import RLock from types import MethodType -from module.PluginThread import HookThread +from module.threads.PluginThread import HookThread from module.plugins.PluginManager import literal_eval from utils import lock @@ -123,10 +123,10 @@ class HookManager: try: #hookClass = getattr(plugin, plugin.__name__) - if self.core.config.getPlugin(pluginname, "activated"): + if self.config.getPlugin(pluginname, "activated"): pluginClass = self.core.pluginManager.loadClass("hooks", pluginname) if not pluginClass: continue - + plugin = pluginClass(self.core, self) plugins.append(plugin) self.pluginMap[pluginClass.__name__] = plugin @@ -219,10 +219,7 @@ class HookManager: def downloadFinished(self, pyfile): for plugin in self.plugins: if plugin.isActivated(): - if "downloadFinished" in plugin.__threaded__: - self.startThread(plugin.downloadFinished, pyfile) - else: - plugin.downloadFinished(pyfile) + plugin.downloadFinished(pyfile) self.dispatchEvent("downloadFinished", pyfile) @@ -231,10 +228,7 @@ class HookManager: def downloadFailed(self, pyfile): for plugin in self.plugins: if plugin.isActivated(): - if "downloadFailed" in plugin.__threaded__: - self.startThread(plugin.downloadFinished, pyfile) - else: - plugin.downloadFailed(pyfile) + plugin.downloadFailed(pyfile) self.dispatchEvent("downloadFailed", pyfile) @@ -242,10 +236,7 @@ class HookManager: def packageFinished(self, package): for plugin in self.plugins: if plugin.isActivated(): - if "packageFinished" in plugin.__threaded__: - self.startThread(plugin.packageFinished, package) - else: - plugin.packageFinished(package) + plugin.packageFinished(package) self.dispatchEvent("packageFinished", package) @@ -312,4 +303,3 @@ class HookManager: % (event, f, args, str(e))) if self.core.debug: traceback.print_exc() - |