diff options
| author |  zoidberg10 <zoidberg@mujmail.cz>
| 2012-02-01 18:55:48 +0100 |
|---|---|---|
| committer | zoidberg10 <zoidberg@mujmail.cz>
| 2012-02-01 18:55:48 +0100 |
| commit | 597ea4a3b01ef0ba322886a2dd606db87e163232 (patch) | |
| tree | 5716499ad7ccf2935fc313337a9fe1bd5c800567 /module/plugins/hoster/NetloadIn.py | |
| parent | update uloz.to (diff) | |
| download | pyload-597ea4a3b01ef0ba322886a2dd606db87e163232.tar.xz | |
closed #528 - netload.in
Diffstat (limited to 'module/plugins/hoster/NetloadIn.py')
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index b2bec873d..b549b3bbd 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -26,7 +26,7 @@ def getInfo(urls): if match: ids = ids + match.group(1) +";" - api = getURL(apiurl+ids) + api = getURL(apiurl+ids, decode = True) if api is None or len(api) < 10: print "Netload prefetch: failed " @@ -55,7 +55,7 @@ class NetloadIn(Hoster): __name__ = "NetloadIn" __type__ = "hoster" __pattern__ = r"http://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)" - __version__ = "0.33" + __version__ = "0.34" __description__ = """Netload.in Download Hoster""" __author_name__ = ("spoob", "RaNaN", "Gregy") __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "gregy@gregy.cz") @@ -99,7 +99,7 @@ class NetloadIn(Hoster): return apiurl = "http://netload.in/share/fileinfos2.php" - src = self.load(apiurl, cookies=False, get={"file_id": match.group(1)}).strip() + src = self.load(apiurl, cookies=False, get={"file_id": match.group(1)}, decode = True).strip() if not src and n <= 3: sleep(0.2) self.download_api_data(n+1) @@ -162,7 +162,7 @@ class NetloadIn(Hoster): self.log.debug("Netload: try number %d " % i) - if re.search(r"(We will prepare your download..)", page) is not None: + if ">Your download is being prepared.<" in page: self.log.debug("Netload: We will prepare your download") self.final_wait(page) return True @@ -213,7 +213,7 @@ class NetloadIn(Hoster): def get_file_url(self, page): try: - file_url_pattern = r"<a class=\"Orange_Link\" href=\"(http://.+)\".?>Click here" + file_url_pattern = r"<a class=\"Orange_Link\" href=\"(http://.+)\".?>Or click here" attempt = re.search(file_url_pattern, page) if attempt is not None: return attempt.group(1) |