From 7e759ef2d5dbb30da9752b72146bf4ff240821a8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 2 Nov 2014 22:34:38 +0100
Subject: Update internal XFS plugins

---
 module/plugins/internal/XFSHoster.py | 299 +++++++++++++++++++++++++++++++++++
 1 file changed, 299 insertions(+)
 create mode 100644 module/plugins/internal/XFSHoster.py

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
new file mode 100644
index 000000000..b7a407a19
--- /dev/null
+++ b/module/plugins/internal/XFSHoster.py
@@ -0,0 +1,299 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
+from random import random
+
+from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
+from module.plugins.internal.SimpleHoster import create_getInfo, replace_patterns, set_cookies, SimpleHoster
+from module.plugins.Plugin import Fail
+from module.utils import html_unescape
+
+
+class XFSHoster(SimpleHoster):
+    __name__    = "XFSHoster"
+    __type__    = "hoster"
+    __version__ = "0.08"
+
+    __pattern__ = None
+
+    __description__ = """XFileSharing hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_DOMAIN = None
+    HOSTER_NAME = None
+
+    COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
+
+    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'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
+    SIZE_PATTERN = r'You have requested .*\((?P<S>[\d\.\,]+) ?(?P<U>[\w^_]+)?\)</font>'
+
+    OFFLINE_PATTERN = r'>\s*\w+ (Not Found|file (was|has been) removed)'
+    TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
+
+    WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>'
+
+    OVR_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
+    LINK_PATTERN = None  #: final download url pattern
+
+    CAPTCHA_PATTERN = r'(http://[^"\']+?/captchas?/[^"\']+)'
+    CAPTCHA_DIV_PATTERN = r'>Enter code.*?<div.*?>(.+?)</div>'
+    RECAPTCHA_PATTERN = None
+    SOLVEMEDIA_PATTERN = None
+
+    ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<[Cc]enter><b>)(.+?)(?:["\']|</)'
+
+
+    def setup(self):
+        self.chunkLimit = 1
+        self.resumeDownload = self.multiDL = self.premium
+
+
+    def prepare(self):
+        """ Initialize important variables """
+        if not self.HOSTER_DOMAIN:
+            self.fail(_("Missing HOSTER_DOMAIN"))
+
+        if not self.HOSTER_NAME:
+            self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')])
+
+        if not self.LINK_PATTERN:
+            pattern = r'(https?://(www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
+            self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
+
+        self.captcha = None
+        self.errmsg = None
+        self.passwords = self.getPassword().splitlines()
+
+        return super(XFSHoster, self).prepare()
+
+
+    def handleFree(self):
+        link = self.getDownloadLink()
+
+        if link:
+            if self.captcha:
+                self.correctCaptcha()
+
+            self.download(link, ref=True, cookies=True, disposition=True)
+
+        elif self.errmsg and "captcha" in self.errmsg:
+            self.error(_("No valid captcha code entered"))
+
+        else:
+            self.error(_("Download link not found"))
+
+
+    def handlePremium(self):
+        return self.handleFree()
+
+
+    def getDownloadLink(self):
+        for i in xrange(5):
+            self.logDebug("Getting download link: #%d" % i)
+
+            data = self.getPostParameters()
+
+            self.req.http.c.setopt(FOLLOWLOCATION, 0)
+
+            self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True)
+            self.header = self.req.http.header
+
+            self.req.http.c.setopt(FOLLOWLOCATION, 1)
+
+            m = re.search(r"Location\s*:\s*(.+)", self.header, re.I)
+            if m:
+                break
+
+            m = re.search(self.LINK_PATTERN, self.html, re.S)
+            if m:
+                break
+
+        return m.group(1)
+
+
+    #@TODO: Re-enable
+    def handleOverriden(self):
+        #only tested with easybytez.com
+        self.html = self.load("http://www.%s/" % self.HOSTER_NAME)
+        action, inputs = self.parseHtmlForm('')
+        upload_id = "%012d" % int(random() * 10 ** 12)
+        action += upload_id + "&js_on=1&utype=prem&upload_type=url"
+        inputs['tos'] = '1'
+        inputs['url_mass'] = self.pyfile.url
+        inputs['up1oad_type'] = 'url'
+
+        self.logDebug(action, inputs)
+        #wait for file to upload to easybytez.com
+        self.req.http.c.setopt(LOW_SPEED_TIME, 600)
+        self.html = self.load(action, post=inputs)
+
+        action, inputs = self.parseHtmlForm('F1')
+        if not inputs:
+            self.error(_("TEXTAREA not found"))
+        self.logDebug(inputs)
+        if inputs['st'] == 'OK':
+            self.html = self.load(action, post=inputs)
+        elif inputs['st'] == 'Can not leech file':
+            self.retry(20, 3 * 60, inputs['st'])
+        else:
+            self.fail(_(inputs['st']))
+
+        #get easybytez.com link for uploaded file
+        m = re.search(self.OVR_LINK_PATTERN, self.html)
+        if m is None:
+            self.error(_("OVR_LINK_PATTERN not found"))
+
+        self.pyfile.url = m.group(1)
+
+        header = self.load(self.pyfile.url, just_header=True, decode=True)
+        if 'location' in header:  # Direct link
+            self.download(header['location'], ref=True, cookies=True, disposition=True)
+        else:
+            self.retry(reason=_("OVR link location not found"))
+
+
+    def checkErrors(self):
+        m = re.search(self.ERROR_PATTERN, self.html)
+        if m:
+            self.errmsg = m.group(1)
+            self.logWarning(re.sub(r"<.*?>", " ", self.errmsg))
+
+            if 'wait' in self.errmsg:
+                wait_time = sum([int(v) * {"hour": 3600, "minute": 60, "second": 1}[u] for v, u in
+                                 re.findall(r'(\d+)\s*(hour|minute|second)', self.errmsg)])
+                self.wait(wait_time, True)
+
+            elif 'captcha' in self.errmsg:
+                self.invalidCaptcha()
+
+            elif 'premium' in self.errmsg and 'require' in self.errmsg:
+                self.fail(_("File can be downloaded by premium users only"))
+
+            elif 'limit' in self.errmsg:
+                self.wait(1 * 60 * 60, True)
+                self.retry(25, reason="Download limit exceeded")
+
+            elif 'countdown' in self.errmsg or 'Expired' in self.errmsg:
+                self.retry(reason=_("Link expired"))
+
+            elif 'maintenance' in self.errmsg or 'maintainance' in self.errmsg:
+                self.tempOffline()
+
+            elif 'download files up to' in self.errmsg:
+                self.fail(_("File too large for free download"))
+
+            else:
+                self.fail(self.errmsg)
+        else:
+            self.errmsg = None
+
+        return self.errmsg
+
+
+    def getPostParameters(self):
+        for _i in xrange(3):
+            self.checkErrors()
+
+            if hasattr(self, "FORM_PATTERN"):
+                action, inputs = self.parseHtmlForm(self.FORM_PATTERN)
+            else:
+                action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")})
+
+            if not inputs:
+                action, inputs = self.parseHtmlForm('F1')
+                if not inputs:
+                    if self.errmsg:
+                        self.retry(reason=self.errmsg)
+                    else:
+                        self.error(_("Form not found"))
+
+            self.logDebug(inputs)
+
+            if 'op' in inputs and inputs['op'] in ("download2", "download3"):
+                if "password" in inputs:
+                    if self.passwords:
+                        inputs['password'] = self.passwords.pop(0)
+                    else:
+                        self.fail(_("No or invalid passport"))
+
+                if not self.premium:
+                    m = re.search(self.WAIT_PATTERN, self.html)
+                    if m:
+                        wait_time = int(m.group(1))
+                        self.setWait(wait_time, False)
+                    else:
+                        wait_time = 0
+
+                    self.captcha = self.handleCaptcha(inputs)
+
+                    if wait_time:
+                        self.wait()
+
+                self.errmsg = None
+                return inputs
+
+            else:
+                inputs['referer'] = self.pyfile.url
+
+                if self.premium:
+                    inputs['method_premium'] = "Premium Download"
+                    if 'method_free' in inputs:
+                        del inputs['method_free']
+                else:
+                    inputs['method_free'] = "Free Download"
+                    if 'method_premium' in inputs:
+                        del inputs['method_premium']
+
+                self.html = self.load(self.pyfile.url, post=inputs, ref=True)
+                self.errmsg = None
+
+        else:
+            self.error(_("FORM: %s") % (inputs['op'] if 'op' in inputs else _("UNKNOWN")))
+
+
+    def handleCaptcha(self, inputs):
+        m = re.search(self.CAPTCHA_PATTERN, self.html)
+        if m:
+            captcha_url = m.group(1)
+            inputs['code'] = self.decryptCaptcha(captcha_url)
+            return 1
+
+        m = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.S)
+        if m:
+            captcha_div = m.group(1)
+            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
+
+        recaptcha = ReCaptcha(self)
+        try:
+            captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
+        except:
+            captcha_key = recaptcha.detect_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
+
+        solvemedia = SolveMedia(self)
+        try:
+            captcha_key = re.search(self.SOLVEMEDIA_PATTERN, self.html).group(1)
+        except:
+            captcha_key = solvemedia.detect_key()
+
+        if captcha_key:
+            self.logDebug("SolveMedia key: %s" % captcha_key)
+            inputs['adcopy_challenge'], inputs['adcopy_response'] = solvemedia.challenge(captcha_key)
+            return 4
+
+        return 0
-- 
cgit v1.2.3


From c8532b09917647b656d650e0b4a82de6022d85a4 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 3 Nov 2014 12:05:36 +0100
Subject: [XFSHoster] Fix handleOverriden

---
 module/plugins/internal/XFSHoster.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index b7a407a19..838af9102 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -2,9 +2,10 @@
 
 import re
 
-from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 from random import random
 
+from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
+
 from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
 from module.plugins.internal.SimpleHoster import create_getInfo, replace_patterns, set_cookies, SimpleHoster
 from module.plugins.Plugin import Fail
@@ -14,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __pattern__ = None
 
@@ -71,6 +72,12 @@ class XFSHoster(SimpleHoster):
         self.errmsg = None
         self.passwords = self.getPassword().splitlines()
 
+        if re.match(self.__pattern__, self.pyfile.url) is None:
+            if self.premium:
+                self.handleOverriden()
+            else:
+                self.fail(_("Only premium users can download from other hosters"))
+
         return super(XFSHoster, self).prepare()
 
 
@@ -118,26 +125,31 @@ class XFSHoster(SimpleHoster):
         return m.group(1)
 
 
-    #@TODO: Re-enable
     def handleOverriden(self):
         #only tested with easybytez.com
-        self.html = self.load("http://www.%s/" % self.HOSTER_NAME)
+        self.html = self.load("http://www.%s/" % self.HOSTER_DOMAIN)
+
         action, inputs = self.parseHtmlForm('')
+
         upload_id = "%012d" % int(random() * 10 ** 12)
         action += upload_id + "&js_on=1&utype=prem&upload_type=url"
+
         inputs['tos'] = '1'
         inputs['url_mass'] = self.pyfile.url
         inputs['up1oad_type'] = 'url'
 
         self.logDebug(action, inputs)
-        #wait for file to upload to easybytez.com
-        self.req.http.c.setopt(LOW_SPEED_TIME, 600)
+
+        self.req.http.c.setopt(LOW_SPEED_TIME, 600)  #: wait for file to upload to easybytez.com
+
         self.html = self.load(action, post=inputs)
 
         action, inputs = self.parseHtmlForm('F1')
         if not inputs:
-            self.error(_("TEXTAREA not found"))
+            self.error(_("TEXTAREA F1 not found"))
+
         self.logDebug(inputs)
+
         if inputs['st'] == 'OK':
             self.html = self.load(action, post=inputs)
         elif inputs['st'] == 'Can not leech file':
@@ -212,7 +224,7 @@ class XFSHoster(SimpleHoster):
                     if self.errmsg:
                         self.retry(reason=self.errmsg)
                     else:
-                        self.error(_("Form not found"))
+                        self.error(_("TEXTAREA F1 not found"))
 
             self.logDebug(inputs)
 
-- 
cgit v1.2.3


From 03f3b86f500c495932fd118b54569d92f700847c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 3 Nov 2014 16:57:55 +0100
Subject: Code cosmetics about file_info and other stuff

---
 module/plugins/internal/XFSHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 838af9102..a2e4f5846 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -17,7 +17,7 @@ class XFSHoster(SimpleHoster):
     __type__    = "hoster"
     __version__ = "0.09"
 
-    __pattern__ = None
+    __pattern__ = r'^unmatchable$'
 
     __description__ = """XFileSharing hoster plugin"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From 2f4d7d614171054c3c2b0b6185fa4ea465f5312f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 01:09:43 +0100
