1 files changed, 30 insertions, 1 deletions
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index 8bc5d4a65..feabe9f1d 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -52,11 +52,40 @@ def fixurl(url):
     return html_unescape(urllib.unquote(url.decode('unicode-escape'))).strip().rstrip('/')
 
 
+def fixname(m):
+    m = unicodedata.normalize('NFKD', m)
+    output = ''
+    for c in m:
+        if not unicodedata.combining(c):
+            output += c
+    return output
+
+
 #@TODO: Move to utils in 0.4.10
 def timestamp():
     return int(time.time() * 1000)
 
 
+#@TODO: Move to utils in 0.4.10
+def which(program):
+    """
+    Works exactly like the unix command which
+    Courtesy of http://stackoverflow.com/a/377028/675646
+    """
+    isExe = lambda x: os.path.isfile(x) and os.access(x, os.X_OK)
+
+    fpath, fname = os.path.split(program)
+
+    if fpath:
+        if isExe(program):
+            return program
+    else:
+        for path in os.environ['PATH'].split(os.pathsep):
+            exe_file = os.path.join(path.strip('"'), program)
+            if isExe(exe_file):
+                return exe_file
+
+
 def seconds_to_midnight(gmt=0):
     now = datetime.datetime.utcnow() + datetime.timedelta(hours=gmt)
 
@@ -325,7 +354,7 @@ class Plugin(object):
         url = fixurl(url)
 
         if not url or not isinstance(url, basestring):
-            self.fail(_("No url given"))
+            self.fail(_("No given url"))
 
         if self.pyload.debug:
             self.log_debug("LOAD URL " + url,