diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/hoster/ExtabitCom.py | 29 | 
1 files changed, 16 insertions, 13 deletions
| diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index 702cfe2bc..fd91bb023 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -17,10 +17,12 @@  """  import re +  from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo  from module.plugins.ReCaptcha import ReCaptcha  from module.common.json_layer import json_loads +  class ExtabitCom(SimpleHoster):      __name__ = "ExtabitCom"      __type__ = "hoster" @@ -33,34 +35,34 @@ class ExtabitCom(SimpleHoster):      FILE_SIZE_PATTERN = r'<th>Size:</th>\s*<td class="col-fileinfo">(?P<S>[^<]+)</td>'      FILE_OFFLINE_PATTERN = r'<h1>File not found</h1>'      TEMP_OFFLINE_PATTERN = r">(File is temporary unavailable|No download mirror)<" -     +      DOWNLOAD_LINK_PATTERN = r'"(http://guest\d+\.extabit\.com/[a-z0-9]+/.*?)"' -    def handleFree(self):         +    def handleFree(self):          if r">Only premium users can download this file" in self.html:              self.fail("Only premium users can download this file") -         +          m = re.search(r"Next free download from your ip will be available in <b>(\d+)\s*minutes", self.html)          if m:              self.setWait(int(m.group(1)) * 60, True) -            self.wait()   +            self.wait()          elif "The daily downloads limit from your IP is exceeded" in self.html:              self.setWait(3600, True)              self.wait() -             +          self.logDebug("URL: " + self.req.http.lastEffectiveURL)          m = re.match(self.__pattern__, self.req.http.lastEffectiveURL) -        fileID = m.group('ID') if m else self.file_info('ID')               -          +        fileID = m.group('ID') if m else self.file_info('ID') +          m = re.search(r'recaptcha/api/challenge\?k=(\w+)', self.html)          if m:              recaptcha = ReCaptcha(self)              captcha_key = m.group(1) -             +              for i in range(5):                  get_data = {"type": "recaptcha"}                  get_data["challenge"], get_data["capture"] = recaptcha.challenge(captcha_key) -                response = json_loads(self.load("http://extabit.com/file/%s/" % fileID, get = get_data)) +                response = json_loads(self.load("http://extabit.com/file/%s/" % fileID, get=get_data))                  if "ok" in response:                      self.correctCaptcha()                      break @@ -70,15 +72,16 @@ class ExtabitCom(SimpleHoster):                  self.fail("Invalid captcha")          else:              self.parseError('Captcha') -         +          if not "href" in response: self.parseError('JSON') -         +          self.html = self.load("http://extabit.com/file/%s%s" % (fileID, response['href']))          m = re.search(self.DOWNLOAD_LINK_PATTERN, self.html)          if not m:              self.parseError('Download URL')          url = m.group(1)          self.logDebug("Download URL: " + url) -        self.download(url)       +        self.download(url) + -getInfo = create_getInfo(ExtabitCom)
\ No newline at end of file +getInfo = create_getInfo(ExtabitCom) | 
