From 8e605a8b234974a89c93d38bccae9d19f86e965d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 22 Nov 2014 20:20:49 +0100
Subject: [XFSAccount] Fix trafficleft

---
 module/plugins/internal/XFSAccount.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 627dc75c4..4a3d0696b 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -71,6 +71,7 @@ class XFSAccount(Account):
             else:
                 if validuntil > mktime(gmtime()):
                     premium = True
+                    trafficleft = -1
                 else:
                     premium = False
                     validuntil = None  #: registered account type (not premium)
@@ -97,9 +98,6 @@ class XFSAccount(Account):
 
             except Exception, e:
                 self.logError(e)
-        else:
-            if premium:
-                trafficleft = -1
 
         return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
 
-- 
cgit v1.2.3


From 9804b57e02d663328af048a96e60a330ac27b60d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 23 Nov 2014 01:30:45 +0100
Subject: Fixes about create_getInfo

---
 module/plugins/internal/DeadCrypter.py   | 13 ++++++++++++-
 module/plugins/internal/DeadHoster.py    | 21 ++++++++++++---------
 module/plugins/internal/SimpleCrypter.py |  4 ++--
 module/plugins/internal/SimpleHoster.py  |  5 +++--
 module/plugins/internal/XFSHoster.py     |  4 ++--
 5 files changed, 31 insertions(+), 16 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py
index 4c635e366..c721c8390 100644
--- a/module/plugins/internal/DeadCrypter.py
+++ b/module/plugins/internal/DeadCrypter.py
@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 
+from urlparse import urlparse
+
+from module.plugins.internal.SimpleCrypter import create_getInfo
 from module.plugins.Crypter import Crypter as _Crypter
 
 
 class DeadCrypter(_Crypter):
     __name__    = "DeadCrypter"
     __type__    = "crypter"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'^unmatchable$'
 
@@ -15,6 +18,14 @@ class DeadCrypter(_Crypter):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
+    @classmethod
+    def getInfo(cls, url="", html=""):
+        return {'name': urlparse(url).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 1, 'url': url or ""}
+
+
     def setup(self):
         self.pyfile.error = "Crypter is no longer available"
         self.offline()  #@TODO: self.offline("Crypter is no longer available")
+
+
+getInfo = create_getInfo(DeadCrypter)
diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py
index b78068069..b85aea3f9 100644
--- a/module/plugins/internal/DeadHoster.py
+++ b/module/plugins/internal/DeadHoster.py
@@ -1,20 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Hoster import Hoster as _Hoster
-
-
-def create_getInfo(plugin):
+from urlparse import urlparse
 
-    def getInfo(urls):
-        yield map(lambda url: ('#N/A: ' + url, 0, 1, url), urls)
-
-    return getInfo
+from module.plugins.internal.SimpleHoster import create_getInfo
+from module.plugins.Hoster import Hoster as _Hoster
 
 
 class DeadHoster(_Hoster):
     __name__    = "DeadHoster"
     __type__    = "hoster"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __pattern__ = r'^unmatchable$'
 