Subject: Use more print_exc + code cosmetics

---
 module/plugins/internal/XFSHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index a2e4f5846..147c4dfde 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -102,7 +102,7 @@ class XFSHoster(SimpleHoster):
 
 
     def getDownloadLink(self):
-        for i in xrange(5):
+        for i in xrange(1, 5):
             self.logDebug("Getting download link: #%d" % i)
 
             data = self.getPostParameters()
-- 
cgit v1.2.3


From a476b801080244611001acca694e9937be1c9405 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 03:26:21 +0100
Subject: [XFSHoster] Improved MultiHoster check and download limit detection

---
 module/plugins/internal/XFSHoster.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 147c4dfde..008cfb3e1 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -6,6 +6,7 @@ from random import random
 
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 
+from module.plugins.hoster.UnrestrictLi import secondsToMidnight
 from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
 from module.plugins.internal.SimpleHoster import create_getInfo, replace_patterns, set_cookies, SimpleHoster
 from module.plugins.Plugin import Fail
@@ -15,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __pattern__ = r'^unmatchable$'
 
@@ -35,18 +36,18 @@ class XFSHoster(SimpleHoster):
     NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
     SIZE_PATTERN = r'You have requested .*\((?P<S>[\d\.\,]+) ?(?P<U>[\w^_]+)?\)</font>'
 
-    OFFLINE_PATTERN = r'>\s*\w+ (Not Found|file (was|has been) removed)'
+    OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
 
     WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>'
 
     OVR_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
-    LINK_PATTERN = None  #: final download url pattern
+    LINK_PATTERN     = None  #: final download url pattern
 
