diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-10-03 17:40:27 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-10-03 17:40:27 +0200 |
| commit | cdd7d2db6b372a38a6b4281f19881b95aa5b7a50 (patch) | |
| tree | 9b9e29d2f85e99ef558f49d3c33ebad6ff69552c /pyload/plugins/hoster/TurbobitNet.py | |
| parent | Changed XFileSharingPro and UpdateManager to internal plugins (diff) | |
| parent | [Dev-Host] Improve patterns a bit (diff) | |
| download | pyload-cdd7d2db6b372a38a6b4281f19881b95aa5b7a50.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/plugins/ocr/GigasizeCom.py
pyload/plugins/ocr/LinksaveIn.py
pyload/plugins/ocr/NetloadIn.py
pyload/plugins/ocr/ShareonlineBiz.py
Diffstat (limited to 'pyload/plugins/hoster/TurbobitNet.py')
| -rw-r--r-- | pyload/plugins/hoster/TurbobitNet.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pyload/plugins/hoster/TurbobitNet.py b/pyload/plugins/hoster/TurbobitNet.py index 9a6b26c97..5dd01fad5 100644 --- a/pyload/plugins/hoster/TurbobitNet.py +++ b/pyload/plugins/hoster/TurbobitNet.py @@ -36,8 +36,8 @@ class TurbobitNet(SimpleHoster): LINK_PATTERN = r'(?P<url>/download/redirect/[^"\']+)' LIMIT_WAIT_PATTERN = r"<div id='timeout'>(\d+)<" - CAPTCHA_KEY_PATTERN = r'src="http://api\.recaptcha\.net/challenge\?k=([^"]+)"' - CAPTCHA_SRC_PATTERN = r'<img alt="Captcha" src="(.+?)"' + + CAPTCHA_URL_PATTERN = r'<img alt="Captcha" src="(.+?)"' def handleFree(self): @@ -71,12 +71,13 @@ class TurbobitNet(SimpleHoster): if inputs['captcha_type'] == 'recaptcha': recaptcha = ReCaptcha(self) - m = re.search(self.CAPTCHA_KEY_PATTERN, self.html) - captcha_key = m.group(1) if m else '6LcTGLoSAAAAAHCWY9TTIrQfjUlxu6kZlTYP50_c' - inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge( - captcha_key) + captcha_key = recaptcha.detect_key() + if captcha_key is None: + self.parseError("ReCaptcha captcha key not found") + + inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key) else: - m = re.search(self.CAPTCHA_SRC_PATTERN, self.html) + m = re.search(self.CAPTCHA_URL_PATTERN, self.html) if m is None: self.parseError('captcha') captcha_url = m.group(1) |