diff options
Diffstat (limited to 'module/plugins/hoster/UploadableCh.py')
| -rw-r--r-- | module/plugins/hoster/UploadableCh.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/module/plugins/hoster/UploadableCh.py b/module/plugins/hoster/UploadableCh.py index 0fc62777f..70ff60eda 100644 --- a/module/plugins/hoster/UploadableCh.py +++ b/module/plugins/hoster/UploadableCh.py @@ -3,13 +3,13 @@ import re from module.plugins.captcha.ReCaptcha import ReCaptcha -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.SimpleHoster import SimpleHoster class UploadableCh(SimpleHoster): __name__ = "UploadableCh" __type__ = "hoster" - __version__ = "0.15" + __version__ = "0.16" __status__ = "testing" __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' @@ -44,13 +44,13 @@ class UploadableCh(SimpleHoster): self.wait(30) - #: Make the recaptcha appear and show it the pyload interface + #: Make the ReCaptcha appear and show it the pyload interface b = self.load(pyfile.url, post={'checkDownload': "check"}) self.log_debug(b) #: Expected output: {'success': "showCaptcha"} - recaptcha = ReCaptcha(self) + self.captcha = ReCaptcha(pyfile) - response, challenge = recaptcha.challenge(self.RECAPTCHA_KEY) + response, challenge = self.captcha.challenge(self.RECAPTCHA_KEY) #: Submit the captcha solution self.load("http://www.uploadable.ch/checkReCaptcha.php", @@ -70,12 +70,9 @@ class UploadableCh(SimpleHoster): def check_download(self): - if self.check_file({'wait': re.compile("Please wait for")}): + if self.scan_download({'wait': re.compile("Please wait for")}): self.log_info(_("Downloadlimit reached, please wait or reconnect")) self.wait(60 * 60, True) self.retry() return super(UploadableCh, self).check_download() - - -getInfo = create_getInfo(UploadableCh) |