-    CAPTCHA_PATTERN = r'(http://[^"\']+?/captchas?/[^"\']+)'
+    CAPTCHA_PATTERN     = r'(http://[^"\']+?/captchas?/[^"\']+)'
     CAPTCHA_DIV_PATTERN = r'>Enter code.*?<div.*?>(.+?)</div>'
-    RECAPTCHA_PATTERN = None
-    SOLVEMEDIA_PATTERN = None
+    RECAPTCHA_PATTERN   = None
+    SOLVEMEDIA_PATTERN  = None
 
     ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<[Cc]enter><b>)(.+?)(?:["\']|</)'
 
@@ -72,7 +73,8 @@ class XFSHoster(SimpleHoster):
         self.errmsg = None
         self.passwords = self.getPassword().splitlines()
 
-        if re.match(self.__pattern__, self.pyfile.url) is None:
+        # MultiHoster check
+        if self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']:
             if self.premium:
                 self.handleOverriden()
             else:
@@ -189,8 +191,15 @@ class XFSHoster(SimpleHoster):
                 self.fail(_("File can be downloaded by premium users only"))
 
             elif 'limit' in self.errmsg:
-                self.wait(1 * 60 * 60, True)
-                self.retry(25, reason="Download limit exceeded")
+                if 'days' in self.errmsg:
+                    delay = secondsToMidnight(gmt=2)
+                    retries = 2
+                else:
+                    delay = 1 * 60 * 60
+                    retries = 25
+
+                self.wait(delay, True)
+                self.retry(retries, reason="Download limit exceeded")
 
             elif 'countdown' in self.errmsg or 'Expired' in self.errmsg:
                 self.retry(reason=_("Link expired"))
-- 
cgit v1.2.3


From 6412e51af626ee89ce6d9dac99a6c53e1878d142 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 14:19:32 +0100
Subject: logDebug when detects ddl or multi hoster link

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

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 008cfb3e1..12ac4845d 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -75,6 +75,7 @@ class XFSHoster(SimpleHoster):
 
         # MultiHoster check
         if self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']:
+            self.logInfo(_("Multi hoster detected"))
             if self.premium:
                 self.handleOverriden()
             else:
-- 
cgit v1.2.3


From f74309f89923317eeaaca31d74dff10590ed3d40 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 23:42:46 +0100
Subject: [XFSHoster] Use URL_REPLACEMENTS to clean url

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

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 12ac4845d..4e9a0ffe6 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.10"
+    __version__ = "0.11"
 
     __pattern__ = r'^unmatchable$'
 
@@ -28,7 +28,9 @@ class XFSHoster(SimpleHoster):
 
 
     HOSTER_DOMAIN = None
-    HOSTER_NAME = None
+    HOSTER_NAME   = None
+
+    URL_REPLACEMENTS = [(r'/(?:embed-)?(\w{12}).*', r'/\1')]  #: plus support embedded files
 
     COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
 
-- 
cgit v1.2.3


From 7afad85d15451a235e11b9d7752d828fadbf5d85 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 6 Nov 2014 22:41:16 +0100
Subject: [XFSHoster] Fix Multi hoster detection

---
 module/plugins/internal/XFSHoster.py | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 4e9a0ffe6..b380c5f69 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.11"
+    __version__ = "0.12"
 
     __pattern__ = r'^unmatchable$'
 
@@ -76,12 +76,14 @@ class XFSHoster(SimpleHoster):
         self.passwords = self.getPassword().splitlines()
 
         # MultiHoster check
-        if self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']:
+        if self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
+           and re.match(self.__pattern__, self.pyfile.url) is None:
             self.logInfo(_("Multi hoster detected"))
             if self.premium:
+                self.logDebug(_("Looking for leech download link..."))
                 self.handleOverriden()
             else:
-                self.fail(_("Only premium users can download from other hosters"))
+                self.fail(_("Only premium users can use url leech feature"))
 
         return super(XFSHoster, self).prepare()
 
@@ -155,12 +157,19 @@ class XFSHoster(SimpleHoster):
 
         self.logDebug(inputs)
 
-        if inputs['st'] == 'OK':
+        stmsg = inputs['st']
+
+        if stmsg == "OK":
             self.html = self.load(action, post=inputs)
-        elif inputs['st'] == 'Can not leech file':
-            self.retry(20, 3 * 60, inputs['st'])
+
+        elif "Can not leech file" in stmsg:
+            self.retry(20, 3 * 60, _("Can not leech file"))
+
+        elif "all Leech traffic today" in stmsg:
+            self.retry(wait_time=secondsToMidnight(gmt=2), reason=_("You've used all Leech traffic today"))
+
         else:
-            self.fail(_(inputs['st']))
+            self.fail(stmsg)
 
         #get easybytez.com link for uploaded file
         m = re.search(self.OVR_LINK_PATTERN, self.html)
@@ -170,10 +179,10 @@ class XFSHoster(SimpleHoster):
         self.pyfile.url = m.group(1)
 
         header = self.load(self.pyfile.url, just_header=True, decode=True)
-        if 'location' in header:  # Direct link
+        if 'location' in header:  #: Direct download link
             self.download(header['location'], ref=True, cookies=True, disposition=True)
         else:
-            self.retry(reason=_("OVR link location not found"))
+            self.error(_("No leech download link found"))
 
 
     def checkErrors(self):
@@ -196,13 +205,13 @@ class XFSHoster(SimpleHoster):
             elif 'limit' in self.errmsg:
                 if 'days' in self.errmsg:
                     delay = secondsToMidnight(gmt=2)
-                    retries = 2
+                    retries = 3
                 else:
                     delay = 1 * 60 * 60
                     retries = 25
 
                 self.wait(delay, True)
-                self.retry(retries, reason="Download limit exceeded")
+                self.retry(retries, reason=_("Download limit exceeded"))
 
             elif 'countdown' in self.errmsg or 'Expired' in self.errmsg:
                 self.retry(reason=_("Link expired"))
-- 
cgit v1.2.3


From 81d05814e4dc4f403b965dbfb0c713c0a6513355 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 7 Nov 2014 02:34:01 +0100
Subject: [XFSHoster] Fix a really silly typo

---
 module/plugins/internal/XFSHoster.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index b380c5f69..94c5d9595 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.12"
+    __version__ = "0.13"
 
     __pattern__ = r'^unmatchable$'
 
@@ -75,12 +75,11 @@ class XFSHoster(SimpleHoster):
         self.errmsg = None
         self.passwords = self.getPassword().splitlines()
 
-        # MultiHoster check
-        if self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
-           and re.match(self.__pattern__, self.pyfile.url) is None:
+        if (self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
+            and re.match(self.__pattern__, self.pyfile.url) is None):
             self.logInfo(_("Multi hoster detected"))
             if self.premium:
-                self.logDebug(_("Looking for leech download link..."))
+                self.logDebug(_("Looking for download link..."))
                 self.handleOverriden()
             else:
                 self.fail(_("Only premium users can use url leech feature"))
@@ -182,7 +181,7 @@ class XFSHoster(SimpleHoster):
         if 'location' in header:  #: Direct download link
             self.download(header['location'], ref=True, cookies=True, disposition=True)
         else:
-            self.error(_("No leech download link found"))
+            self.fail(_("No download link found"))
 
 
     def checkErrors(self):
-- 
cgit v1.2.3


From 58c9c8d78417ec6ccac5b6b117ea540033a09574 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 7 Nov 2014 17:08:21 +0100
Subject: Fix download link formatting in some plugins

---
 module/plugins/internal/XFSHoster.py | 57 +++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 24 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 94c5d9595..ecf1f9f97 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -3,20 +3,20 @@
 import re
 
 from random import random
+from time import sleep
 
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 
 from module.plugins.hoster.UnrestrictLi import secondsToMidnight
 from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
-from module.plugins.internal.SimpleHoster import create_getInfo, replace_patterns, set_cookies, SimpleHoster
-from module.plugins.Plugin import Fail
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.utils import html_unescape
 
 
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.13"
+    __version__ = "0.14"
 
     __pattern__ = r'^unmatchable$'
 
@@ -96,11 +96,14 @@ class XFSHoster(SimpleHoster):
 
             self.download(link, ref=True, cookies=True, disposition=True)
 
-        elif self.errmsg and "captcha" in self.errmsg:
-            self.error(_("No valid captcha code entered"))
+        elif self.errmsg:
+            if 'captcha' in self.errmsg:
+                self.fail(_("No valid captcha code entered"))
+            else:
+                self.fail(self.errmsg)
 
         else:
-            self.error(_("Download link not found"))
+            self.fail(_("Download link not found"))
 
 
     def handlePremium(self):
@@ -111,8 +114,16 @@ class XFSHoster(SimpleHoster):
         for i in xrange(1, 5):
             self.logDebug("Getting download link: #%d" % i)
 
+            self.checkErrors()
+
+            m = re.search(self.LINK_PATTERN, self.html, re.S)
+            if m:
+                break
+
             data = self.getPostParameters()
 
+            # sleep(10)
+
             self.req.http.c.setopt(FOLLOWLOCATION, 0)
 
             self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True)
@@ -120,15 +131,19 @@ class XFSHoster(SimpleHoster):
 
             self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
-            m = re.search(r"Location\s*:\s*(.+)", self.header, re.I)
+            m = re.search(r'Location\s*:\s*(.+)', self.header, re.I)
             if m:
                 break
 
             m = re.search(self.LINK_PATTERN, self.html, re.S)
             if m:
                 break
+        else:
+            return
 
-        return m.group(1)
+        self.errmsg = None
+
+        return m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
 
 
     def handleOverriden(self):
@@ -158,13 +173,13 @@ class XFSHoster(SimpleHoster):
 
         stmsg = inputs['st']
 
-        if stmsg == "OK":
+        if stmsg == 'OK':
             self.html = self.load(action, post=inputs)
 
-        elif "Can not leech file" in stmsg:
+        elif 'Can not leech file' in stmsg:
             self.retry(20, 3 * 60, _("Can not leech file"))
 
-        elif "all Leech traffic today" in stmsg:
+        elif 'today' in stmsg:
             self.retry(wait_time=secondsToMidnight(gmt=2), reason=_("You've used all Leech traffic today"))
 
         else:
@@ -175,19 +190,21 @@ class XFSHoster(SimpleHoster):
         if m is None:
             self.error(_("OVR_LINK_PATTERN not found"))
 
-        self.pyfile.url = m.group(1)
-
-        header = self.load(self.pyfile.url, just_header=True, decode=True)
+        header = self.load(m.group(1).strip(), just_header=True, decode=True)  #@TODO: Remove .strip() in 0.4.10
         if 'location' in header:  #: Direct download link
             self.download(header['location'], ref=True, cookies=True, disposition=True)
         else:
-            self.fail(_("No download link found"))
+            self.fail(_("Download link not found"))
 
 
     def checkErrors(self):
         m = re.search(self.ERROR_PATTERN, self.html)
-        if m:
+
+        if m is None:
+            self.errmsg = None
+        else:
             self.errmsg = m.group(1)
+
             self.logWarning(re.sub(r"<.*?>", " ", self.errmsg))
 
             if 'wait' in self.errmsg:
@@ -223,16 +240,12 @@ class XFSHoster(SimpleHoster):
 
             else:
                 self.fail(self.errmsg)
-        else:
-            self.errmsg = None
 
         return self.errmsg
 
 
     def getPostParameters(self):
         for _i in xrange(3):
-            self.checkErrors()
-
             if hasattr(self, "FORM_PATTERN"):
                 action, inputs = self.parseHtmlForm(self.FORM_PATTERN)
             else:
@@ -268,9 +281,7 @@ class XFSHoster(SimpleHoster):
                     if wait_time:
                         self.wait()
 
-                self.errmsg = None
                 return inputs
-
             else:
                 inputs['referer'] = self.pyfile.url
 
@@ -284,8 +295,6 @@ class XFSHoster(SimpleHoster):
                         del inputs['method_premium']
 
                 self.html = self.load(self.pyfile.url, post=inputs, ref=True)
-                self.errmsg = None
-
         else:
             self.error(_("FORM: %s") % (inputs['op'] if 'op' in inputs else _("UNKNOWN")))
 
-- 
cgit v1.2.3


From 84b12612e3498d8e3543b2f54bbe3b848ee83460 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 8 Nov 2014 01:49:36 +0100
Subject: [XFSHoster] Improve ERROR_PATTERN

---
 module/plugins/internal/XFSHoster.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index ecf1f9f97..84c8dfa91 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.14"
+    __version__ = "0.15"
 
     __pattern__ = r'^unmatchable$'
 
@@ -36,7 +36,7 @@ class XFSHoster(SimpleHoster):
 
     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'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
-    SIZE_PATTERN = r'You have requested .*\((?P<S>[\d\.\,]+) ?(?P<U>[\w^_]+)?\)</font>'
+    SIZE_PATTERN = r'You have requested .*\((?P<S>[\d.,]+) ?(?P<U>[\w^_]+)?\)</font>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
@@ -51,7 +51,7 @@ class XFSHoster(SimpleHoster):
     RECAPTCHA_PATTERN   = None
     SOLVEMEDIA_PATTERN  = None
 
-    ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<[Cc]enter><b>)(.+?)(?:["\']|</)'
+    ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<[Cc]enter><b>)(.+?)(?:["\']|</)|>\(ERROR:(.+?)\)'
 
 
     def setup(self):
@@ -165,9 +165,14 @@ class XFSHoster(SimpleHoster):
 
         self.html = self.load(action, post=inputs)
 
+        self.checkErrors()
+
         action, inputs = self.parseHtmlForm('F1')
         if not inputs:
-            self.error(_("TEXTAREA F1 not found"))
+            if self.errmsg:
+                self.retry(reason=self.errmsg)
+            else:
+                self.error(_("TEXTAREA F1 not found"))
 
         self.logDebug(inputs)
 
@@ -239,7 +244,7 @@ class XFSHoster(SimpleHoster):
                 self.fail(_("File too large for free download"))
 
             else:
-                self.fail(self.errmsg)
+                self.retry(wait_time=60, reason=self.errmsg)
 
         return self.errmsg
 
-- 
cgit v1.2.3


From 71c9121e0479db4ac1cb34ac4b4881e9b291772c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 13 Nov 2014 01:01:41 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/XFSHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 84c8dfa91..f54bb5e45 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -161,7 +161,7 @@ class XFSHoster(SimpleHoster):
 
         self.logDebug(action, inputs)
 
-        self.req.http.c.setopt(LOW_SPEED_TIME, 600)  #: wait for file to upload to easybytez.com
+        self.req.setOption("timeout", 600)  #: wait for file to upload to easybytez.com
 
         self.html = self.load(action, post=inputs)
 
-- 
cgit v1.2.3


From c370ee8ed94c016d3e4e30b1917bc34e9510be0b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 20 Nov 2014 23:00:45 +0100
Subject: [XFSHoster] Fix StreamcloudEu (thx seoester)

---
 module/plugins/internal/XFSHoster.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index f54bb5e45..43f6cab83 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.15"
+    __version__ = "0.16"
 
     __pattern__ = r'^unmatchable$'
 
@@ -41,7 +41,7 @@ class XFSHoster(SimpleHoster):
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
 
-    WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>'
+    WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'
 
     OVR_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
     LINK_PATTERN     = None  #: final download url pattern
@@ -122,8 +122,6 @@ class XFSHoster(SimpleHoster):
 
             data = self.getPostParameters()
 
-            # sleep(10)
-
             self.req.http.c.setopt(FOLLOWLOCATION, 0)
 
             self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True)
@@ -266,7 +264,7 @@ class XFSHoster(SimpleHoster):
 
             self.logDebug(inputs)
 
-            if 'op' in inputs and inputs['op'] in ("download2", "download3"):
+            if 'op' in inputs and inputs['op'] in ("download1", "download2", "download3"):
                 if "password" in inputs:
                     if self.passwords:
                         inputs['password'] = self.passwords.pop(0)
-- 
cgit v1.2.3


From f9f18d96663a1d50dee9c8bc45766ffd1af9fba8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 21 Nov 2014 07:10:08 +0100
Subject: [XFSHoster] Updated

---
 module/plugins/internal/XFSHoster.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 43f6cab83..ea5889190 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.16"
+    __version__ = "0.17"
 
     __pattern__ = r'^unmatchable$'
 
@@ -71,6 +71,9 @@ class XFSHoster(SimpleHoster):
             pattern = r'(https?://(www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
+        if self.CHECK_DIRECT_LINK is None:
+            self.CHECK_DIRECT_LINK = bool(self.premium)
+
         self.captcha = None
         self.errmsg = None
         self.passwords = self.getPassword().splitlines()
-- 
cgit v1.2.3


From e9c00be0d343ad30bca51147160b5067d7f9c1a8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 21 Nov 2014 18:18:13 +0100
Subject: [XFSHoster] Update info patterns

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

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index ea5889190..de9fbc831 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.17"
+    __version__ = "0.18"
 
     __pattern__ = r'^unmatchable$'
 
@@ -35,8 +35,8 @@ class XFSHoster(SimpleHoster):
     COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
 
     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'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
-    SIZE_PATTERN = r'You have requested .*\((?P<S>[\d.,]+) ?(?P<U>[\w^_]+)?\)</font>'
+    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)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
-- 
cgit v1.2.3


From 70759ae9fd8561436bef08322d45ac41637c66d6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 21 Nov 2014 20:01:24 +0100
Subject: [XFSHoster] Fix getPostParameters

---
 module/plugins/internal/XFSHoster.py | 102 +++++++++++++++++------------------
 1 file changed, 50 insertions(+), 52 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index de9fbc831..d2a771507 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.18"
+    __version__ = "0.19"
 
     __pattern__ = r'^unmatchable$'
 
@@ -32,7 +32,9 @@ class XFSHoster(SimpleHoster):
 
     URL_REPLACEMENTS = [(r'/(?:embed-)?(\w{12}).*', r'/\1')]  #: plus support embedded files
 
-    COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
+    TEXT_ENCODING     = False
+    COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
+    CHECK_DIRECT_LINK = None
 
     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">)(?P<N>.+?)(\s*<|")'
