diff options
author | igel-kun <mathiaswe@gmx.de> | 2014-04-05 20:54:36 +0200 |
---|---|---|
committer | Stefano <l.stickell@yahoo.it> | 2014-04-21 17:12:23 +0200 |
commit | a9bbe1d9b0d5125704f1f640de33be57d91e5d11 (patch) | |
tree | 25ca16f37588151420e9685bf514c6e9d1dce37a | |
parent | XFS: host added (diff) | |
download | pyload-a9bbe1d9b0d5125704f1f640de33be57d91e5d11.tar.xz |
XFS: Improved CAPTCHA_DIV_PATTERN
+ cosmetics
Merges #578
(cherry picked from commit 987949595e6072b1f102db490c08817274d2a8cb)
-rw-r--r-- | pyload/plugins/hoster/XFileSharingPro.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyload/plugins/hoster/XFileSharingPro.py b/pyload/plugins/hoster/XFileSharingPro.py index c4c05f604..ab3dde18d 100644 --- a/pyload/plugins/hoster/XFileSharingPro.py +++ b/pyload/plugins/hoster/XFileSharingPro.py @@ -36,7 +36,7 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.27" + __version__ = "0.28" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -52,7 +52,7 @@ class XFileSharingPro(SimpleHoster): OVR_KILL_LINK_PATTERN = r'<h2>Delete Link</h2>\s*<textarea[^>]*>([^<]+)' CAPTCHA_URL_PATTERN = r'(http://[^"\']+?/captchas?/[^"\']+)' RECAPTCHA_URL_PATTERN = r'http://[^"\']+?recaptcha[^"\']+?\?k=([^"\']+)"' - CAPTCHA_DIV_PATTERN = r'<b>Enter code.*?<div.*?>(.*?)</div>' + CAPTCHA_DIV_PATTERN = r'>Enter code.*?<div.*?>(.*?)</div>' SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"' ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)</' @@ -315,7 +315,7 @@ class XFileSharingPro(SimpleHoster): inputs['code'] = self.decryptCaptcha(captcha_url) return 2 else: - found = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.S) + found = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.DOTALL) if found: captcha_div = found.group(1) self.logDebug(captcha_div) |