summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/addons/ExternalScripts.py
diff options
context:
space:
mode:
authorGravatar Stefano <l.stickell@yahoo.it> 2013-07-24 14:24:51 +0200
committerGravatar Stefano <l.stickell@yahoo.it> 2013-07-24 14:36:59 +0200
commit9be1035b2945f82b269487a009c02bd5a83028b0 (patch)
tree83c2496c60ddb5de3821151b80d69b639f007fe3 /pyload/plugins/addons/ExternalScripts.py
parentTwo more replace module import rules (diff)
downloadpyload-9be1035b2945f82b269487a009c02bd5a83028b0.tar.xz
Fixed PEP 8 violations in Hooks
(cherry picked from commit 669b1e0ec048e1ed8aeb842b2570376e9ad96863) Conflicts: pyload/plugins/addons/CaptchaTrader.py pyload/plugins/addons/ClickAndLoad.py pyload/plugins/addons/Ev0InFetcher.py pyload/plugins/addons/ExternalScripts.py pyload/plugins/addons/ExtractArchive.py pyload/plugins/addons/HotFolder.py pyload/plugins/addons/MergeFiles.py pyload/plugins/addons/MultiHome.py pyload/plugins/addons/XMPPInterface.py
Diffstat (limited to 'pyload/plugins/addons/ExternalScripts.py')
-rw-r--r--pyload/plugins/addons/ExternalScripts.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/pyload/plugins/addons/ExternalScripts.py b/pyload/plugins/addons/ExternalScripts.py
index 8f5a5841e..49774a42b 100644
--- a/pyload/plugins/addons/ExternalScripts.py
+++ b/pyload/plugins/addons/ExternalScripts.py
@@ -24,6 +24,7 @@ from os.path import basename
from module.plugins.Addon import Addon
from module.utils.fs import save_join, exists, join, listdir
+
class ExternalScripts(Addon):
__name__ = "ExternalScripts"
__version__ = "0.22"
@@ -42,7 +43,6 @@ class ExternalScripts(Addon):
'all_dls_finished', 'all_dls_processed']
for folder in folders:
-
self.scripts[folder] = []
self.initPluginType(folder, join(pypath, 'scripts', folder))
@@ -52,12 +52,11 @@ class ExternalScripts(Addon):
if names:
self.logInfo((_("Installed scripts for %s: ") % script_type ) + ", ".join([basename(x) for x in names]))
-
def initPluginType(self, folder, path):
if not exists(path):
try:
makedirs(path)
- except :
+ except:
self.logDebug("Script folder %s not created" % folder)
return
@@ -65,7 +64,7 @@ class ExternalScripts(Addon):
if f.startswith("#") or f.startswith(".") or f.startswith("_") or f.endswith("~") or f.endswith(".swp"):
continue
- if not access(join(path,f), X_OK):
+ if not access(join(path, f), X_OK):
self.logWarning(_("Script not executable:") + " %s/%s" % (folder, f))
self.scripts[folder].append(join(path, f))
@@ -76,7 +75,7 @@ class ExternalScripts(Addon):
#output goes to pyload
subprocess.Popen(cmd, bufsize=-1)
except Exception, e:
- self.logError(_("Error in %(script)s: %(error)s") % { "script" :basename(script), "error": str(e)})
+ self.logError(_("Error in %(script)s: %(error)s") % {"script": basename(script), "error": str(e)})
def downloadPreparing(self, pyfile):
for script in self.scripts['download_preparing']:
@@ -85,9 +84,8 @@ class ExternalScripts(Addon):
def downloadFinished(self, pyfile):
for script in self.scripts['download_finished']:
self.callScript(script, pyfile.pluginname, pyfile.url, pyfile.name,
- save_join(self.core.config['general']['download_folder'], pyfile.package().folder, pyfile.name),
- pyfile.id)
-
+ save_join(self.core.config['general']['download_folder'],
+ pyfile.package().folder, pyfile.name), pyfile.id)
def packageFinished(self, pypack):
for script in self.scripts['package_finished']:
@@ -115,4 +113,3 @@ class ExternalScripts(Addon):
def allDownloadsProcessed(self):
for script in self.scripts["all_dls_processed"]:
self.callScript(script)
-