diff options
author | mkaay <mkaay@mkaay.de> | 2010-01-27 14:52:42 +0100 |
---|---|---|
committer | mkaay <mkaay@mkaay.de> | 2010-01-27 14:52:42 +0100 |
commit | ce184310fd592047d47de24287b20fee00a587cd (patch) | |
tree | 47fd92ea6c960d8db206a348427017b8f1f8af21 /module/HookManager.py | |
parent | Better Script Support (diff) | |
download | pyload-ce184310fd592047d47de24287b20fee00a587cd.tar.xz |
moved script support to a new plugin
Diffstat (limited to 'module/HookManager.py')
-rw-r--r-- | module/HookManager.py | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/module/HookManager.py b/module/HookManager.py index 66a65acc8..a283a7349 100644 --- a/module/HookManager.py +++ b/module/HookManager.py @@ -19,10 +19,8 @@ """ from glob import glob import logging -from os import listdir from os.path import basename from os.path import join -import subprocess from threading import Lock from module.XMLConfigParser import XMLConfigParser @@ -35,32 +33,12 @@ class HookManager(): self.config = self.configParser.getConfig() self.logger = logging.getLogger("log") self.plugins = [] - self.scripts = {} self.lock = Lock() self.createIndex() def createIndex(self): self.lock.acquire() - f = lambda x: False if x.startswith("#") or x.endswith("~") else True - self.scripts = {} - - folder = join(self.core.path, "scripts") - - self.scripts['download_preparing'] = filter(f, listdir(join(folder, 'download_preparing'))) - self.scripts['download_finished'] = filter(f, listdir(join(folder, 'download_finished'))) - self.scripts['package_finished'] = filter(f, listdir(join(folder, 'package_finished'))) - self.scripts['before_reconnect'] = filter(f, listdir(join(folder, 'before_reconnect'))) - self.scripts['after_reconnect'] = filter(f, listdir(join(folder, 'after_reconnect'))) - - for script_type, script_name in self.scripts.iteritems(): - if script_name != []: - self.logger.info("Installed %s Scripts: %s" % (script_type, ", ".join(script_name))) - - #~ self.core.logger.info("Installed Scripts: %s" % str(self.scripts)) - - self.folder = folder - pluginFiles = glob(join(self.core.plugin_folder, "hooks", "*.py")) plugins = [] for pluginFile in pluginFiles: @@ -86,13 +64,6 @@ class HookManager(): def downloadStarts(self, pyfile): self.lock.acquire() - for script in self.scripts['download_preparing']: - try: - out = subprocess.Popen([join(self.folder, 'download_preparing', script), pyfile.plugin.props['name'], pyfile.url], stdout=subprocess.PIPE) - out.wait() - except: - pass - for plugin in self.plugins: plugin.downloadStarts(pyfile) self.lock.release() @@ -100,14 +71,6 @@ class HookManager(): def downloadFinished(self, pyfile): self.lock.acquire() - for script in self.scripts['download_finished']: - try: - out = subprocess.Popen([join(self.folder, 'download_finished', script), pyfile.plugin.props['name'], pyfile.url, pyfile.status.name, \ - join(self.core.path,self.core.config['general']['download_folder'], pyfile.folder, pyfile.status.name)], stdout=subprocess.PIPE) - except: - pass - - for plugin in self.plugins: plugin.downloadFinished(pyfile) self.lock.release() @@ -118,13 +81,6 @@ class HookManager(): def beforeReconnecting(self, ip): self.lock.acquire() - for script in self.scripts['before_reconnect']: - try: - out = subprocess.Popen([join(self.folder, 'before_reconnect', script), ip], stdout=subprocess.PIPE) - out.wait() - except: - pass - for plugin in self.plugins: plugin.beforeReconnecting(ip) self.lock.release() @@ -132,12 +88,6 @@ class HookManager(): def afterReconnecting(self, ip): self.lock.acquire() - for script in self.scripts['after_reconnect']: - try: - out = subprocess.Popen([join(self.folder, 'download_preparing', script), ip], stdout=subprocess.PIPE) - except: - pass - for plugin in self.plugins: plugin.afterReconnecting(ip) self.lock.release() |