summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2009-11-10 21:03:02 +0100
committerGravatar mkaay <mkaay@mkaay.de> 2009-11-10 21:03:02 +0100
commit69378d565bd9ffbf361377653de39ff37ff40156 (patch)
tree848ccb3e9ba8bd1251324646a4936dd434392241 /module/plugins
parentchecksum methods for RapidshareCom and UploadedTo (diff)
downloadpyload-69378d565bd9ffbf361377653de39ff37ff40156.tar.xz
fixed rapidshare plugin, creates error file if checksum is wrong, strip spaces i
n cli
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/RapidshareCom.py2
-rw-r--r--module/plugins/UploadedTo.py2
2 files changed, 2 insertions, 2 deletions
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