@@ -128,19 +130,19 @@ class XFSHoster(SimpleHoster):
             self.req.http.c.setopt(FOLLOWLOCATION, 0)
 
             self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True)
-            self.header = self.req.http.header
 
             self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
-            m = re.search(r'Location\s*:\s*(.+)', self.header, re.I)
-            if m:
+            m = re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I)
+            if m and not "op=" in m.group(1):
                 break
 
             m = re.search(self.LINK_PATTERN, self.html, re.S)
             if m:
                 break
         else:
-            return
+            self.logError(data['op'] if 'op' in data else _("UNKNOWN"))
+            return ""
 
         self.errmsg = None
 
@@ -197,6 +199,7 @@ class XFSHoster(SimpleHoster):
             self.error(_("OVR_LINK_PATTERN not found"))
 
         header = self.load(m.group(1).strip(), just_header=True, decode=True)  #@TODO: Remove .strip() in 0.4.10
+
         if 'location' in header:  #: Direct download link
             self.download(header['location'], ref=True, cookies=True, disposition=True)
         else:
@@ -251,58 +254,53 @@ class XFSHoster(SimpleHoster):
 
 
     def getPostParameters(self):
-        for _i in xrange(3):
-            if hasattr(self, "FORM_PATTERN"):
-                action, inputs = self.parseHtmlForm(self.FORM_PATTERN)
-            else:
-                action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")})
+        if hasattr(self, "FORM_PATTERN"):
+            action, inputs = self.parseHtmlForm(self.FORM_PATTERN)
+        else:
+            action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")})
 