@@ -23,6 +18,14 @@ class DeadHoster(_Hoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
+    @classmethod
+    def getInfo(cls, url="", html=""):
+        return {'name': urlparse(url).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 1, 'url': url or ""}
+
+
     def setup(self):
         self.pyfile.error = "Hoster is no longer available"
         self.offline()  #@TODO: self.offline("Hoster is no longer available")
+
+
+getInfo = create_getInfo(DeadHoster)
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 5d00daa3c..53ffaf4a6 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -5,14 +5,14 @@ import re
 from urlparse import urlparse
 
 from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import SimpleHoster, replace_patterns, set_cookies
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
 from module.utils import fixup
 
 
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.31"
+    __version__ = "0.32"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ea298cc39..01702d423 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -100,6 +100,7 @@ def parseFileInfo(plugin, url="", html=""):
 
 
 #@TODO: Remove in 0.4.10
+#@NOTE: Every plugin must have own parseInfo classmethod to work with 0.4.10
 def create_getInfo(plugin):
     return lambda urls: [(info['name'], info['size'], info['status'], info['url']) for info in plugin.parseInfo(urls)]
 
@@ -126,7 +127,7 @@ def _getDirectLink(self, url):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.60"
+    __version__ = "0.61"
 
     __pattern__ = r'^unmatchable$'
 
@@ -197,7 +198,7 @@ class SimpleHoster(Hoster):
 
     @classmethod
     def getInfo(cls, url="", html=""):
-        info = {'name': url or _("Unknown"), 'size': 0, 'status': 3, 'url': url}
+        info = {'name': urlparse(url).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 3, 'url': url or ""}
 
         if not html:
             if url:
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index d5bbf5c63..2cc4833e6 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.22"
+    __version__ = "0.23"
 
     __pattern__ = r'^unmatchable$'
 
@@ -108,7 +108,7 @@ class XFSHoster(SimpleHoster):
 
 
     def getDownloadLink(self):
-        for i in xrange(1, 5):
+        for i in xrange(1, 6):
             self.logDebug("Getting download link: #%d" % i)
 
             self.checkErrors()
-- 
cgit v1.2.3


From b5a88f7283fbf3c6177ca4d87e27accc893ea0a8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 23 Nov 2014 05:56:48 +0100
Subject: Fix URL_REPLACEMENTS in XFSHoster plugins

---
 module/plugins/internal/XFSHoster.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 2cc4833e6..30864ef02 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.23"
+    __version__ = "0.24"
 
     __pattern__ = r'^unmatchable$'
 
@@ -30,8 +30,6 @@ class XFSHoster(SimpleHoster):
     HOSTER_DOMAIN = None
     HOSTER_NAME   = None
 
-    URL_REPLACEMENTS = [(r'/(?:embed-)?(\w{12}).*', r'/\1')]  #: plus support embedded files
-
     TEXT_ENCODING     = False
     COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
     CHECK_DIRECT_LINK = None
-- 
cgit v1.2.3


From 77d012daf519366eb28f1952c8665f7b893f8692 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 23 Nov 2014 15:49:43 +0100
Subject: [XFSAccount] Fix validuntil computation

---
 module/plugins/internal/XFSAccount.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 4a3d0696b..75111025b 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -2,7 +2,7 @@
 
 import re
 
-from time import gmtime, mktime, strptime
+from time import localtime, mktime, strptime
 from urlparse import urljoin
 
 from module.plugins.Account import Account
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -63,18 +63,22 @@ class XFSAccount(Account):
             self.logDebug("Expire date: " + expiredate)
 
             try:
-                validuntil = mktime(strptime(expiredate, "%d %B %Y"))
+                validuntil = mktime(strptime(expiredate, "%d %B %Y")) + 86400
 
             except Exception, e:
                 self.logError(e)
 
             else:
-                if validuntil > mktime(gmtime()):
+                self.logDebug("Valid until: %s" % validuntil)
+
+                if validuntil > mktime(localtime()):
                     premium = True
                     trafficleft = -1
                 else:
                     premium = False
                     validuntil = None  #: registered account type (not premium)
+        else:
+            self.logDebug("VALID_UNTIL_PATTERN not found")
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
         if m:
@@ -98,6 +102,8 @@ class XFSAccount(Account):
 
             except Exception, e:
                 self.logError(e)
+        else:
+            self.logDebug("TRAFFIC_LEFT_PATTERN not found")
 
         return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
 
-- 
cgit v1.2.3


From 01c55c0168f8745f5e113c88e6c95719a46de6d4 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 23 Nov 2014 17:13:34 +0100
Subject: [XFSAccount] Leech traffic support

---
 module/plugins/internal/XFSAccount.py | 43 ++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 75111025b..54ca5a8d8 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.28"
+    __version__ = "0.29"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -32,6 +32,9 @@ class XFSAccount(Account):
     TRAFFIC_LEFT_PATTERN = r'>Traffic available today:.*?<b>\s*(?P<S>[\d.,]+|[Uu]nlimited)\s*(?:(?P<U>[\w^_]+)\s*)?</b>'
     TRAFFIC_LEFT_UNIT    = "MB"  #: used only if no group <U> was found
 
+    LEECH_TRAFFIC_PATTERN = r'Leech Traffic left:<b>.*?(?P<S>[\d.,]+|[Uu]nlimited)\s*(?:(?P<U>[\w^_]+)\s*)?</b>'
+    LEECH_TRAFFIC_UNIT    = "MB"  #: used only if no group <U> was found
+
     LOGIN_FAIL_PATTERN = r'>(Incorrect Login or Password|Error<)'
 
 
@@ -49,9 +52,10 @@ class XFSAccount(Account):
 
 
     def loadAccountInfo(self, user, req):
-        validuntil  = None
-        trafficleft = None
-        premium     = None
+        validuntil   = None
+        trafficleft  = None
+        leechtraffic = None
+        premium      = None
 
         html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True)
 
