From 1edbe8364951623aacf7c6477ce651394f513eec Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 6 Oct 2010 14:09:26 +0200 Subject: freakshare.com, netload fix --- module/plugins/hoster/NetloadIn.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'module/plugins/hoster/NetloadIn.py') diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 369cd9189..d03b86d5e 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -164,26 +164,19 @@ class NetloadIn(Hoster): self.setWait(wait) self.wait() - link = re.search(r"You can download now your next file. Click here for the download", page) - if link is not None: - self.log.debug("Netload: Using new link found on page") - page = self.load("http://netload.in/" + link.group(1).replace("amp;", "")) - else: - self.log.debug("Netload: No new link found, using old one") - page = self.load(self.url, cookies=True) - continue + return self.download_html() self.log.debug("Netload: Trying to find captcha") - url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&.*&captcha=1)', page).group(1).replace("amp;", "") - page = self.load(url_captcha_html, cookies=True) - try: + url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&.*&captcha=1)', page).group(1).replace("amp;", "") + page = self.load(url_captcha_html, cookies=True) captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', page).group(1) except: open("dump.html", "w").write(page) self.log.debug("Netload: Could not find captcha, try again from beginning") + captchawaited = False continue file_id = re.search('', page).group(1) -- cgit v1.2.3