Merge pull request #2 from pyload/stable

sync

15 files changed, 569 insertions, 632 deletions

diff --git a/module/plugins/internal/AdYouLike.py b/module/plugins/internal/AdYouLike.py
new file mode 100644
index 000000000..a9c194dda
--- /dev/null
+++ b/module/plugins/internal/AdYouLike.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.common.json_layer import json_loads
+from module.plugins.internal.Captcha import Captcha
+
+
+class AdYouLike(Captcha):
+    __name__    = "AdYouLike"
+    __type__    = "captcha"
+    __version__ = "0.06"
+
+    __description__ = """AdYouLike captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    AYL_PATTERN      = r'Adyoulike\.create\s*\((.+?)\)'
+    CALLBACK_PATTERN = r'(Adyoulike\.g\._jsonp_\d+)'
+
+
+    def detect_key(self, html=None):
+        html = html or self.retrieve_html()
+
+        m = re.search(self.AYL_PATTERN, html)
+        n = re.search(self.CALLBACK_PATTERN, html)
+        if m and n:
+            self.key = (m.group(1).strip(), n.group(1).strip())
+            self.logDebug("Ayl: %s | Callback: %s" % self.key)
+            return self.key   #: key is the tuple(ayl, callback)
+        else:
+            self.logWarning("Ayl or callback pattern not found")
+            return None
+
+
+    def challenge(self, key=None, html=None):
+        ayl, callback = key or self.retrieve_key(html)
+
+        # {"adyoulike":{"key":"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"},
+        # "all":{"element_id":"ayl_private_cap_92300","lang":"fr","env":"prod"}}
+        ayl = json_loads(ayl)
+
+        html = self.plugin.req.load("http://api-ayl.appspot.com/challenge",
+                                    get={'key'     : ayl['adyoulike']['key'],
+                                         'env'     : ayl['all']['env'],
+                                         'callback': callback})
+        try:
+            challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
+
+        except AttributeError:
+            self.fail(_("AdYouLike challenge pattern not found"))
+
+        self.logDebug("Challenge: %s" % challenge)
+
+        return self.result(ayl, challenge), challenge
+
+
+    def result(self, server, challenge):
+        # Adyoulike.g._jsonp_5579316662423138
+        # ({"translations":{"fr":{"instructions_visual":"Recopiez « Soonnight » ci-dessous :"}},
+        # "site_under":true,"clickable":true,"pixels":{"VIDEO_050":[],"DISPLAY":[],"VIDEO_000":[],"VIDEO_100":[],
+        # "VIDEO_025":[],"VIDEO_075":[]},"medium_type":"image/adyoulike",
+        # "iframes":{"big":"<iframe src=\"http://www.soonnight.com/campagn.html\" scrolling=\"no\"
+        # height=\"250\" width=\"300\" frameborder=\"0\"></iframe>"},"shares":{},"id":256,
+        # "token":"e6QuI4aRSnbIZJg02IsV6cp4JQ9~MjA1","formats":{"small":{"y":300,"x":0,"w":300,"h":60},
+        # "big":{"y":0,"x":0,"w":300,"h":250},"hover":{"y":440,"x":0,"w":300,"h":60}},
+        # "tid":"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"})
+
+        if isinstance(server, basestring):
+            server = json_loads(server)
+
+        if isinstance(challenge, basestring):
+            challenge = json_loads(challenge)
+
+        try:
+            instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
+            result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
+
+        except AttributeError:
+            self.fail(_("AdYouLike result not found"))
+
+        result = {'_ayl_captcha_engine' : "adyoulike",
+                  '_ayl_env'            : server['all']['env'],
+                  '_ayl_tid'            : challenge['tid'],
+                  '_ayl_token_challenge': challenge['token'],
+                  '_ayl_response'       : response}
+
+        self.logDebug("Result: %s" % result)
+
+        return result
diff --git a/module/plugins/internal/AdsCaptcha.py b/module/plugins/internal/AdsCaptcha.py
new file mode 100644
index 000000000..9cab99151
--- /dev/null
+++ b/module/plugins/internal/AdsCaptcha.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+import random
+import re
+
+from module.plugins.internal.Captcha import Captcha
+
+
+class AdsCaptcha(Captcha):
+    __name__    = "AdsCaptcha"
+    __type__    = "captcha"
+    __version__ = "0.09"
+
+    __description__ = """AdsCaptcha captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)'
+    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)'
+
+
+    def detect_key(self, html=None):
+        html = html or self.retrieve_html()
+
+        m = re.search(self.PUBLICKEY_PATTERN, html)
+        n = re.search(self.CAPTCHAID_PATTERN, html)
+        if m and n:
+            self.key = (m.group(1).strip(), n.group(1).strip())  #: key is the tuple(PublicKey, CaptchaId)
+            self.logDebug("Key: %s | ID: %s" % self.key)
+            return self.key
+        else:
+            self.logWarning("Key or id pattern not found")
+            return None
+
+
+    def challenge(self, key=None, html=None):
+        PublicKey, CaptchaId = key or self.retrieve_key(html)
+
+        html = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx",
+                                    get={'CaptchaId': CaptchaId,
+                                         'PublicKey': PublicKey})
+        try:
+            challenge = re.search("challenge: '(.+?)',", html).group(1)
+            server    = re.search("server: '(.+?)',", html).group(1)
+
+        except AttributeError:
+            self.fail(_("AdsCaptcha challenge pattern not found"))
+
+        self.logDebug("Challenge: %s" % challenge)
+
+        return self.result(server, challenge), challenge
+
+
+    def result(self, server, challenge):
+        result = self.plugin.decryptCaptcha("%sChallenge.aspx" % server,
+                                            get={'cid': challenge, 'dummy': random.random()},
+                                            cookies=True,
+                                            imgtype="jpg")
+
+        self.logDebug("Result: %s" % result)
+
+        return result
diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py
new file mode 100644
index 000000000..b4af46493
--- /dev/null
+++ b/module/plugins/internal/Captcha.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.Plugin import Base
+
+
+#@TODO: Extend (new) Plugin class; remove all `html` args
+class Captcha(Base):
+    __name__    = "Captcha"
+    __type__    = "captcha"
+    __version__ = "0.29"
+
+    __description__ = """Base captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    key = None  #: last key detected
+
+
+    def __init__(self, plugin):
+        self.plugin = plugin
+        super(Captcha, self).__init__(plugin.core)
+
+
+    #@TODO: Recheck in 0.4.10
+    def fail(self, reason):
+        self.plugin.fail(reason)
+        raise AttributeError(reason)
+
+
+    #@TODO: Recheck in 0.4.10
+    def retrieve_key(self, html):
+        if self.detect_key(html):
+            return self.key
+        else:
+            self.fail(_("%s key not found") % self.__name__)
+
+
+    #@TODO: Recheck in 0.4.10
+    def retrieve_html(self):
+        if hasattr(self.plugin, "html") and self.plugin.html:
+            return self.plugin.html
+        else:
+            self.fail(_("%s html not found") % self.__name__)
+
+
+    def detect_key(self, html=None):
+        raise NotImplementedError
+
+
+    def challenge(self, key=None, html=None):
+        raise NotImplementedError
+
+
+    def result(self, server, challenge):
+        raise NotImplementedError
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
deleted file mode 100644
index e51844965..000000000
--- a/module/plugins/internal/CaptchaService.py
+++ /dev/null
@@ -1,489 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import random
-import re
-import time
-import urlparse
-
-from base64 import b64encode
-
-from module.common.json_layer import json_loads
-from module.plugins.Plugin import Base, Fail
-
-
-#@TODO: Extend (new) Plugin class; remove all `html` args
-class CaptchaService(Base):
-    __name__    = "CaptchaService"
-    __type__    = "captcha"
-    __version__ = "0.29"
-
-    __description__ = """Base captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    key = None  #: last key detected
-
-
-    def __init__(self, plugin):
-        self.plugin = plugin
-        super(CaptchaService, self).__init__(plugin.core)
-
-
-    #@TODO: Recheck in 0.4.10
-    def fail(self, reason):
-        self.plugin.fail(reason)
-        raise AttributeError(reason)
-
-
-    #@TODO: Recheck in 0.4.10
-    def retrieve_key(self, html):
-        if self.detect_key(html):
-            return self.key
-        else:
-            self.fail(_("%s key not found") % self.__name__)
-
-
-    #@TODO: Recheck in 0.4.10
-    def retrieve_html(self):
-        if hasattr(self.plugin, "html") and self.plugin.html:
-            return self.plugin.html
-        else:
-            self.fail(_("%s html not found") % self.__name__)
-
-
-    def detect_key(self, html=None):
-        raise NotImplementedError
-
-
-    def challenge(self, key=None, html=None):
-        raise NotImplementedError
-
-
-    def result(self, server, challenge):
-        raise NotImplementedError
-
-
-class AdYouLike(CaptchaService):
-    __name__    = "AdYouLike"
-    __type__    = "captcha"
-    __version__ = "0.06"
-
-    __description__ = """AdYouLike captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    AYL_PATTERN      = r'Adyoulike\.create\s*\((.+?)\)'
-    CALLBACK_PATTERN = r'(Adyoulike\.g\._jsonp_\d+)'
-
-
-    def detect_key(self, html=None):
-        html = html or self.retrieve_html()
-
-        m = re.search(self.AYL_PATTERN, html)
-        n = re.search(self.CALLBACK_PATTERN, html)
-        if m and n:
-            self.key = (m.group(1).strip(), n.group(1).strip())
-            self.logDebug("Ayl: %s | Callback: %s" % self.key)
-            return self.key   #: key is the tuple(ayl, callback)
-        else:
-            self.logWarning("Ayl or callback pattern not found")
-            return None
-
-
-    def challenge(self, key=None, html=None):
-        ayl, callback = key or self.retrieve_key(html)
-
-        # {"adyoulike":{"key":"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"},
-        # "all":{"element_id":"ayl_private_cap_92300","lang":"fr","env":"prod"}}
-        ayl = json_loads(ayl)
-
-        html = self.plugin.req.load("http://api-ayl.appspot.com/challenge",
-                                    get={'key'     : ayl['adyoulike']['key'],
-                                         'env'     : ayl['all']['env'],
-                                         'callback': callback})
-        try:
-            challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
-
-        except AttributeError:
-            self.fail(_("AdYouLike challenge pattern not found"))
-
-        self.logDebug("Challenge: %s" % challenge)
-
-        return self.result(ayl, challenge), challenge
-
-
-    def result(self, server, challenge):
-        # Adyoulike.g._jsonp_5579316662423138
-        # ({"translations":{"fr":{"instructions_visual":"Recopiez « Soonnight » ci-dessous :"}},
-        # "site_under":true,"clickable":true,"pixels":{"VIDEO_050":[],"DISPLAY":[],"VIDEO_000":[],"VIDEO_100":[],
-        # "VIDEO_025":[],"VIDEO_075":[]},"medium_type":"image/adyoulike",
-        # "iframes":{"big":"<iframe src=\"http://www.soonnight.com/campagn.html\" scrolling=\"no\"
-        # height=\"250\" width=\"300\" frameborder=\"0\"></iframe>"},"shares":{},"id":256,
-        # "token":"e6QuI4aRSnbIZJg02IsV6cp4JQ9~MjA1","formats":{"small":{"y":300,"x":0,"w":300,"h":60},
-        # "big":{"y":0,"x":0,"w":300,"h":250},"hover":{"y":440,"x":0,"w":300,"h":60}},
-        # "tid":"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"})
-
-        if isinstance(server, basestring):
-            server = json_loads(server)
-
-        if isinstance(challenge, basestring):
-            challenge = json_loads(challenge)
-
-        try:
-            instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
-            result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
-
-        except AttributeError:
-            self.fail(_("AdYouLike result not found"))
-
-        result = {'_ayl_captcha_engine' : "adyoulike",
-                  '_ayl_env'            : server['all']['env'],
-                  '_ayl_tid'            : challenge['tid'],
-                  '_ayl_token_challenge': challenge['token'],
-                  '_ayl_response'       : response}
-
-        self.logDebug("Result: %s" % result)
-
-        return result
-
-
-class AdsCaptcha(CaptchaService):
-    __name__    = "AdsCaptcha"
-    __type__    = "captcha"
-    __version__ = "0.09"
-
-    __description__ = """AdsCaptcha captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)'
-    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)'
-
-
-    def detect_key(self, html=None):
-        html = html or self.retrieve_html()
-
-        m = re.search(self.PUBLICKEY_PATTERN, html)
-        n = re.search(self.CAPTCHAID_PATTERN, html)
-        if m and n:
-            self.key = (m.group(1).strip(), n.group(1).strip())  #: key is the tuple(PublicKey, CaptchaId)
-            self.logDebug("Key: %s | ID: %s" % self.key)
-            return self.key
-        else:
-            self.logWarning("Key or id pattern not found")
-            return None
-
-
-    def challenge(self, key=None, html=None):
-        PublicKey, CaptchaId = key or self.retrieve_key(html)
-
-        html = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx",
-                                    get={'CaptchaId': CaptchaId,
-                                         'PublicKey': PublicKey})
-        try:
-            challenge = re.search("challenge: '(.+?)',", html).group(1)
-            server    = re.search("server: '(.+?)',", html).group(1)
-
-        except AttributeError:
-            self.fail(_("AdsCaptcha challenge pattern not found"))
-
-        self.logDebug("Challenge: %s" % challenge)
-
-        return self.result(server, challenge), challenge
-
-
-    def result(self, server, challenge):
-        result = self.plugin.decryptCaptcha("%sChallenge.aspx" % server,
-                                            get={'cid': challenge, 'dummy': random.random()},
-                                            cookies=True,
-                                            imgtype="jpg")
-
-        self.logDebug("Result: %s" % result)
-
-        return result
-
-
-class ReCaptcha(CaptchaService):
-    __name__    = "ReCaptcha"
-    __type__    = "captcha"
-    __version__ = "0.17"
-
-    __description__ = """ReCaptcha captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org"),
-                       ("Walter Purcaro", "vuolter@gmail.com"),
-                       ("zapp-brannigan", "fuerst.reinje@web.de")]
-
-
-    KEY_V2_PATTERN = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\'])([\w-]+)'
-    KEY_V1_PATTERN = r'(?:recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=|Recaptcha\.create\s*\(\s*["\'])([\w-]+)'
-
-
-    def detect_key(self, html=None):
-        html = html or self.retrieve_html()
-
-        m = re.search(self.KEY_V2_PATTERN, html) or re.search(self.KEY_V1_PATTERN, html)
-        if m:
-            self.key = m.group(1).strip()
-            self.logDebug("Key: %s" % self.key)
-            return self.key
-        else:
-            self.logWarning("Key pattern not found")
-            return None
-
-
-    def challenge(self, key=None, html=None, version=None):
-        key = key or self.retrieve_key(html)
-
-        if version in (1, 2):
-            return getattr(self, "_challenge_v%s" % version)(key)
-
-        else:
-            return self.challenge(key,
-                                  version=2 if re.search(self.KEY_V2_PATTERN, html or self.retrieve_html()) else 1)
-
-
-    def _challenge_v1(self, key):
-        html = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge",
-                                    get={'k': key})
-        try:
-            challenge = re.search("challenge : '(.+?)',", html).group(1)
-            server    = re.search("server : '(.+?)',", html).group(1)
-
-        except AttributeError:
-            self.fail(_("ReCaptcha challenge pattern not found"))
-
-        self.logDebug("Challenge: %s" % challenge)
-
-        return self.result(server, challenge, key)
-
-
-    def result(self, server, challenge, key):
-        self.plugin.req.load("http://www.google.com/recaptcha/api/js/recaptcha.js")
-        html = self.plugin.req.load("http://www.google.com/recaptcha/api/reload",
-                                    get={'c'     : challenge,
-                                         'k'     : key,
-                                         'reason': "i",
-                                         'type'  : "image"})
-
-        try:
-            challenge = re.search('\(\'(.+?)\',',html).group(1)
-
-        except AttributeError:
-            self.fail(_("ReCaptcha second challenge pattern not found"))
-
-        self.logDebug("Second challenge: %s" % challenge)
-        result = self.plugin.decryptCaptcha("%simage" % server,
-                                            get={'c': challenge},
-                                            cookies=True,
-                                            forceUser=True,
-                                            imgtype="jpg")
-
-        self.logDebug("Result: %s" % result)
-
-        return result, challenge
-
-
-    def _collectApiInfo(self):
-        html = self.plugin.req.load("http://www.google.com/recaptcha/api.js")
-        a    = re.search(r'po.src = \'(.*?)\';', html).group(1)
-        vers = a.split("/")[5]
-
-        self.logDebug("API version: %s" % vers)
-
-        language = a.split("__")[1].split(".")[0]
-
-        self.logDebug("API language: %s" % language)
-
-        html = self.plugin.req.load("https://apis.google.com/js/api.js")
-        b    = re.search(r'"h":"(.*?)","', html).group(1)
-        jsh  = b.decode('unicode-escape')
-
-        self.logDebug("API jsh-string: %s" % jsh)
-
-        return vers, language, jsh
-
-
-    def _prepareTimeAndRpc(self):
-        self.plugin.req.load("http://www.google.com/recaptcha/api2/demo")
-
-        millis = int(round(time.time() * 1000))
-
-        self.logDebug("Time: %s" % millis)
-
-        rand = random.randint(1, 99999999)
-        a    = "0.%s" % str(rand * 2147483647)
-        rpc  = int(100000000 * float(a))
-
-        self.logDebug("Rpc-token: %s" % rpc)
-
-        return millis, rpc
-
-
-    def _challenge_v2(self, key, parent=None):
-        if parent is None:
-            try:
-                parent = urlparse.urljoin("http://", urlparse.urlparse(self.plugin.pyfile.url).netloc)
-
-            except Exception:
-                parent = ""
-
-        botguardstring      = "!A"
-        vers, language, jsh = self._collectApiInfo()
-        millis, rpc         = self._prepareTimeAndRpc()
-
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/anchor",
-                                    get={'k'       : key,
-                                         'hl'      : language,
-                                         'v'       : vers,
-                                         'usegapi' : "1",
-                                         'jsh'     : "%s#id=IO_%s" % (jsh, millis),
-                                         'parent'  : parent,
-                                         'pfname'  : "",
-                                         'rpctoken': rpc})
-
-        token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
-        self.logDebug("Token #1: %s" % token1.group(1))
-
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
-                                    get={'c'      : token1.group(1),
-                                         'hl'     : language,
-                                         'v'      : vers,
-                                         'bg'     : botguardstring,
-                                         'k'      : key,
-                                         'usegapi': "1",
-                                         'jsh'    : jsh}).decode('unicode-escape')
-
-        token2 = re.search(r'"finput","(.*?)",', html)
-        self.logDebug("Token #2: %s" % token2.group(1))
-
-        token3 = re.search(r'"rresp","(.*?)",', html)
-        self.logDebug("Token #3: %s" % token3.group(1))
-
-        millis_captcha_loading = int(round(time.time() * 1000))
-        captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
-                                                      get={'c':token3.group(1), 'k':key},
-                                                      cookies=True,
-                                                      forceUser=True)
-        response = b64encode('{"response":"%s"}' % captcha_response)
-
-        self.logDebug("Result: %s" % response)
-
-        timeToSolve     = int(round(time.time() * 1000)) - millis_captcha_loading
-        timeToSolveMore = timeToSolve + int(float("0." + str(random.randint(1, 99999999))) * 500)
-
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
-                                    post={'k'       : key,
-                                          'c'       : token3.group(1),
-                                          'response': response,
-                                          't'       : timeToSolve,
-                                          'ct'      : timeToSolveMore,
-                                          'bg'      : botguardstring})
-
-        token4 = re.search(r'"uvresp","(.*?)",', html)
-        self.logDebug("Token #4: %s" % token4.group(1))
-
-        result = token4.group(1)
-
-        return result, None
-
-
-class SolveMedia(CaptchaService):
-    __name__    = "SolveMedia"
-    __type__    = "captcha"
-    __version__ = "0.13"
-
-    __description__ = """SolveMedia captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']'
-
-
-    def detect_key(self, html=None):
-        html = html or self.retrieve_html()
-
-        m = re.search(self.KEY_PATTERN, html)
-        if m:
-            self.key = m.group(1).strip()
-            self.logDebug("Key: %s" % self.key)
-            return self.key
-        else:
-            self.logWarning("Key pattern not found")
-            return None
-
-
-    def challenge(self, key=None, html=None):
-        key = key or self.retrieve_key(html)
-
-        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript",
-                                    get={'k': key})
-
-        for i in xrange(1, 11):
-            try:
-                magic = re.search(r'name="magic" value="(.+?)"', html).group(1)
-
-            except AttributeError:
-                self.logWarning("Magic pattern not found")
-                magic = None
-
-            try:
-                challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="(.+?)">',
-                                      html).group(1)
-
-            except AttributeError:
-                self.fail(_("SolveMedia challenge pattern not found"))
-
-            else:
-                self.logDebug("Challenge: %s" % challenge)
-
-            try:
-                result = self.result("http://api.solvemedia.com/papi/media", challenge)
-
-            except Fail, e:
-                self.logWarning(e)
-                self.plugin.invalidCaptcha()
-                result = None
-
-            html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript",
-                                        post={'adcopy_response' : result,
-                                              'k'               : key,
-                                              'l'               : "en",
-                                              't'               : "img",
-                                              's'               : "standard",
-                                              'magic'           : magic,
-                                              'adcopy_challenge': challenge,
-                                              'ref'             : self.plugin.pyfile.url})
-            try:
-                redirect = re.search(r'URL=(.+?)">', html).group(1)
-
-            except AttributeError:
-                self.fail(_("SolveMedia verify pattern not found"))
-
-            else:
-                if "error" in html:
-                    self.logWarning("Captcha code was invalid")
-                    self.logDebug("Retry #%d" % i)
-                    html = self.plugin.req.load(redirect)
-                else:
-                    break
-
-        else:
-            self.fail(_("SolveMedia max retries exceeded"))
-
-        return result, challenge
-
-
-    def result(self, server, challenge):
-        result = self.plugin.decryptCaptcha(server,
-                                            get={'c': challenge},
-                                            cookies=True,
-                                            imgtype="gif")
-
-        self.logDebug("Result: %s" % result)
-
-        return result
diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py
index c93447164..a12399501 100644
--- a/module/plugins/internal/DeadCrypter.py
+++ b/module/plugins/internal/DeadCrypter.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from module.plugins.internal.SimpleCrypter import create_getInfo
-from module.plugins.Crypter import Crypter as _Crypter
+from module.plugins.Crypter import Crypter
 
 
-class DeadCrypter(_Crypter):
+class DeadCrypter(Crypter):
     __name__    = "DeadCrypter"
     __type__    = "crypter"
     __version__ = "0.05"
