diff options
| author |  spoob <spoob@gmx.de>
| 2009-11-14 18:38:47 +0100 |
|---|---|---|
| committer | spoob <spoob@gmx.de>
| 2009-11-14 18:38:47 +0100 |
| commit | 079a211aec1f0c3586ec9c67bd3fbefca0f63017 (patch) | |
| tree | f5e46ad8da40ac0aac9c34ce3402e0cec4fe375c /module | |
| parent | python25 compatibility (diff) | |
| download | pyload-079a211aec1f0c3586ec9c67bd3fbefca0f63017.tar.xz | |
added plugin info, v0.2.3.2
Diffstat (limited to 'module')
| -rw-r--r-- | module/download_thread.py | 1 | ||||
| -rw-r--r-- | module/plugins/RapidshareCom.py | 7 | ||||
| -rw-r--r-- | module/plugins/UploadedTo.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/module/download_thread.py b/module/download_thread.py index 6a31030ca..539f3e62f 100644 --- a/module/download_thread.py +++ b/module/download_thread.py @@ -34,6 +34,7 @@ class Status(object): self.url = None self.exists = False self.waituntil = 0 + self.plugin = pyfile.modul.__name__ self.want_reconnect = False self.error = "" diff --git a/module/plugins/RapidshareCom.py b/module/plugins/RapidshareCom.py index 7706a7cf7..08b7bdea4 100644 --- a/module/plugins/RapidshareCom.py +++ b/module/plugins/RapidshareCom.py @@ -65,7 +65,7 @@ class RapidshareCom(Plugin): pyfile.status.want_reconnect = self.want_reconnect thread.wait(self.parent) - if self.no_slots: + while self.no_slots: self.download_serverhtml() pyfile.status.url = self.get_file_url() @@ -141,9 +141,10 @@ class RapidshareCom(Plugin): except: if re.search(r"(Currently a lot of users|There are no more download slots)", self.html[1], re.I) != None: self.time_plus_wait = time() + 130 - self.parent.parent.logger.debug("Rapidshare: No free slots!") + self.parent.parent.logger.info("Rapidshare: No free slots!") self.no_slots = True return True + self.no_slots = False wait_seconds = re.search(r"var c=(.*);.*", self.html[1]).group(1) self.time_plus_wait = time() + int(wait_seconds) + 5 @@ -203,7 +204,7 @@ class RapidshareCom(Plugin): def check_file(self, local_file): if self.api_data and self.api_data["checksum"]: h = hashlib.md5() - f = open(local_file, "rb"): + f = open(local_file, "rb") h.update(f.read()) f.close() hexd = h.hexdigest() diff --git a/module/plugins/UploadedTo.py b/module/plugins/UploadedTo.py index bda0bf899..e00d72f51 100644 --- a/module/plugins/UploadedTo.py +++ b/module/plugins/UploadedTo.py @@ -145,7 +145,7 @@ class UploadedTo(Plugin): def check_file(self, local_file): if self.api_data and self.api_data["checksum"]: h = hashlib.sha1() - f = open(local_file, "rb"): + f = open(local_file, "rb") h.update(f.read()) f.close() hexd = h.hexdigest() |