+        if not inputs:
+            action, inputs = self.parseHtmlForm('F1')
             if not inputs:
-                action, inputs = self.parseHtmlForm('F1')
-                if not inputs:
-                    if self.errmsg:
-                        self.retry(reason=self.errmsg)
-                    else:
-                        self.error(_("TEXTAREA F1 not found"))
-
-            self.logDebug(inputs)
-
-            if 'op' in inputs and inputs['op'] in ("download1", "download2", "download3"):
-                if "password" in inputs:
-                    if self.passwords:
-                        inputs['password'] = self.passwords.pop(0)
-                    else:
-                        self.fail(_("No or invalid passport"))
-
-                if not self.premium:
-                    m = re.search(self.WAIT_PATTERN, self.html)
-                    if m:
-                        wait_time = int(m.group(1))
-                        self.setWait(wait_time, False)
-                    else:
-                        wait_time = 0
-
-                    self.captcha = self.handleCaptcha(inputs)
-
-                    if wait_time:
-                        self.wait()
-
-                return inputs
-            else:
-                inputs['referer'] = self.pyfile.url
+                if self.errmsg:
+                    self.retry(reason=self.errmsg)
+                else:
+                    self.error(_("TEXTAREA F1 not found"))
 
-                if self.premium:
-                    inputs['method_premium'] = "Premium Download"
-                    if 'method_free' in inputs:
-                        del inputs['method_free']
+        self.logDebug(inputs)
+
+        if 'op' in inputs:
+            if "password" in inputs:
+                if self.passwords:
+                    inputs['password'] = self.passwords.pop(0)
+                else:
+                    self.fail(_("No or invalid passport"))
+
+            if not self.premium:
+                m = re.search(self.WAIT_PATTERN, self.html)
+                if m:
+                    wait_time = int(m.group(1))
+                    self.setWait(wait_time, False)
                 else:
-                    inputs['method_free'] = "Free Download"
-                    if 'method_premium' in inputs:
-                        del inputs['method_premium']
+                    wait_time = 0
+
+                self.captcha = self.handleCaptcha(inputs)
 
-                self.html = self.load(self.pyfile.url, post=inputs, ref=True)
+                if wait_time:
+                    self.wait()
         else:
-            self.error(_("FORM: %s") % (inputs['op'] if 'op' in inputs else _("UNKNOWN")))
+            inputs['referer'] = self.pyfile.url
+
+        if self.premium:
+            inputs['method_premium'] = "Premium Download"
+            if 'method_free' in inputs:
+                del inputs['method_free']
+        else:
+            inputs['method_free'] = "Free Download"
+            if 'method_premium' in inputs:
+                del inputs['method_premium']
+
+        return inputs
 
 
     def handleCaptcha(self, inputs):
-- 
cgit v1.2.3


From e6c7bc85b5a18bef90ea0f3a3c235d3849c28b89 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 22 Nov 2014 01:37:33 +0100
Subject: [XFSHoster] Improvements

---
 module/plugins/internal/XFSHoster.py | 71 +++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 34 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index d2a771507..0c428c032 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.19"
+    __version__ = "0.20"
 
     __pattern__ = r'^unmatchable$'
 
@@ -35,6 +35,7 @@ class XFSHoster(SimpleHoster):
     TEXT_ENCODING     = False
     COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
     CHECK_DIRECT_LINK = None
+    MULTI_HOSTER      = False
 
     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">)(?P<N>.+?)(\s*<|")'
@@ -43,18 +44,18 @@ class XFSHoster(SimpleHoster):
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
 
-    WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'
+    WAIT_PATTERN         = r'<span id="countdown_str">.*?>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'
+    PREMIUM_ONLY_PATTERN = r'>This file is available for Premium Users only'
+    ERROR_PATTERN        = r'(?:class=["\']err["\'].*?>|<[Cc]enter><b>|>Error</td></tr>\s*<tr><td align=center>\s*(?:<.+?>)?)(.+?)(?:["\']|</)|>\(ERROR:(.+?)\)'
 
     OVR_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
     LINK_PATTERN     = None  #: final download url pattern
 
-    CAPTCHA_PATTERN     = r'(http://[^"\']+?/captchas?/[^"\']+)'
+    CAPTCHA_PATTERN     = r'(https?://[^"\']+?/captchas?/[^"\']+)'
     CAPTCHA_DIV_PATTERN = r'>Enter code.*?<div.*?>(.+?)</div>'
     RECAPTCHA_PATTERN   = None
     SOLVEMEDIA_PATTERN  = None
 
-    ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<[Cc]enter><b>)(.+?)(?:["\']|</)|>\(ERROR:(.+?)\)'
-
 
     def setup(self):
         self.chunkLimit = 1
@@ -73,23 +74,14 @@ class XFSHoster(SimpleHoster):
             pattern = r'(https?://(www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
-        if self.CHECK_DIRECT_LINK is None:
-            self.CHECK_DIRECT_LINK = bool(self.premium)
-
-        self.captcha = None
-        self.errmsg = None
+        self.captcha   = None
+        self.errmsg    = None
         self.passwords = self.getPassword().splitlines()
 
-        if (self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
-            and re.match(self.__pattern__, self.pyfile.url) is None):
-            self.logInfo(_("Multi hoster detected"))
-            if self.premium:
-                self.logDebug(_("Looking for download link..."))
-                self.handleOverriden()
-            else:
-                self.fail(_("Only premium users can use url leech feature"))
+        super(XFSHoster, self).prepare()
 
-        return super(XFSHoster, self).prepare()
+        if self.CHECK_DIRECT_LINK is None:
+            self.directDL = bool(self.premium)
 
 
     def handleFree(self):
@@ -134,8 +126,11 @@ class XFSHoster(SimpleHoster):
             self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
             m = re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I)
-            if m and not "op=" in m.group(1):
-                break
+            if m:
+                if 'down_direct' in data and data['down_direct']:
+                    break
+                else:
+                    self.error(_("Direct download link detected but not found"))
 
             m = re.search(self.LINK_PATTERN, self.html, re.S)
             if m:
@@ -149,7 +144,7 @@ class XFSHoster(SimpleHoster):
         return m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
 
 
-    def handleOverriden(self):
+    def handleMulti(self):
         #only tested with easybytez.com
         self.html = self.load("http://www.%s/" % self.HOSTER_DOMAIN)
 
@@ -201,12 +196,17 @@ class XFSHoster(SimpleHoster):
         header = self.load(m.group(1).strip(), just_header=True, decode=True)  #@TODO: Remove .strip() in 0.4.10
 
         if 'location' in header:  #: Direct download link
-            self.download(header['location'], ref=True, cookies=True, disposition=True)
+            self.link = header['location']
         else:
             self.fail(_("Download link not found"))
 
 
     def checkErrors(self):
+        m = re.search(self.PREMIUM_ONLY_PATTERN, self.html)
+        if m:
+            self.info['error'] = "premium-only"
+            return
+
         m = re.search(self.ERROR_PATTERN, self.html)
 
         if m is None:
@@ -217,10 +217,13 @@ class XFSHoster(SimpleHoster):
             self.logWarning(re.sub(r"<.*?>", " ", self.errmsg))
 
             if 'wait' in self.errmsg:
-                wait_time = sum([int(v) * {"hour": 3600, "minute": 60, "second": 1}[u] for v, u in
-                                 re.findall(r'(\d+)\s*(hour|minute|second)', self.errmsg)])
+                wait_time = sum([int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
+                                 re.findall(r'(\d+)\s*(hr|hour|min|sec)', self.errmsg, re.I)])
                 self.wait(wait_time, True)
 
+            elif 'country' in self.errmsg:
+                self.fail(_("Downloads are disabled for your country"))
+
             elif 'captcha' in self.errmsg:
                 self.invalidCaptcha()
 
@@ -250,6 +253,11 @@ class XFSHoster(SimpleHoster):
             else:
                 self.retry(wait_time=60, reason=self.errmsg)
 
+        if self.errmsg:
+            self.info['error'] = self.errmsg
+        else:
+            self.info.pop('error', None)
+
         return self.errmsg
 
 
@@ -274,31 +282,26 @@ class XFSHoster(SimpleHoster):
                 if self.passwords:
                     inputs['password'] = self.passwords.pop(0)
                 else:
-                    self.fail(_("No or invalid passport"))
+                    self.fail(_("Missing password"))
 
             if not self.premium:
                 m = re.search(self.WAIT_PATTERN, self.html)
                 if m:
                     wait_time = int(m.group(1))
                     self.setWait(wait_time, False)
-                else:
-                    wait_time = 0
 
                 self.captcha = self.handleCaptcha(inputs)
 
-                if wait_time:
-                    self.wait()
+                self.wait()
         else:
             inputs['referer'] = self.pyfile.url
 
         if self.premium:
             inputs['method_premium'] = "Premium Download"
-            if 'method_free' in inputs:
-                del inputs['method_free']
+            inputs.pop('method_free', None)
         else:
             inputs['method_free'] = "Free Download"
-            if 'method_premium' in inputs:
-                del inputs['method_premium']
+            inputs.pop('method_premium', None)
 
         return inputs
 
-- 
cgit v1.2.3


From 9f10e758325f4ce80c479bc16149e677b9e1885f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 22 Nov 2014 06:38:17 +0100
Subject: [XFSAccount][XFSHoster] Tiny pattern improvement

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

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 0c428c032..a6a3f3260 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.20"
+    __version__ = "0.21"
 
     __pattern__ = r'^unmatchable$'
 
@@ -38,7 +38,7 @@ class XFSHoster(SimpleHoster):
     MULTI_HOSTER      = False
 
     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">)(?P<N>.+?)(\s*<|")'