@@ -17,8 +17,8 @@ class DeadCrypter(_Crypter):
 
 
     @classmethod
-    def apiInfo(cls, url):
-        api = super(DeadCrypter, cls).apiInfo(url)
+    def apiInfo(cls, *args, **kwargs):
+        api = super(DeadCrypter, cls).apiInfo(*args, **kwargs)
         api['status'] = 1
         return api
 
diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py
index f159ae5fa..22825e87b 100644
--- a/module/plugins/internal/DeadHoster.py
+++ b/module/plugins/internal/DeadHoster.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from module.plugins.internal.SimpleHoster import create_getInfo
-from module.plugins.Hoster import Hoster as _Hoster
+from module.plugins.Hoster import Hoster
 
 
-class DeadHoster(_Hoster):
+class DeadHoster(Hoster):
     __name__    = "DeadHoster"
     __type__    = "hoster"
     __version__ = "0.15"
@@ -17,8 +17,8 @@ class DeadHoster(_Hoster):
 
 
     @classmethod
-    def apiInfo(cls, url):
-        api = super(DeadHoster, cls).apiInfo(url)
+    def apiInfo(cls, *args, **kwargs):
+        api = super(DeadHoster, cls).apiInfo(*args, **kwargs)
         api['status'] = 1
         return api
 
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 159b65ffe..1a98060d9 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -29,8 +29,8 @@ class Extractor:
 
 
     EXTENSIONS = []