@@ -84,7 +88,7 @@ class XFSAccount(Account):
         if m:
             try:
                 traffic = m.groupdict()
-                size = traffic['S']
+                size    = traffic['S']
 
                 if "nlimited" in size:
                     trafficleft = -1
@@ -105,7 +109,34 @@ class XFSAccount(Account):
         else:
             self.logDebug("TRAFFIC_LEFT_PATTERN not found")
 
-        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
+        m = re.finditer(self.LEECH_TRAFFIC_PATTERN, html)
+        if m:
+            leechtraffic = 0
+            try:
+                for leech in m:
+                    size = leech['S']
+
+                    if "nlimited" in size:
+                        leechtraffic = -1
+                        if validuntil is None:
+                            validuntil = -1
+                        break
+                    else:
+                        if 'U' in leech:
+                            unit = leech['U']
+                        elif isinstance(self.LEECH_TRAFFIC_UNIT, basestring):
+                            unit = self.LEECH_TRAFFIC_UNIT
+                        else:
+                            unit = ""
+
+                        leechtraffic += self.parseTraffic(size + unit)
+
+            except Exception, e:
+                self.logError(e)
+        else:
+            self.logDebug("LEECH_TRAFFIC_PATTERN not found")
+
+        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'leechtraffic': leechtraffic, 'premium': premium}
 
 
     def login(self, user, data, req):
-- 
cgit v1.2.3


From ecfeeb64458e2425420d145bae1da89bd6da9280 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 23 Nov 2014 17:29:06 +0100
Subject: [XFSAccount] Revert validuntil computation

---
 module/plugins/internal/XFSAccount.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 54ca5a8d8..f2a4e8a15 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -2,7 +2,7 @@
 
 import re
 
-from time import localtime, mktime, strptime
+from time import gmtime, mktime, strptime
 from urlparse import urljoin
 
 from module.plugins.Account import Account
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.29"
+    __version__ = "0.30"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -67,7 +67,7 @@ class XFSAccount(Account):
             self.logDebug("Expire date: " + expiredate)
 
             try:
-                validuntil = mktime(strptime(expiredate, "%d %B %Y")) + 86400
+                validuntil = mktime(strptime(expiredate, "%d %B %Y"))
 
             except Exception, e:
                 self.logError(e)
@@ -75,7 +75,7 @@ class XFSAccount(Account):
             else:
                 self.logDebug("Valid until: %s" % validuntil)
 
-                if validuntil > mktime(localtime()):
+                if validuntil > mktime(gmtime()):
                     premium = True
                     trafficleft = -1
                 else:
-- 
cgit v1.2.3


From 2b14c07bfe427f40288b2c73db1813c0dc11659a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 23 Nov 2014 23:18:39 +0100
Subject: [CaptchaService] More debug logging

---
 module/plugins/internal/CaptchaService.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 38775f519..7009e6986 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -7,7 +7,7 @@ from random import random
 
 class CaptchaService:
     __name__    = "CaptchaService"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -52,7 +52,7 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -92,7 +92,6 @@ class ReCaptcha(CaptchaService):
                 raise TypeError(errmsg)
 
         js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key})
-
         try:
             challenge = re.search("challenge : '(.+?)',", js).group(1)
             server = re.search("server : '(.+?)',", js).group(1)