+    NAME_PATTERN = r'(>Filename:</b></td><td nowrap>|name="fname" value="|<span class="name">|<[Tt]itle>.*?Download )(?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)'
-- 
cgit v1.2.3


From 561357c1e1fdb86a4ad89f146f8a1d1241d21a3b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 22 Nov 2014 17:09:17 +0100
Subject: [XFSHoster] Improve ERROR_PATTERN + revert direct link detection in
 getDownloadLink

---
 module/plugins/internal/XFSHoster.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index a6a3f3260..d5bbf5c63 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.21"
+    __version__ = "0.22"
 
     __pattern__ = r'^unmatchable$'
 
@@ -46,7 +46,7 @@ class XFSHoster(SimpleHoster):
 
     WAIT_PATTERN         = r'<span id="countdown_str">.*?>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'
     PREMIUM_ONLY_PATTERN = r'>This file is available for Premium Users only'
-    ERROR_PATTERN        = r'(?:class=["\']err["\'].*?>|<[Cc]enter><b>|>Error</td></tr>\s*<tr><td align=center>\s*(?:<.+?>)?)(.+?)(?:["\']|</)|>\(ERROR:(.+?)\)'
+    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
@@ -126,11 +126,8 @@ class XFSHoster(SimpleHoster):
             self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
             m = re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I)
-            if m:
-                if 'down_direct' in data and data['down_direct']:
-                    break
-                else:
-                    self.error(_("Direct download link detected but not found"))
+            if m and not "op=" in m.group(1):
+                break
 
             m = re.search(self.LINK_PATTERN, self.html, re.S)
             if m:
@@ -212,7 +209,7 @@ class XFSHoster(SimpleHoster):
         if m is None:
             self.errmsg = None
         else:
-            self.errmsg = m.group(1)
+            self.errmsg = m.group(1).strip()
 
             self.logWarning(re.sub(r"<.*?>", " ", self.errmsg))
 
-- 
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/XFSHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

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/XFSHoster.py')

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 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/XFSHoster.py | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

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


From 86d3b6249073947132ed3a9eeb1b1e987d19569a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 1 Dec 2014 18:17:13 +0100
Subject: Update some plugins

---
 module/plugins/internal/XFSHoster.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 2aaf18b1a..587d47f6e 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.26"
+    __version__ = "0.27"
 
     __pattern__ = r'^unmatchable$'
 
@@ -49,10 +49,10 @@ class XFSHoster(SimpleHoster):
     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
+    CAPTCHA_PATTERN       = r'(https?://[^"\']+?/captchas?/[^"\']+)'
+    CAPTCHA_BLOCK_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
@@ -234,10 +234,10 @@ class XFSHoster(SimpleHoster):
                     retries = 3
                 else:
                     delay = 1 * 60 * 60
-                    retries = 25
+                    retries = 24
 
-                self.wait(delay, True)
-                self.retry(retries, reason=_("Download limit exceeded"))
+                self.wantReconnect = True
+                self.retry(retries, delay, _("Download limit exceeded"))
 
             elif 'countdown' in self.errmsg or 'Expired' in self.errmsg:
                 self.retry(reason=_("Link expired"))
@@ -249,6 +249,7 @@ class XFSHoster(SimpleHoster):
                 self.fail(_("File too large for free download"))
 
             else:
+                self.wantReconnect = True
                 self.retry(wait_time=60, reason=self.errmsg)
 
         if self.errmsg:
@@ -311,7 +312,7 @@ class XFSHoster(SimpleHoster):
             inputs['code'] = self.decryptCaptcha(captcha_url)
             return 1
 
-        m = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.S)
+        m = re.search(self.CAPTCHA_BLOCK_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))
-- 
cgit v1.2.3


From a83f45f14aefb4fd766f7908e11bc6beaac3d0e8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 1 Dec 2014 18:51:37 +0100
Subject: [XFSAccount] Improve patterns

---
 module/plugins/internal/XFSHoster.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 587d47f6e..c3db3f335 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -35,7 +35,6 @@ class XFSHoster(SimpleHoster):
     CHECK_DIRECT_LINK = None
     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">)(?P<N>.+?)(\s*<|")'
     SIZE_PATTERN = r'(>Size:</b></td><td>|>File:.*>|<span class="size">)(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
 
-- 
cgit v1.2.3


From 5a23de6f32dc99960cccd634d2fd2cc47c34be2a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 5 Dec 2014 23:08:44 +0100
Subject: Code cosmetics about checkErrors

---
 module/plugins/internal/XFSHoster.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index c3db3f335..3ae0692dc 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -256,8 +256,6 @@ class XFSHoster(SimpleHoster):
         else:
             self.info.pop('error', None)
 
-        return self.errmsg
-
 
     def getPostParameters(self):
         if self.FORM_PATTERN or self.FORM_INPUTS_MAP:
-- 
cgit v1.2.3


From f633832bbfce04f4b1b83e59c02701483ef03525 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 16 Dec 2014 23:01:43 +0100
Subject: [XFSHoster] Improve SIZE_PATTERN

---
 module/plugins/internal/XFSHoster.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 3ae0692dc..bb4baa274 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.27"
+    __version__ = "0.28"
 
     __pattern__ = r'^unmatchable$'
 
@@ -36,7 +36,7 @@ class XFSHoster(SimpleHoster):
     MULTI_HOSTER      = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
     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^_]+)'
+    SIZE_PATTERN = r'(>Size:</b></td><td>|>File:.*>|</font>\s*\(|<span class="size">)(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
@@ -199,13 +199,7 @@ class XFSHoster(SimpleHoster):
 
 
     def checkErrors(self):
-        m = re.search(self.PREMIUM_ONLY_PATTERN, self.html)
-        if m:
-            self.info['error'] = "premium-only"
-            return
-
         m = re.search(self.ERROR_PATTERN, self.html)
-
         if m is None:
             self.errmsg = None
         else:
-- 
cgit v1.2.3


From ad2808a5eb6903875036c00b5195e8b7651379f0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 17 Dec 2014 23:48:23 +0100
Subject: [XFSHoster] Improve NAME_PATTERN & SIZE_PATTERN

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

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index bb4baa274..622f34ea9 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.28"
+    __version__ = "0.29"
 
     __pattern__ = r'^unmatchable$'
 
@@ -35,8 +35,8 @@ class XFSHoster(SimpleHoster):
     CHECK_DIRECT_LINK = None
     MULTI_HOSTER      = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
