diff options
| author |  spoob <spoob@gmx.de>
| 2010-01-21 21:16:01 +0100 |
|---|---|---|
| committer | spoob <spoob@gmx.de>
| 2010-01-21 21:16:01 +0100 |
| commit | f34d216d292c5608a2011db0c406ef9c3fc01181 (patch) | |
| tree | d81bf7ed8204abee3786ba39e4863cba12815baf /module/plugins/hoster | |
| parent | fixed link deletion (diff) | |
| download | pyload-f34d216d292c5608a2011db0c406ef9c3fc01181.tar.xz | |
Fixed Netload Wait
Diffstat (limited to 'module/plugins/hoster')
| -rw-r--r-- | module/plugins/hoster/NetloadIn.py | 8 | ||||
| -rw-r--r-- | module/plugins/hoster/UploadedTo.py | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 0e5245e9e..a4c274c04 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -50,8 +50,8 @@ class NetloadIn(Plugin): pyfile.status.url = self.parent.url return True - self.download_html() while not pyfile.status.url: + self.download_html() self.get_wait_time() pyfile.status.waituntil = self.time_plus_wait pyfile.status.want_reconnect = self.want_reconnect @@ -106,8 +106,6 @@ class NetloadIn(Plugin): break def get_file_url(self): - """ returns the absolute downloadable filepath - """ try: file_url_pattern = r"<a class=\"Orange_Link\" href=\"(http://.+)\" >Click here" return re.search(file_url_pattern, self.html[2]).group(1) @@ -116,8 +114,10 @@ class NetloadIn(Plugin): def get_wait_time(self): if re.search(r"We had a reqeust with the IP", self.html[2]): + wait_minutes = int(re.search(r"countdown\((.+),'change\(\)'\)", self.html[2]).group(1)) / 6000 self.want_reconnect = True - self.time_plus_wait = time() + 10 * 30 + print wait_minutes + self.time_plus_wait = time() + wait_minutes * 60 return wait_seconds = int(re.search(r"countdown\((.+),'change\(\)'\)", self.html[2]).group(1)) / 100 diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index df7d577f9..619c9bba1 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- import re @@ -97,8 +96,6 @@ class UploadedTo(Plugin): self.time_plus_wait = 0 def get_file_url(self): - """ returns the absolute downloadable filepath - """ if self.config['premium']: self.start_dl = True return self.parent.url |