diff options
| -rw-r--r-- | module/plugins/hoster/FreakshareCom.py (renamed from module/plugins/hoster/FreakshareNet.py) | 11 | ||||
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 15 |
2 files changed, 10 insertions, 16 deletions
diff --git a/module/plugins/hoster/FreakshareNet.py b/module/plugins/hoster/FreakshareCom.py index 18048704a..524081002 100644 --- a/module/plugins/hoster/FreakshareNet.py +++ b/module/plugins/hoster/FreakshareCom.py @@ -5,10 +5,10 @@ import re from module.plugins.Hoster import Hoster from module.plugins.ReCaptcha import ReCaptcha -class FreakshareNet(Hoster): - __name__ = "FreakshareNet" +class FreakshareCom(Hoster): + __name__ = "FreakshareCom" __type__ = "hoster" - __pattern__ = r"http://(?:www\.)?freakshare\.net/files/\S*?/" + __pattern__ = r"http://(?:www\.)?freakshare\.(net|com)/files/\S*?/" __version__ = "0.32" __description__ = """Freakshare.com Download Hoster""" __author_name__ = ("sitacuisses","spoob","mkaay") @@ -21,7 +21,8 @@ class FreakshareNet(Hoster): self.req_opts = [] def process(self, pyfile): - self.pyfile = pyfile + pyfile.url = pyfile.url.replace("freakshare.net/","freakshare.com/") + self.prepare() self.get_file_url() @@ -47,7 +48,7 @@ class FreakshareNet(Hoster): return True def download_html(self): - url = self.pyfile.url + url = self.pyfile.url.replace("freakshare.net/","freakshare.com/") self.html = self.load(url, cookies=True) def get_file_url(self): 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. <a href=\"(index.php\?id=10&.*)\" class=\"Orange_Link\">Click here for the download</a>", 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('<input name="file_id" type="hidden" value="(.*)" />', page).group(1) |