@@ -101,6 +100,8 @@ class ReCaptcha(CaptchaService):
 
         result = self.result(server, challenge)
 
+        self.plugin.logDebug("ReCaptcha result: %s" % result, "challenge: %s" % challenge)
+
         return challenge, result
 
 
@@ -111,7 +112,7 @@ class ReCaptcha(CaptchaService):
 
 class AdsCaptcha(CaptchaService):
     __name__    = "AdsCaptcha"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """AdsCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -154,7 +155,6 @@ class AdsCaptcha(CaptchaService):
         CaptchaId, PublicKey = key
 
         js = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx", get={'CaptchaId': CaptchaId, 'PublicKey': PublicKey})
-
         try:
             challenge = re.search("challenge: '(.+?)',", js).group(1)
             server = re.search("server: '(.+?)',", js).group(1)
@@ -163,6 +163,8 @@ class AdsCaptcha(CaptchaService):
 
         result = self.result(server, challenge)
 
+        self.plugin.logDebug("AdsCaptcha result: %s" % result, "challenge: %s" % challenge)
+
         return challenge, result
 
 
@@ -173,7 +175,7 @@ class AdsCaptcha(CaptchaService):
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -202,6 +204,8 @@ class SolveMedia(CaptchaService):
 
         result = self.result(server, challenge)
 
+        self.plugin.logDebug("SolveMedia result: %s" % result, "challenge: %s" % challenge)
+
         return challenge, result
 
 
-- 
cgit v1.2.3


From 65d290c21e5426f515684f624b8872dec7c0bec0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 23 Nov 2014 23:20:53 +0100
Subject: [SimpleHoster] Fix _getDirectLink routine

---
 module/plugins/internal/SimpleHoster.py | 37 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 01702d423..80ec2669b 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -19,7 +19,6 @@ from module.utils import fixup, parseFileSize
 statusMap = dict((v, k) for k, v in _statusMap.iteritems())
 
 
-#@TODO: Remove in 0.4.10 and redirect to self.error instead
 def _error(self, reason, type):
         if not reason and not type:
             type = "unknown"
@@ -57,12 +56,13 @@ def parseHtmlTagAttrValue(attr_name, tag):
     return m.group(2) if m else None
 
 
-def parseHtmlForm(attr_str, html, input_names=None):
-    for form in re.finditer(r"(?P<tag><form[^>]*%s[^>]*>)(?P<content>.*?)</?(form|body|html)[^>]*>" % attr_str,
+def parseHtmlForm(attr_str, html, input_names={}):
+    for form in re.finditer(r"(?P<TAG><form[^>]*%s[^>]*>)(?P<CONTENT>.*?)</?(form|body|html)[^>]*>" % attr_str,
                             html, re.S | re.I):
         inputs = {}
-        action = parseHtmlTagAttrValue("action", form.group('tag'))
-        for inputtag in re.finditer(r'(<(input|textarea)[^>]*>)([^<]*(?=</\2)|)', form.group('content'), re.S | re.I):
+        action = parseHtmlTagAttrValue("action", form.group('TAG'))
+
+        for inputtag in re.finditer(r'(<(input|textarea)[^>]*>)([^<]*(?=</\2)|)', form.group('CONTENT'), re.S | re.I):
             name = parseHtmlTagAttrValue("name", inputtag.group(1))
             if name:
                 value = parseHtmlTagAttrValue("value", inputtag.group(1))
@@ -71,7 +71,7 @@ def parseHtmlForm(attr_str, html, input_names=None):
                 else:
                     inputs[name] = value
 
-        if isinstance(input_names, dict):
+        if input_names:
             # check input attributes
             for key, val in input_names.iteritems():
                 if key in inputs:
@@ -111,23 +111,21 @@ def timestamp():
 
 #@TODO: Move to hoster class in 0.4.10
 def _getDirectLink(self, url):
-    self.req.http.c.setopt(FOLLOWLOCATION, 0)
+    header = self.load(url, ref=True, just_header=True, decode=True)
 
-    html = self.load(url, ref=True, decode=True)
+    if not 'location' in header or not header['location']:
+        return ""
 
-    self.req.http.c.setopt(FOLLOWLOCATION, 1)
+    if header['code'] != 302 or 'content-type' not in header or header['content-type'] != "text/plain":
+        return ""
 
-    if self.getInfo(url, html)['status'] is not 2:
-        try:
-            return re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I).group(1).rstrip()  #@TODO: Remove .rstrip() in 0.4.10
-        except:
-            pass
+    return header['location']
 
 
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.61"
+    __version__ = "0.62"
 
     __pattern__ = r'^unmatchable$'
 
@@ -419,14 +417,15 @@ class SimpleHoster(Hoster):
 
 
     def handleDirect(self):
-        self.link = _getDirectLink(self, self.pyfile.url)
+        link = _getDirectLink(self, self.pyfile.url)
 
-        if self.link:
+        if link:
             self.logInfo(_("Direct download link detected"))
 
+            self.link = link
+
             self._updateInfo(self.getInfo(self.pyfile.url))
             self.checkNameSize()
-
         else:
             self.logDebug(_("Direct download link not found"))
 
@@ -480,7 +479,7 @@ class SimpleHoster(Hoster):
         self.retry(max_tries=max_tries, reason=_("Download limit reached"))
 
 
-    def parseHtmlForm(self, attr_str='', input_names=None):
+    def parseHtmlForm(self, attr_str='', input_names={}):
         return parseHtmlForm(attr_str, self.html, input_names)
 
 
-- 
cgit v1.2.3


From f0d4e2f503787dac35fb6ef80d93ad721a9b83d2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 24 Nov 2014 01:12:54 +0100
Subject: [XFSHoster] Code improvements

---
 module/plugins/internal/SimpleHoster.py |  3 ++-
 module/plugins/internal/XFSHoster.py    | 35 +++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 80ec2669b..95b52a017 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -19,6 +19,7 @@ from module.utils import fixup, parseFileSize
 statusMap = dict((v, k) for k, v in _statusMap.iteritems())
 
 
+#@TODO: Remove in 0.4.10 and redirect to self.error instead
 def _error(self, reason, type):
         if not reason and not type:
             type = "unknown"
@@ -479,7 +480,7 @@ class SimpleHoster(Hoster):
         self.retry(max_tries=max_tries, reason=_("Download limit reached"))
 
 
-    def parseHtmlForm(self, attr_str='', input_names={}):
+    def parseHtmlForm(self, attr_str="", input_names={}):
         return parseHtmlForm(attr_str, self.html, input_names)
 
 
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 30864ef02..2aaf18b1a 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.24"
+    __version__ = "0.26"
 
     __pattern__ = r'^unmatchable$'
 
@@ -33,10 +33,10 @@ class XFSHoster(SimpleHoster):
     TEXT_ENCODING     = False
     COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
     CHECK_DIRECT_LINK = None
-    MULTI_HOSTER      = False
+    MULTI_HOSTER      = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
     INFO_PATTERN = r'<tr><td align=right><b>Filename:</b></td><td nowrap>(?P<N>[^<]+)</td></tr>\s*.*?<small>\((?P<S>[^<]+)\)</small>'
-    NAME_PATTERN = r'(>Filename:</b></td><td nowrap>|name="fname" value="|<span class="name">|<[Tt]itle>.*?Download )(?P<N>.+?)(\s*<|")'
+    NAME_PATTERN = r'(>Filename:</b></td><td nowrap>|name="fname" value="|<span class="name">)(?P<N>.+?)(\s*<|")'
     SIZE_PATTERN = r'(>Size:</b></td><td>|>File:.*>|<span class="size">)(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
@@ -46,14 +46,17 @@ class XFSHoster(SimpleHoster):
     PREMIUM_ONLY_PATTERN = r'>This file is available for Premium Users only'
     ERROR_PATTERN        = r'(?:class=["\']err["\'].*?>|<[Cc]enter><b>|>Error</td>|>\(ERROR:)(?:\s*<.+?>\s*)*(.+?)(?:["\']|<|\))'
 
-    OVR_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
-    LINK_PATTERN     = None  #: final download url pattern
+    LEECH_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
+    LINK_PATTERN       = None  #: final download url pattern
 
     CAPTCHA_PATTERN     = r'(https?://[^"\']+?/captchas?/[^"\']+)'
     CAPTCHA_DIV_PATTERN = r'>Enter code.*?<div.*?>(.+?)</div>'
     RECAPTCHA_PATTERN   = None
     SOLVEMEDIA_PATTERN  = None
 
+    FORM_PATTERN    = None
+    FORM_INPUTS_MAP = None  #: dict passed as input_names to parseHtmlForm
+
 
     def setup(self):
         self.chunkLimit = 1
@@ -143,7 +146,7 @@ class XFSHoster(SimpleHoster):
         #only tested with easybytez.com
         self.html = self.load("http://www.%s/" % self.HOSTER_DOMAIN)
 
-        action, inputs = self.parseHtmlForm('')
+        action, inputs = self.parseHtmlForm()
 
         upload_id = "%012d" % int(random() * 10 ** 12)
         action += upload_id + "&js_on=1&utype=prem&upload_type=url"
@@ -184,11 +187,11 @@ class XFSHoster(SimpleHoster):
             self.fail(stmsg)
 
         #get easybytez.com link for uploaded file
-        m = re.search(self.OVR_LINK_PATTERN, self.html)
+        m = re.search(self.LEECH_LINK_PATTERN, self.html)
         if m is None:
-            self.error(_("OVR_LINK_PATTERN not found"))
+            self.error(_("LEECH_LINK_PATTERN not found"))
 
-        header = self.load(m.group(1).strip(), just_header=True, decode=True)  #@TODO: Remove .strip() in 0.4.10
+        header = self.load(m.group(1), just_header=True, decode=True)
 
         if 'location' in header:  #: Direct download link
             self.link = header['location']
@@ -257,10 +260,10 @@ class XFSHoster(SimpleHoster):
 
 
     def getPostParameters(self):
-        if hasattr(self, "FORM_PATTERN"):
-            action, inputs = self.parseHtmlForm(self.FORM_PATTERN)
+        if self.FORM_PATTERN or self.FORM_INPUTS_MAP:
+            action, inputs = self.parseHtmlForm(self.FORM_PATTERN or "", self.FORM_INPUTS_MAP or {})
         else:
-            action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")})
+            action, inputs = self.parseHtmlForm(input_names={'op': re.compile(r'^download')})
 
         if not inputs:
             action, inputs = self.parseHtmlForm('F1')
@@ -311,8 +314,8 @@ class XFSHoster(SimpleHoster):
         m = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.S)
         if m:
             captcha_div = m.group(1)
+            numerals    = re.findall(r'<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div))
             self.logDebug(captcha_div)
-            numerals = re.findall(r'<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div))
             inputs['code'] = "".join([a[1] for a in sorted(numerals, key=lambda num: int(num[0]))])
             self.logDebug("Captcha code: %s" % inputs['code'], numerals)
             return 2
@@ -322,9 +325,10 @@ class XFSHoster(SimpleHoster):
             captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
         except:
             captcha_key = recaptcha.detect_key()
+        else:
+            self.logDebug("ReCaptcha key: %s" % captcha_key)
 
         if captcha_key:
-            self.logDebug("ReCaptcha key: %s" % captcha_key)
             inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key)
             return 3
 
@@ -333,9 +337,10 @@ class XFSHoster(SimpleHoster):
             captcha_key = re.search(self.SOLVEMEDIA_PATTERN, self.html).group(1)
         except:
             captcha_key = solvemedia.detect_key()
+        else:
+            self.logDebug("SolveMedia key: %s" % captcha_key)
 
         if captcha_key:
-            self.logDebug("SolveMedia key: %s" % captcha_key)
             inputs['adcopy_challenge'], inputs['adcopy_response'] = solvemedia.challenge(captcha_key)
             return 4
 
-- 
cgit v1.2.3