Merge pull request #1 from pyload/stable

Merge actual version

1 files changed, 68 insertions, 48 deletions

diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index 7b45c40a8..51192d8c9 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -6,7 +6,10 @@ import datetime
 import inspect
 import os
 import re
+import sys
+import traceback
 import urllib
+import urlparse
 
 if os.name != "nt":
     import grp
@@ -22,7 +25,7 @@ def decode(string, encoding='utf8'):
     if type(string) is str:
         return string.decode(encoding, "replace")
     else:
-        return string
+        return unicode(string)
 
 
 #@TODO: Move to utils in 0.4.10
@@ -31,7 +34,7 @@ def encode(string, encoding='utf8'):
     if type(string) is unicode:
         return string.encode(encoding, "replace")
     else:
-        return string
+        return str(string)
 
 
 #@TODO: Move to utils in 0.4.10
@@ -47,8 +50,19 @@ def exists(path):
 
 
 #@TODO: Move to utils in 0.4.10
-def fixurl(url):
-    return html_unescape(urllib.unquote(url.decode('unicode-escape'))).strip().rstrip('/')
+def parse_name(url):
+    url = urllib.unquote(url)
+    url = url.decode('unicode-escape')
+    url = html_unescape(url)
+    url = urllib.quote(url)
+
+    url_p = urlparse.urlparse(url.strip().rstrip('/'))
+
+    name = (url_p.path.split('/')[-1] or
+            url_p.query.split('=', 1)[::-1][0].split('&', 1)[0] or
+            url_p.netloc.split('.', 1)[0])
+
+    return urllib.unquote(name)
 
 
 #@TODO: Move to utils in 0.4.10
@@ -56,22 +70,35 @@ def timestamp():
     return int(time.time() * 1000)
 
 
-def seconds_to_midnight(gmt=0):
-    now = datetime.datetime.utcnow() + datetime.timedelta(hours=gmt)
-
-    if now.hour == 0 and now.minute < 10:
-        midnight = now
+#@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:
-        midnight = now + datetime.timedelta(days=1)
+        for path in os.environ['PATH'].split(os.pathsep):
+            exe_file = os.path.join(path.strip('"'), program)
+            if isExe(exe_file):
+                return exe_file
 
-    td = midnight.replace(hour=0, minute=10, second=0, microsecond=0) - now
 
-    if hasattr(td, 'total_seconds'):
-        res = td.total_seconds()
-    else:  #@NOTE: work-around for python 2.5 and 2.6 missing datetime.timedelta.total_seconds
-        res = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
+def seconds_to_midnight(utc=None):
+    if utc is None:
+        now = datetime.datetime.today()
+    else:
+        now = datetime.datetime.utcnow() + datetime.timedelta(hours=utc)
 
-    return int(res)
+    midnight = now.replace(hour=0, minute=10, second=0, microsecond=0) + datetime.timedelta(days=1)
+
+    return (midnight - now).seconds
 
 
 def replace_patterns(string, ruleslist):
@@ -145,8 +172,8 @@ def chunks(iterable, size):
 
 class Plugin(object):
     __name__    = "Plugin"
-    __type__    = "hoster"
-    __version__ = "0.30"
+    __type__    = "plugin"
+    __version__ = "0.37"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -165,6 +192,11 @@ class Plugin(object):
         self.init()
 
 
+    def __repr__(self):
+        return "<%(type)s %(name)s>" % {'type': self.__type__.capitalize(),
+                                        'name': self.__name__}
+
+
     def _init(self, core):
         self.pyload = core
         self.info   = {}  #: Provide information in dict here
@@ -180,33 +212,39 @@ class Plugin(object):
 
     def _log(self, level, plugintype, pluginname, messages):
         log = getattr(self.pyload.log, level)
-        msg = encode(" | ".join((a if isinstance(a, basestring) else str(a)).strip() for a in messages if a))
-        log("%(plugintype)s %(pluginname)s%(id)s: %(msg)s"
+        msg = u" | ".join(decode(a).strip() for a in messages if a)
+        log("%(plugintype)s %(pluginname)s: %(msg)s"
             % {'plugintype': plugintype.upper(),
                'pluginname': pluginname,
-               'id'        : ("[%s]" % self.pyfile.id) if hasattr(self, 'pyfile') else "",
                'msg'       : msg})
 
 
     def log_debug(self, *args):
-        if self.pyload.debug:
-            return self._log("debug", self.__type__, self.__name__, args)
+        if not self.pyload.debug:
+            return
+        self._log("debug", self.__type__, self.__name__, args)
 
 
     def log_info(self, *args):
-        return self._log("info", self.__type__, self.__name__, args)
+        self._log("info", self.__type__, self.__name__, args)
 
 
     def log_warning(self, *args):
-        return self._log("warning", self.__type__, self.__name__, args)
+        self._log("warning", self.__type__, self.__name__, args)
+        if self.pyload.debug:
+            traceback.print_exc()
 
 
     def log_error(self, *args):
-        return self._log("error", self.__type__, self.__name__, args)
+        self._log("error", self.__type__, self.__name__, args)
+        if self.pyload.debug:
+            traceback.print_exc()
 
 
     def log_critical(self, *args):
         return self._log("critical", self.__type__, self.__name__, args)
+        if self.pyload.debug:
+            traceback.print_exc()
 
 
     def set_permissions(self, path):
@@ -287,21 +325,10 @@ class Plugin(object):
         self.pyload.db.delStorage(self.__name__, key)
 
 
-    def fail(self, reason):
+    def fail(self, msg):
         """
-        Fail and give reason
+        Fail and give msg
         """
-        raise Fail(encode(reason))  #@TODO: Remove `encode` in 0.4.10
-
-
-    def error(self, reason="", type=_("Parse")):
-        if not reason:
-            type = _("Unknown")
-
-        msg  = _("%s error") % type.strip().capitalize() if type else _("Error")
-        msg += (": %s" % reason.strip()) if reason else ""
-        msg += _(" | Plugin may be out of date")
-
         raise Fail(encode(msg))  #@TODO: Remove `encode` in 0.4.10
 
 
@@ -318,14 +345,6 @@ class Plugin(object):
         :param decode: Wether to decode the output according to http header, should be True in most cases
         :return: Loaded content
         """
-        if hasattr(self, 'pyfile') and self.pyfile.abort:
-            self.abort()
-
-        url = fixurl(url)
-
-        if not url or not isinstance(url, basestring):
-            self.fail(_("No url given"))
-
         if self.pyload.debug:
             self.log_debug("LOAD URL " + url,
                            *["%s=%s" % (key, val) for key, val in locals().items() if key not in ("self", "url")])
@@ -345,7 +364,7 @@ class Plugin(object):
 
         #@TODO: Move to network in 0.4.10
         if isinstance(decode, basestring):
-            res = decode(res, decode)
+            res = sys.modules[self.__name__].decode(res, decode)  #@TODO: See #1787, use utils.decode() in 0.4.10
 
         if self.pyload.debug:
             frame = inspect.currentframe()
@@ -391,6 +410,7 @@ class Plugin(object):
         """
         try:
             self.req.close()
+
         except Exception:
             pass