From 69378d565bd9ffbf361377653de39ff37ff40156 Mon Sep 17 00:00:00 2001 From: mkaay Date: Tue, 10 Nov 2009 21:03:02 +0100 Subject: fixed rapidshare plugin, creates error file if checksum is wrong, strip spaces i n cli --- module/plugins/RapidshareCom.py | 2 +- module/plugins/UploadedTo.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/RapidshareCom.py b/module/plugins/RapidshareCom.py index 53e47b518..67db37245 100644 --- a/module/plugins/RapidshareCom.py +++ b/module/plugins/RapidshareCom.py @@ -135,7 +135,7 @@ class RapidshareCom(Plugin): self.time_plus_wait = time() + 60 * int(wait_minutes) self.want_reconnect = True except: - if re.search(r"Currently a lot of users", self.html[1], re.I) != None: + 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 return True wait_seconds = re.search(r"var c=(.*);.*", self.html[1]).group(1) diff --git a/module/plugins/UploadedTo.py b/module/plugins/UploadedTo.py index bf5582d7c..89ad9e4e8 100644 --- a/module/plugins/UploadedTo.py +++ b/module/plugins/UploadedTo.py @@ -88,7 +88,7 @@ class UploadedTo(Plugin): if not src.find("404 Not Found"): return self.api_data = {} - lines = src.split("\r\n") + lines = src.splitlines() self.api_data["filename"] = lines[0] self.api_data["size"] = lines[1] # in kbytes self.api_data["checksum"] = lines[2] #sha1 -- cgit v1.2.3