diff options
| author | 2014-10-23 22:34:36 +0200 | |
|---|---|---|
| committer | 2014-10-23 22:34:36 +0200 | |
| commit | 8cde8385b0224f8fa26758f6c2b6b782e5fb3663 (patch) | |
| tree | 75278386e78bd63ce48631b8a7dc95ea82911266 /module/plugins/hoster/UploadedTo.py | |
| parent | [FilefactoryCom] Fix handleFree (diff) | |
| download | pyload-8cde8385b0224f8fa26758f6c2b6b782e5fb3663.tar.xz | |
Call error instead fail in some plugins
Diffstat (limited to 'module/plugins/hoster/UploadedTo.py')
| -rw-r--r-- | module/plugins/hoster/UploadedTo.py | 13 | 
1 files changed, 6 insertions, 7 deletions
| diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 764bb75de..055047859 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -94,7 +94,7 @@ def getInfo(urls):  class UploadedTo(Hoster):      __name__ = "UploadedTo"      __type__ = "hoster" -    __version__ = "0.74" +    __version__ = "0.75"      __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' @@ -198,16 +198,15 @@ class UploadedTo(Hoster):              self.fail("File not downloadable for free users")          self.setWait(int(m.group(1))) -        js = self.load("http://uploaded.net/js/download.js", decode=True) - -        challengeId = re.search(r'Recaptcha\.create\("([^"]+)', js) +        self.html = self.load("http://uploaded.net/js/download.js", decode=True)          url = "http://uploaded.net/io/ticket/captcha/%s" % self.fileID          downloadURL = "" +        recaptcha = ReCaptcha(self) +          for _ in xrange(5): -            re_captcha = ReCaptcha(self) -            challenge, result = re_captcha.challenge(challengeId.group(1)) +            challenge, result = recaptcha.challenge()              options = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": result}              self.wait() @@ -234,7 +233,7 @@ class UploadedTo(Hoster):                  downloadURL = re.search("url:'([^']+)", result).group(1)                  break              else: -                self.fail("Unknown error '%s'" % result) +                self.error("Unknown error '%s'" % result)          if not downloadURL:              self.fail("No Download url retrieved/all captcha attempts failed") | 
