Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 0 insertions, 104 deletions

diff --git a/module/plugins/internal/SolveMedia.py b/module/plugins/internal/SolveMedia.py
deleted file mode 100644
index 7f5de51e1..000000000
--- a/module/plugins/internal/SolveMedia.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- 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