From d0edd32552a41ad95bfd13dffde2f9017daedc57 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Thu, 6 Aug 2015 01:32:24 +0300 Subject: fix ExternalScripts not working --- module/plugins/hooks/ExternalScripts.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'module/plugins/hooks/ExternalScripts.py') diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index b7495136a..d5720f68d 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -3,6 +3,7 @@ import os import subprocess +from module.plugins.internal.Plugin import encode from module.plugins.internal.Addon import Addon, Expose from module.utils import fs_encode, save_join as fs_join @@ -10,7 +11,7 @@ from module.utils import fs_encode, save_join as fs_join class ExternalScripts(Addon): __name__ = "ExternalScripts" __type__ = "hook" - __version__ = "0.46" + __version__ = "0.47" __status__ = "testing" __config__ = [("activated", "bool", "Activated" , True ), @@ -66,7 +67,8 @@ class ExternalScripts(Addon): self.log_debug(e) return - for file in os.listdir(path): + for filename in os.listdir(path): + file = fs_join(path, filename) if not os.path.isfile(file): continue @@ -83,7 +85,7 @@ class ExternalScripts(Addon): def call(self, script, args=[], lock=False): try: script = os.path.abspath(script) - args = [script] + map(encode, args) + args = [script] + map(lambda arg: encode(arg) if isinstance(arg, basestring) else encode(str(arg)), args) self.log_info(_("EXECUTE [%s] %s") % (os.path.dirname(script), args)) p = subprocess.Popen(args, bufsize=-1) #@NOTE: output goes to pyload -- cgit v1.2.3 From 31fa33b537d361a9ef6133bd65fe2f8e2047d530 Mon Sep 17 00:00:00 2001 From: GammaC0de Date: Thu, 6 Aug 2015 10:50:49 +0300 Subject: [ExternalScripts] add registered script information --- module/plugins/hooks/ExternalScripts.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hooks/ExternalScripts.py') diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index d5720f68d..9ad2ac1fa 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -79,6 +79,7 @@ class ExternalScripts(Addon): self.log_warning(_("Script not executable: [%s] %s") % (name, file)) self.scripts[name].append(file) + self.log_info(_("Registered script: [%s] %s") % (name, file)) @Expose -- cgit v1.2.3 From 52dafac35c3cbfd110746b981afd80da1632a373 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 19 Aug 2015 02:38:11 +0200 Subject: Spare plugin updates --- module/plugins/hooks/ExternalScripts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hooks/ExternalScripts.py') diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index 9ad2ac1fa..4ec526d35 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -79,7 +79,7 @@ class ExternalScripts(Addon): self.log_warning(_("Script not executable: [%s] %s") % (name, file)) self.scripts[name].append(file) - self.log_info(_("Registered script: [%s] %s") % (name, file)) + self.log_info(_("Registered script: [%s] %s") % (name, file)) @Expose -- cgit v1.2.3 From 0af040e72ad8345ce4ecc6952dcf4fe4dc28f4ff Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 29 Sep 2015 21:57:38 +0200 Subject: Update addon plugins --- module/plugins/hooks/ExternalScripts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'module/plugins/hooks/ExternalScripts.py') diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index 4ec526d35..c752ce6ac 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -94,7 +94,8 @@ class ExternalScripts(Addon): p.communicate() except Exception, e: - self.log_error(_("Runtime error: %s") % script, e or _("Unknown error")) + self.log_error(_("Runtime error: %s") % script, + e or _("Unknown error")) def pyload_start(self): -- cgit v1.2.3