-    VERSION    = ""
     REPAIR     = False
+    VERSION    = ""
 
 
     @classmethod
diff --git a/module/plugins/internal/ReCaptcha.py b/module/plugins/internal/ReCaptcha.py
new file mode 100644
index 000000000..a9d0f3752
--- /dev/null
+++ b/module/plugins/internal/ReCaptcha.py
@@ -0,0 +1,195 @@
+# -*- coding: utf-8 -*-
+
+import random
+import re
+import time
+import urlparse
+
+from base64 import b64encode
+
+from module.plugins.internal.Captcha import Captcha
+
+
+class ReCaptcha(Captcha):
+    __name__    = "ReCaptcha"
+    __type__    = "captcha"
+    __version__ = "0.17"
+
+    __description__ = """ReCaptcha captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org"),
+                       ("Walter Purcaro", "vuolter@gmail.com"),
+                       ("zapp-brannigan", "fuerst.reinje@web.de")]
+
+
+    KEY_V1_PATTERN = r'(?:recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=|Recaptcha\.create\s*\(\s*["\'])([\w-]+)'
+    KEY_V2_PATTERN = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\'])([\w-]+)'
+
+
+    def detect_key(self, html=None):
+        html = html or self.retrieve_html()
+
+        m = re.search(self.KEY_V2_PATTERN, html) or re.search(self.KEY_V1_PATTERN, html)
+        if m:
+            self.key = m.group(1).strip()
+            self.logDebug("Key: %s" % self.key)
+            return self.key
+        else:
+            self.logWarning("Key pattern not found")
+            return None
+
+
+    def challenge(self, key=None, html=None, version=None):
+        key = key or self.retrieve_key(html)
+
+        if version in (1, 2):
+            return getattr(self, "_challenge_v%s" % version)(key)
+
+        else:
+            return self.challenge(key,
+                                  version=2 if re.search(self.KEY_V2_PATTERN, html or self.retrieve_html()) else 1)
+
+
+    def _challenge_v1(self, key):
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge",
+                                    get={'k': key})
+        try:
+            challenge = re.search("challenge : '(.+?)',", html).group(1)
+            server    = re.search("server : '(.+?)',", html).group(1)
+
+        except AttributeError:
+            self.fail(_("ReCaptcha challenge pattern not found"))
+
+        self.logDebug("Challenge: %s" % challenge)
+
+        return self.result(server, challenge, key)
+
+
+    def result(self, server, challenge, key):
+        self.plugin.req.load("http://www.google.com/recaptcha/api/js/recaptcha.js")
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api/reload",
+                                    get={'c'     : challenge,
+                                         'k'     : key,
+                                         'reason': "i",
+                                         'type'  : "image"})
+
+        try:
+            challenge = re.search('\(\'(.+?)\',',html).group(1)
+
+        except AttributeError:
+            self.fail(_("ReCaptcha second challenge pattern not found"))
+
+        self.logDebug("Second challenge: %s" % challenge)
+        result = self.plugin.decryptCaptcha("%simage" % server,
+                                            get={'c': challenge},
+                                            cookies=True,
+                                            forceUser=True,
+                                            imgtype="jpg")
+
+        self.logDebug("Result: %s" % result)
+
+        return result, challenge
+
+
+    def _collectApiInfo(self):
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api.js")
+        a    = re.search(r'po.src = \'(.*?)\';', html).group(1)
+        vers = a.split("/")[5]
+
+        self.logDebug("API version: %s" % vers)
+
+        language = a.split("__")[1].split(".")[0]
+
+        self.logDebug("API language: %s" % language)
+
+        html = self.plugin.req.load("https://apis.google.com/js/api.js")
+        b    = re.search(r'"h":"(.*?)","', html).group(1)
+        jsh  = b.decode('unicode-escape')
+
+        self.logDebug("API jsh-string: %s" % jsh)
+
+        return vers, language, jsh
+
+
+    def _prepareTimeAndRpc(self):
+        self.plugin.req.load("http://www.google.com/recaptcha/api2/demo")
+
+        millis = int(round(time.time() * 1000))
+
+        self.logDebug("Time: %s" % millis)
+
+        rand = random.randint(1, 99999999)
+        a    = "0.%s" % str(rand * 2147483647)
+        rpc  = int(100000000 * float(a))
+
+        self.logDebug("Rpc-token: %s" % rpc)
+
+        return millis, rpc
+
+
+    def _challenge_v2(self, key, parent=None):
+        if parent is None:
+            try:
+                parent = urlparse.urljoin("http://", urlparse.urlparse(self.plugin.pyfile.url).netloc)
+
+            except Exception:
+                parent = ""
+
+        botguardstring      = "!A"
+        vers, language, jsh = self._collectApiInfo()
+        millis, rpc         = self._prepareTimeAndRpc()
+
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/anchor",
+                                    get={'k'       : key,
+                                         'hl'      : language,
+                                         'v'       : vers,
+                                         'usegapi' : "1",
+                                         'jsh'     : "%s#id=IO_%s" % (jsh, millis),
+                                         'parent'  : parent,
+                                         'pfname'  : "",
+                                         'rpctoken': rpc})
+
+        token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
+        self.logDebug("Token #1: %s" % token1.group(1))
+
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
+                                    get={'c'      : token1.group(1),
+                                         'hl'     : language,
+                                         'v'      : vers,
+                                         'bg'     : botguardstring,
+                                         'k'      : key,
+                                         'usegapi': "1",
+                                         'jsh'    : jsh}).decode('unicode-escape')
+
+        token2 = re.search(r'"finput","(.*?)",', html)
+        self.logDebug("Token #2: %s" % token2.group(1))
+
+        token3 = re.search(r'"rresp","(.*?)",', html)
+        self.logDebug("Token #3: %s" % token3.group(1))
+
+        millis_captcha_loading = int(round(time.time() * 1000))
+        captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
+                                                      get={'c':token3.group(1), 'k':key},
+                                                      cookies=True,
+                                                      forceUser=True)
+        response = b64encode('{"response":"%s"}' % captcha_response)
+
+        self.logDebug("Result: %s" % response)
+
+        timeToSolve     = int(round(time.time() * 1000)) - millis_captcha_loading
+        timeToSolveMore = timeToSolve + int(float("0." + str(random.randint(1, 99999999))) * 500)
+
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
+                                    post={'k'       : key,
+                                          'c'       : token3.group(1),
+                                          'response': response,
+                                          't'       : timeToSolve,
+                                          'ct'      : timeToSolveMore,
+                                          'bg'      : botguardstring})
+
+        token4 = re.search(r'"uvresp","(.*?)",', html)
+        self.logDebug("Token #4: %s" % token4.group(1))
+
+        result = token4.group(1)
+
+        return result, None
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index b843a28f0..81f977e57 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -11,7 +11,7 @@ from module.utils import fixup, html_unescape
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.46"
+    __version__ = "0.49"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
@@ -55,15 +55,6 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
     LINK_PATTERN = None
 
-    NAME_REPLACEMENTS = [("&#?\w+;", fixup)]
-    URL_REPLACEMENTS  = []
-
-    TEXT_ENCODING = False  #: Set to True or encoding name if encoding in http header is not correct
-    COOKIES       = True  #: or False or list of tuples [(domain, name, value)]
-
-    LOGIN_ACCOUNT = False
-    LOGIN_PREMIUM = False
-
 
     #@TODO: Remove in 0.4.10
     def init(self):
@@ -83,6 +74,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
         self.info  = {}
         self.html  = ""
+        self.link  = ""  #@TODO: Move to hoster class in 0.4.10
         self.links = []  #@TODO: Move to hoster class in 0.4.10
 
         if self.LOGIN_PREMIUM and not self.premium:
@@ -99,18 +91,34 @@ class SimpleCrypter(Crypter, SimpleHoster):
         self.pyfile.url = replace_patterns(self.pyfile.url, self.URL_REPLACEMENTS)
 
 
+    def handleDirect(self, pyfile):
+        while True:
+            header = self.load(self.link or pyfile.url, just_header=True, decode=True)
+            if 'location' in header and header['location']:
+                self.link = header['location']
+            else:
+                break
+
+
     def decrypt(self, pyfile):
         self.prepare()
 
-        self.preload()
-        self.checkInfo()
+        self.logDebug("Looking for link redirect...")
+        self.handleDirect(pyfile)
+
+        if self.link:
+            self.urls = [self.link]
+
+        else:
+            self.preload()
+            self.checkInfo()
 
-        self.links = self.getLinks()
+            self.links = self.getLinks()
 
-        if hasattr(self, 'PAGES_PATTERN') and hasattr(self, 'loadPage'):
-            self.handlePages(pyfile)
+            if hasattr(self, 'PAGES_PATTERN') and hasattr(self, 'loadPage'):
+                self.handlePages(pyfile)
 
-        self.logDebug("Package has %d links" % len(self.links))
+            self.logDebug("Package has %d links" % len(self.links))
 
         if self.links:
             self.packages = [(self.info['name'], self.links, self.info['folder'])]
@@ -155,7 +163,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         links = [urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link \
                  for link in re.findall(self.LINK_PATTERN, self.html)]
 
-        return [html_unescape(l.strip().decode('unicode-escape')) for l in links]
+        return [html_unescape(l.decode('unicode-escape').strip()) for l in links]
 
 
     def handlePages(self, pyfile):
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
deleted file mode 100644
index 1f04ab1c6..000000000
--- a/module/plugins/internal/SimpleDereferer.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-
-from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import create_getInfo, set_cookies
-from module.utils import html_unescape
-
-
-class SimpleDereferer(Crypter):
-    __name__    = "SimpleDereferer"
-    __type__    = "crypter"
-    __version__ = "0.13"
-
-    __pattern__ = r'^unmatchable$'
-    __config__  = []  #@TODO: Remove in 0.4.10
-
-    __description__ = """Simple dereferer plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    """
-    Following patterns should be defined by each crypter:
-
-      LINK_PATTERN: Regex to catch the redirect url in group(1)
-        example: LINK_PATTERN = r'<div class="link"><a href="(.+?)"'
-
-      OFFLINE_PATTERN: (optional) Checks if the page is unreachable
-        example: OFFLINE_PATTERN = r'File (deleted|not found)'
-
-      TEMP_OFFLINE_PATTERN: (optional) Checks if the page is temporarily unreachable
-        example: TEMP_OFFLINE_PATTERN = r'Server maintainance'
-
-
-    You can override the getLinks method if you need a more sophisticated way to extract the redirect url.
-    """
-
-    LINK_PATTERN = None
-
-    TEXT_ENCODING = False
-    COOKIES       = True
-
-
-    def handleDirect(self, pyfile):
-        header = self.load(pyfile.url, just_header=True, decode=True)
-        if 'location' in header and header['location']:
-            self.link = header['location']
-
-
-    def decrypt(self, pyfile):
-        self.handleDirect(pyfile)
-
-        if not self.link:
-            try:
-                self.link = urllib.unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
-
-            except AttributeError:
-                self.prepare()
-                self.preload()
-                self.checkStatus()
-
-                self.link = self.getLink()
-
-        if self.link:
-            self.urls = [self.link]
-
-        elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
-            self.fail(_("No link grabbed"))
-
-
-    def prepare(self):
-        self.info = {}
-        self.html = ""
-        self.link = ""  #@TODO: Move to hoster class in 0.4.10
-
-        self.req.setOption("timeout", 120)
-
-        if isinstance(self.COOKIES, list):
-            set_cookies(self.req.cj, self.COOKIES)
-
-
-    def preload(self):
-        self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
-
-        if isinstance(self.TEXT_ENCODING, basestring):
-            self.html = unicode(self.html, self.TEXT_ENCODING)
-
-
-    def checkStatus(self):
-        if hasattr(self, "OFFLINE_PATTERN") and re.search(self.OFFLINE_PATTERN, self.html):
-            self.offline()
-
-        elif hasattr(self, "TEMP_OFFLINE_PATTERN") and re.search(self.TEMP_OFFLINE_PATTERN, self.html):
-            self.tempOffline()
-
-
-    def getLink(self):
-        link = re.search(self.LINK_PATTERN, self.html).group(1)
-        return html_unescape(link.strip().decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 1d44a6642..33e7d3674 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.50"
+    __version__ = "1.53"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -308,13 +308,15 @@ class SimpleHoster(Hoster):
     SIZE_REPLACEMENTS = []
     URL_REPLACEMENTS  = []
 
-    TEXT_ENCODING = False  #: Set to True or encoding name if encoding value in http header is not correct
-    COOKIES       = True   #: or False or list of tuples [(domain, name, value)]
     CHECK_TRAFFIC = False  #: Set to True to force checking traffic left for premium account
+    COOKIES       = True   #: or False or list of tuples [(domain, name, value)]
     DIRECT_LINK   = None   #: Set to True to looking for direct link (as defined in handleDirect method), set to None to do it if self.account is True else False
-    MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
-    LOGIN_ACCOUNT = False  #: Set to True to require account login
     DISPOSITION   = True   #: Set to True to use any content-disposition value in http header as file name
+    LOGIN_ACCOUNT = False  #: Set to True to require account login
+    LOGIN_PREMIUM = False  #: Set to True to require premium account login
+    MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
+    TEXT_ENCODING = False  #: Set to True or encoding name if encoding value in http header is not correct
+
 
     directLink = getFileURL  #@TODO: Remove in 0.4.10
 
@@ -430,6 +432,9 @@ class SimpleHoster(Hoster):
         if not self.getConfig('use_premium', True):
             self.retryFree()
 
+        if self.LOGIN_PREMIUM and not self.premium:
+            self.fail(_("Required premium account not found"))
+
         if self.LOGIN_ACCOUNT and not self.account:
             self.fail(_("Required account not found"))
 
@@ -474,7 +479,7 @@ class SimpleHoster(Hoster):
 
                 if not self.link and not self.lastDownload:
                     self.MULTI_HOSTER = False
-                    self.retry(1, reason="Multi hoster fails")
+                    self.retry(1, reason=_("Multi hoster fails"))
 
             if not self.link and not self.lastDownload:
                 self.preload()
@@ -511,7 +516,7 @@ class SimpleHoster(Hoster):
 
         self.correctCaptcha()
 
-        link = html_unescape(link.strip().decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
+        link = html_unescape(link.decode('unicode-escape').strip())  #@TODO: Move this check to plugin `load` method in 0.4.10
 
         if not urlparse.urlparse(link).scheme:
             url_p   = urlparse.urlparse(self.pyfile.url)
@@ -625,6 +630,7 @@ class SimpleHoster(Hoster):
 
                 elif re.search('captcha|code', errmsg, re.I):
                     self.invalidCaptcha()
+                    self.retry(10, reason=_("Wrong captcha"))
 
                 elif re.search('countdown|expired', errmsg, re.I):
                     self.retry(wait_time=60, reason=_("Link expired"))
@@ -635,9 +641,14 @@ class SimpleHoster(Hoster):
                 elif re.search('up to', errmsg, re.I):
                     self.fail(_("File too large for free download"))
 
-                elif re.search('offline|delet|remov|not (found|available)', errmsg, re.I):
+                elif re.search('offline|delet|remov|not? (found|(longer)? available)', errmsg, re.I):
                     self.offline()
 
+                elif re.search('filename', errmsg, re.I):
+                    url_p = urlparse.urlparse(self.pyfile.url)
+                    self.pyfile.url = "%s://%s/%s" % (url_p.scheme, url_p.netloc, url_p.path.strip('/').split('/')[0])
+                    self.retry(1, reason=_("Wrong url"))
+
                 elif re.search('premium', errmsg, re.I):
                     self.fail(_("File can be downloaded by premium users only"))
 
diff --git a/module/plugins/internal/SolveMedia.py b/module/plugins/internal/SolveMedia.py
new file mode 100644
index 000000000..7f5de51e1
--- /dev/null
+++ b/module/plugins/internal/SolveMedia.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.Plugin import Fail
+from module.plugins.internal.Captcha import Captcha
+
+
+class SolveMedia(Captcha):
+    __name__    = "SolveMedia"
+    __type__    = "captcha"
+    __version__ = "0.13"
+
+    __description__ = """SolveMedia captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']'
+
+
+    def detect_key(self, html=None):
+        html = html or self.retrieve_html()
+
+        m = re.search(self.KEY_PATTERN, html)
+        if m:
+            self.key = m.group(1).strip()
+            self.logDebug("Key: %s" % self.key)
+            return self.key
+        else:
+            self.logWarning("Key pattern not found")
+            return None
+
+
+    def challenge(self, key=None, html=None):
+        key = key or self.retrieve_key(html)
+
+        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript",
+                                    get={'k': key})
+
+        for i in xrange(1, 11):
+            try:
+                magic = re.search(r'name="magic" value="(.+?)"', html).group(1)
+
+            except AttributeError:
+                self.logWarning("Magic pattern not found")
+                magic = None
+
+            try:
+                challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="(.+?)">',
+                                      html).group(1)
+
+            except AttributeError:
+                self.fail(_("SolveMedia challenge pattern not found"))
+
+            else:
+                self.logDebug("Challenge: %s" % challenge)
+
+            try:
+                result = self.result("http://api.solvemedia.com/papi/media", challenge)
+
+            except Fail, e:
+                self.logWarning(e)
+                self.plugin.invalidCaptcha()
+                result = None
+
+            html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript",
+                                        post={'adcopy_response' : result,
+                                              'k'               : key,
+                                              'l'               : "en",
+                                              't'               : "img",
+                                              's'               : "standard",
+                                              'magic'           : magic,
+                                              'adcopy_challenge': challenge,
+                                              'ref'             : self.plugin.pyfile.url})
+            try:
+                redirect = re.search(r'URL=(.+?)">', html).group(1)
+
+            except AttributeError:
+                self.fail(_("SolveMedia verify pattern not found"))
+
+            else:
+                if "error" in html:
+                    self.logWarning("Captcha code was invalid")
+                    self.logDebug("Retry #%d" % i)
+                    html = self.plugin.req.load(redirect)
+                else:
+                    break
+
+        else:
+            self.fail(_("SolveMedia max retries exceeded"))
+
+        return result, challenge
+
+
+    def result(self, server, challenge):
+        result = self.plugin.decryptCaptcha(server,
+                                            get={'c': challenge},
+                                            cookies=True,
+                                            imgtype="gif")
+
+        self.logDebug("Result: %s" % result)
+
+        return result
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 8d3fec370..4c18a0e35 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -19,8 +19,8 @@ class UnZip(Extractor):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    EXTENSIONS = [".zip", ".zip64"]
     VERSION ="(python %s.%s.%s)" % (sys.version_info[0], sys.version_info[1], sys.version_info[2])
+    EXTENSIONS = [".zip", ".zip64"]
 
 
     @classmethod
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 80eff53ea..8b333b45c 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -19,8 +19,8 @@ class XFSCrypter(SimpleCrypter):
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
-    LINK_PATTERN = r'<(?:td|TD).*?>\s*(?:<.+>\s*)?<a href="(.+?)".*?>.+?(?:</a>)?\s*(?:<.+>\s*)?</(?:td|TD)>'
     NAME_PATTERN = r'<[Tt]itle>.*?\: (?P<N>.+) folder</[Tt]itle>'
+    LINK_PATTERN = r'<(?:td|TD).*?>\s*(?:<.+>\s*)?<a href="(.+?)".*?>.+?(?:</a>)?\s*(?:<.+>\s*)?</(?:td|TD)>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index e2818886c..e0fd8fa8d 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -5,7 +5,8 @@ import random
 import re
 import urlparse
 
-from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
+from module.plugins.internal.ReCaptcha import ReCaptcha
+from module.plugins.internal.SolveMedia import SolveMedia
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, secondsToMidnight
 from module.utils import html_unescape
 
@@ -13,7 +14,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.51"
+    __version__ = "0.53"
 
     __pattern__ = r'^unmatchable$'
 
@@ -26,14 +27,12 @@ class XFSHoster(SimpleHoster):
 
     HOSTER_DOMAIN = None
 
-    TEXT_ENCODING = False
-    DIRECT_LINK   = None
-    MULTI_HOSTER  = True  #@NOTE: Should be default to False for safe, but I'm lazy...
+    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^_]+)'
 
-    OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
+    OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed|no longer available)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
 
     WAIT_PATTERN         = r'<span id="countdown_str".*>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'