summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/IfileIt.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster/IfileIt.py')
-rw-r--r--module/plugins/hoster/IfileIt.py24
1 files changed, 13 insertions, 11 deletions
diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py
index 5dfd14d82..b7e37457d 100644
--- a/module/plugins/hoster/IfileIt.py
+++ b/module/plugins/hoster/IfileIt.py
@@ -8,19 +8,20 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
class IfileIt(SimpleHoster):
- __name__ = "IfileIt"
- __type__ = "hoster"
- __version__ = "0.27"
+ __name__ = "IfileIt"
+ __type__ = "hoster"
+ __version__ = "0.28"
__pattern__ = r'^unmatchable$'
__description__ = """Ifile.it"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
+ __license__ = "GPLv3"
+ __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
LINK_PATTERN = r'</span> If it doesn\'t, <a target="_blank" href="([^"]+)">'
- RECAPTCHA_KEY_PATTERN = r"var __recaptcha_public\s*=\s*'([^']+)';"
- FILE_INFO_PATTERN = r'<span style="cursor: default;[^>]*>\s*(?P<N>.*?)\s*&nbsp;\s*<strong>\s*(?P<S>[0-9.]+)\s*(?P<U>[kKMG])i?B\s*</strong>\s*</span>'
+ RECAPTCHA_PATTERN = r'var __recaptcha_public\s*=\s*\'(.+?)\''
+ INFO_PATTERN = r'<span style="cursor: default;[^>]*>\s*(?P<N>.*?)\s*&nbsp;\s*<strong>\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</strong>\s*</span>'
OFFLINE_PATTERN = r'<span style="cursor: default;[^>]*>\s*&nbsp;\s*<strong>\s*</strong>\s*</span>'
TEMP_OFFLINE_PATTERN = r'<span class="msg_red">Downloading of this file is temporarily disabled</span>'
@@ -36,11 +37,12 @@ class IfileIt(SimpleHoster):
self.offline()
if json_response['captcha']:
- captcha_key = re.search(self.RECAPTCHA_KEY_PATTERN, self.html).group(1)
+ captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
+
recaptcha = ReCaptcha(self)
post_data['ctype'] = "recaptcha"
- for _ in xrange(5):
+ for _i in xrange(5):
post_data['recaptcha_challenge'], post_data['recaptcha_response'] = recaptcha.challenge(captcha_key)
json_response = json_loads(self.load(json_url, post=post_data))
self.logDebug(json_response)
@@ -51,10 +53,10 @@ class IfileIt(SimpleHoster):
self.correctCaptcha()
break
else:
- self.fail("Incorrect captcha")
+ self.fail(_("Incorrect captcha"))
if not "ticket_url" in json_response:
- self.parseError("Download URL")
+ self.error(_("No download URL"))
self.download(json_response['ticket_url'])