-    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:.*>|</font>\s*\(|<span class="size">)(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
+    NAME_PATTERN = r'(Filename[ ]*:[ ]*</b>(</td><td nowrap>)?|name="fname"[ ]+value="|<[\w^_]+ class="(file)?name">)\s*(?P<N>.+?)(\s*<|")'
+    SIZE_PATTERN = r'(Size[ ]*:[ ]*</b>(</td><td>)?|File:.*>|</font>\s*\(|<[\w^_]+ class="size">)\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
-- 
cgit v1.2.3


From ad8d5997b60012e7f1c895956f5ea713870177bb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 23 Dec 2014 00:58:03 +0100
Subject: [XFSHoster] Improve error handling

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

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 622f34ea9..7038743c1 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.29"
+    __version__ = "0.30"
 
     __pattern__ = r'^unmatchable$'
 
@@ -238,7 +238,7 @@ class XFSHoster(SimpleHoster):
             elif 'maintenance' in self.errmsg or 'maintainance' in self.errmsg:
                 self.tempOffline()
 
-            elif 'download files up to' in self.errmsg:
+            elif 'up to' in self.errmsg:
                 self.fail(_("File too large for free download"))
 
             else:
-- 
cgit v1.2.3


From e1d4186c62512d8bb76d35b6f8d1828d8d0aa94e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 23 Dec 2014 13:26:32 +0100
Subject: [SimpleHoster] Improve multi-hoster feature

---
 module/plugins/internal/XFSHoster.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 7038743c1..dd2dd2527 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.30"
+    __version__ = "0.31"
 
     __pattern__ = r'^unmatchable$'
 
@@ -142,6 +142,9 @@ class XFSHoster(SimpleHoster):
 
 
     def handleMulti(self):
+        if not self.account:
+            self.fail(_("Only registered or premium users can use url leech feature"))
+
         #only tested with easybytez.com
         self.html = self.load("http://www.%s/" % self.HOSTER_DOMAIN)
 
-- 
cgit v1.2.3


From 136f63dc39603814b215606f888fb2e639021277 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 04:27:41 +0100
Subject: Spare code fixes

---
 module/plugins/internal/XFSHoster.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index dd2dd2527..7c6ae5725 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.31"
+    __version__ = "0.32"
 
     __pattern__ = r'^unmatchable$'
 
@@ -32,7 +32,7 @@ class XFSHoster(SimpleHoster):
 
     TEXT_ENCODING     = False
     COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
-    CHECK_DIRECT_LINK = None
+    DIRECT_LINK       = None
     MULTI_HOSTER      = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
     NAME_PATTERN = r'(Filename[ ]*:[ ]*</b>(</td><td nowrap>)?|name="fname"[ ]+value="|<[\w^_]+ class="(file)?name">)\s*(?P<N>.+?)(\s*<|")'
@@ -45,7 +45,7 @@ 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*)*(.+?)(?:["\']|<|\))'
 
-    LEECH_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
+    LINK_LEECH_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
     LINK_PATTERN       = None  #: final download url pattern
 
     CAPTCHA_PATTERN       = r'(https?://[^"\']+?/captchas?/[^"\']+)'
@@ -58,7 +58,7 @@ class XFSHoster(SimpleHoster):
 
 
     def setup(self):
-        self.chunkLimit = 1
+        self.chunkLimit     = 1
         self.resumeDownload = self.multiDL = self.premium
 
 
@@ -80,7 +80,7 @@ class XFSHoster(SimpleHoster):
 
         super(XFSHoster, self).prepare()
 
-        if self.CHECK_DIRECT_LINK is None:
+        if self.DIRECT_LINK is None:
             self.directDL = bool(self.premium)
 
 
@@ -189,9 +189,9 @@ class XFSHoster(SimpleHoster):
             self.fail(stmsg)
 
         #get easybytez.com link for uploaded file
-        m = re.search(self.LEECH_LINK_PATTERN, self.html)
+        m = re.search(self.LINK_LEECH_PATTERN, self.html)
         if m is None:
-            self.error(_("LEECH_LINK_PATTERN not found"))
+            self.error(_("LINK_LEECH_PATTERN not found"))
 
         header = self.load(m.group(1), just_header=True, decode=True)
 
-- 
cgit v1.2.3


From b6a2bd53628bd2824bac1dafc7b4eafdf3c815dd Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 13:48:03 +0100
Subject: Update plugins after SimpleHoster changes

---
 module/plugins/internal/XFSHoster.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 7c6ae5725..f2168d0c7 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -7,16 +7,15 @@ from time import sleep
 
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 
-from module.plugins.hoster.UnrestrictLi import secondsToMidnight
 from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, secondsToMidnight
 from module.utils import html_unescape
 
 
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.32"
+    __version__ = "0.33"
 
     __pattern__ = r'^unmatchable$'
 
@@ -30,10 +29,10 @@ class XFSHoster(SimpleHoster):
     HOSTER_DOMAIN = None
     HOSTER_NAME   = None
 
-    TEXT_ENCODING     = False
-    COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
-    DIRECT_LINK       = None
-    MULTI_HOSTER      = True  #@NOTE: Should be default to False for safe, but I'm lazy...
+    TEXT_ENCODING = False
+    COOKIES       = [(HOSTER_DOMAIN, "lang", "english")]
+    DIRECT_LINK   = None
+    MULTI_HOSTER  = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
     NAME_PATTERN = r'(Filename[ ]*:[ ]*</b>(</td><td nowrap>)?|name="fname"[ ]+value="|<[\w^_]+ class="(file)?name">)\s*(?P<N>.+?)(\s*<|")'
     SIZE_PATTERN = r'(Size[ ]*:[ ]*</b>(</td><td>)?|File:.*>|</font>\s*\(|<[\w^_]+ class="size">)\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
@@ -226,10 +225,10 @@ class XFSHoster(SimpleHoster):
 
             elif 'limit' in self.errmsg:
                 if 'days' in self.errmsg:
-                    delay = secondsToMidnight(gmt=2)
+                    delay   = secondsToMidnight(gmt=2)
                     retries = 3
                 else:
-                    delay = 1 * 60 * 60
+                    delay   = 1 * 60 * 60
                     retries = 24
 
                 self.wantReconnect = True
-- 
cgit v1.2.3


From 1c443921febd75050968bb37e7fc88e361c487a9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 21:27:00 +0100
Subject: [XFSHoster] Code cosmetics

---
 module/plugins/internal/XFSHoster.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal/XFSHoster.py')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index f2168d0c7..4555e7b0f 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -73,9 +73,8 @@ class XFSHoster(SimpleHoster):
             pattern = r'(https?://(www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
-        self.captcha   = None
-        self.errmsg    = None
-        self.passwords = self.getPassword().splitlines()
+        self.captcha = None
+        self.errmsg  = None
 
         super(XFSHoster, self).prepare()
 
@@ -271,8 +270,9 @@ class XFSHoster(SimpleHoster):
 
         if 'op' in inputs:
             if "password" in inputs:
-                if self.passwords:
-                    inputs['password'] = self.passwords.pop(0)
+                password = self.getPassword()
+                if password:
+                    inputs['password'] = password
                 else:
                     self.fail(_("Missing password"))
 
-- 
cgit v1.2.3