diff options
Diffstat (limited to 'module/plugins/internal/SolveMedia.py')
| -rw-r--r-- | module/plugins/internal/SolveMedia.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/module/plugins/internal/SolveMedia.py b/module/plugins/internal/SolveMedia.py index 5d701a5a2..ce4ebb007 100644 --- a/module/plugins/internal/SolveMedia.py +++ b/module/plugins/internal/SolveMedia.py @@ -3,10 +3,10 @@ import re from module.plugins.internal.Plugin import Fail -from module.plugins.internal.Captcha import Captcha +from module.plugins.internal.CaptchaService import CaptchaService -class SolveMedia(Captcha): +class SolveMedia(CaptchaService): __name__ = "SolveMedia" __type__ = "captcha" __version__ = "0.15" @@ -20,8 +20,8 @@ class SolveMedia(Captcha): KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']' - def detect_key(self, html=None): - html = html or self.retrieve_html() + def detect_key(self, data=None): + html = data or self.retrieve_data() m = re.search(self.KEY_PATTERN, html) if m: @@ -33,8 +33,8 @@ class SolveMedia(Captcha): return None - def challenge(self, key=None, html=None): - key = key or self.retrieve_key(html) + def challenge(self, key=None, data=None): + key = key or self.retrieve_key(data) html = self.plugin.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key}) @@ -95,10 +95,10 @@ class SolveMedia(Captcha): def result(self, server, challenge): - result = self.plugin.decryptCaptcha(server, - get={'c': challenge}, - cookies=True, - imgtype="gif") + result = self.decrypt_image(server, + get={'c': challenge}, + cookies=True, + input_type="gif") self.log_debug("Result: %s" % result) |