summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jeix <devnull@localhost> 2010-10-03 15:36:10 +0200
committerGravatar Jeix <devnull@localhost> 2010-10-03 15:36:10 +0200
commit23b9a6cc9d382cf292ec29e7652e427a4da3ac71 (patch)
tree27d83197c44622ae67dac6d2df3ff138573091f8
parentacc fixes, closed #134, closed #141 (diff)
downloadpyload-23b9a6cc9d382cf292ec29e7652e427a4da3ac71.tar.xz
HotfileCom fix
-rw-r--r--module/plugins/accounts/HotfileCom.py3
-rw-r--r--module/plugins/hoster/HotfileCom.py3
-rw-r--r--module/plugins/hoster/ShareonlineBiz.py2
3 files changed, 5 insertions, 3 deletions
diff --git a/module/plugins/accounts/HotfileCom.py b/module/plugins/accounts/HotfileCom.py
index f623e56f1..83551949d 100644
--- a/module/plugins/accounts/HotfileCom.py
+++ b/module/plugins/accounts/HotfileCom.py
@@ -19,6 +19,7 @@
from module.plugins.Account import Account
from time import strptime, mktime
+from urllib import unquote
import hashlib
class HotfileCom(Account):
@@ -68,7 +69,7 @@ class HotfileCom(Account):
post.update({"action": method})
post.update({"username":user, "passwordmd5dig":pwhash, "digest":digest})
- return req.load("http://api.hotfile.com/", post=post)
+ return unquote(req.load("http://api.hotfile.com/", post=post)).strip()
def login(self, user, data):
req = self.getAccountRequest(user)
diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index f3c6b67dd..3b88efe1f 100644
--- a/module/plugins/hoster/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -3,6 +3,7 @@
import re
from time import time
+from urllib import unquote
from module.plugins.Hoster import Hoster
from module.plugins.ReCaptcha import ReCaptcha
@@ -55,7 +56,7 @@ class HotfileCom(Hoster):
elif self.account and login:
return self.account.apiCall(method, post, self.user)
post.update({"action": method})
- return self.load("http://api.hotfile.com/", post=post)
+ return unquote(self.load("http://api.hotfile.com/", post=post)).strip()
def process(self, pyfile):
self.wantReconnect = False
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index a441c1e30..9c54fa50a 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -109,7 +109,7 @@ class ShareonlineBiz(Hoster):
""" returns the absolute downloadable filepath
"""
if self.account:
- return (re.search('<b>The following link contains a ticket to a valid mirror for your desired file\.</b>.*?<a href="(.*?)" onmouseout', self.html, re.S).group(1))
+ return re.search('<b>The following link contains a ticket to a valid mirror for your desired file\.</b>.*?<a href="(.*?)" onmouseout', self.html, re.S).group(1)
file_url_pattern = 'loadfilelink\.decode\("([^"]+)'
return b64decode(re.search(file_url_pattern, self.html).group(1))