diff options
Diffstat (limited to 'module/plugins/hoster/MediafireCom.py')
| -rw-r--r-- | module/plugins/hoster/MediafireCom.py | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py index 14180ff3d..f970512ab 100644 --- a/module/plugins/hoster/MediafireCom.py +++ b/module/plugins/hoster/MediafireCom.py @@ -58,12 +58,12 @@ class MediafireCom(SimpleHoster): __name__ = "MediafireCom" __type__ = "hoster" __pattern__ = r"http://(?:\w*\.)*mediafire\.com/[^?].*" - __version__ = "0.71" + __version__ = "0.72" __description__ = """Mediafire.com plugin - free only""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - DOWNLOAD_LINK_PATTERN = r'<div class="download_link"[^>]*z-index:(?P<zindex>\d+)[^>]*>\s*<a href="(?P<href>[^"]+)"' + DOWNLOAD_LINK_PATTERN = r'<div class="download_link"[^>]*(?:z-index:(?P<zindex>\d+))?[^>]*>\s*<a href="(?P<href>http://[^"]+)"' JS_KEY_PATTERN = r"DoShow\('mfpromo1'\);[^{]*{((\w+)='';.*?)eval\(\2\);" JS_ZMODULO_PATTERN = r"\('z-index'\)\) \% (\d+)\)\);" RECAPTCHA_PATTERN = r'src="http://(?:api.recaptcha.net|www.google.com/recaptcha/api)/challenge\?k=([^"]+)">' @@ -101,25 +101,35 @@ class MediafireCom(SimpleHoster): else: self.fail("No or incorrect password") - found = re.search(self.JS_KEY_PATTERN, self.html) - try: - result = self.js.eval(found.group(1)) - zmodulo = int(re.search(self.JS_ZMODULO_PATTERN, result).group(1)) - self.logDebug("ZMODULO: %d" % zmodulo) - except Exception, e: - self.logDebug(e) - self.retry(3, 0, "Parse error (MODULO)") + links = re.findall(self.DOWNLOAD_LINK_PATTERN, self.html) + link_count = len(links) + self.logDebug('LINKS ', links) - vlink = {'zindex': 0, 'href': ''} - for found in re.finditer(self.DOWNLOAD_LINK_PATTERN, self.html): - dlink = found.groupdict() - #self.logDebug(dlink) - dlink['zindex'] = int(dlink['zindex']) % zmodulo - if dlink['zindex'] >= vlink['zindex']: - vlink = dlink - - self.logDebug("DOWNLOAD LINK:", vlink) - self.download(vlink['href']) + if link_count == 0: + self.retry(3, 0, "No links found") + + elif link_count > 1: + found = re.search(self.JS_KEY_PATTERN, self.html) + try: + result = self.js.eval(found.group(1)) + zmodulo = int(re.search(self.JS_ZMODULO_PATTERN, result).group(1)) + self.logDebug("ZMODULO: %d" % zmodulo) + except Exception, e: + self.logDebug(e) + self.parseError("ZMODULO") + + max_index = 0 + for index, url in links: + index = int(index) % zmodulo + if index >= max_index: + download_url = url + + self.logDebug("DOWNLOAD LINK:", download_url) + + else: + zindex, download_url = links[0] + + self.download(download_url) def checkCaptcha(self): for i in range(5): |