summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/accounts/FourSharedCom.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-14 13:35:34 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-14 13:35:34 +0200
commit1066d65b9ed19d8e1b061c13fc0156d823fea800 (patch)
tree4c1fcd3b0660d2ccb3ce4d2abc0077f1a7876725 /pyload/plugins/accounts/FourSharedCom.py
parentDocs cleanup + remove script directory (diff)
parent[FTP] Restore pattern. (diff)
downloadpyload-1066d65b9ed19d8e1b061c13fc0156d823fea800.tar.xz
Merge remote-tracking branch 'pyload/stable' into 0.4.10
Conflicts: module/plugins/accounts/MultiDebridCom.py module/plugins/accounts/MyfastfileCom.py module/plugins/hooks/MultiDebridCom.py module/plugins/hooks/MyfastfileCom.py module/plugins/hooks/Premium4Me.py module/plugins/hooks/PremiumTo.py module/plugins/hoster/MultiDebridCom.py module/plugins/hoster/MyfastfileCom.py module/plugins/hoster/Premium4Me.py module/plugins/hoster/PremiumTo.py pyload/plugins/accounts/MultiDebridCom.py pyload/plugins/accounts/Premium4Me.py pyload/plugins/hooks/MultiDebridCom.py pyload/plugins/hooks/Premium4Me.py pyload/plugins/hoster/MultiDebridCom.py pyload/plugins/hoster/Premium4Me.py
Diffstat (limited to 'pyload/plugins/accounts/FourSharedCom.py')
-rw-r--r--pyload/plugins/accounts/FourSharedCom.py26
1 files changed, 11 insertions, 15 deletions
diff --git a/pyload/plugins/accounts/FourSharedCom.py b/pyload/plugins/accounts/FourSharedCom.py
index 217bd2874..e4df62956 100644
--- a/pyload/plugins/accounts/FourSharedCom.py
+++ b/pyload/plugins/accounts/FourSharedCom.py
@@ -7,28 +7,24 @@ from pyload.utils import json_loads
class FourSharedCom(Account):
__name__ = "FourSharedCom"
__type__ = "account"
- __version__ = "0.01"
+ __version__ = "0.03"
__description__ = """FourShared.com account plugin"""
- __author_name__ = "zoidberg"
- __author_mail__ = "zoidberg@mujmail.cz"
-
+ __author_name__ = ("zoidberg", "stickell")
+ __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
def loadAccountInfo(self, user, req):
- #fixme
- return {"validuntil": -1, "trafficleft": -1, "premium": False}
+ # Free mode only for now
+ return {"premium": False}
def login(self, user, data, req):
- req.cj.setCookie("www.4shared.com", "4langcookie", "en")
- response = req.load('http://www.4shared.com/login',
+ req.cj.setCookie("4shared.com", "4langcookie", "en")
+ response = req.load('http://www.4shared.com/web/login',
post={"login": user,
"password": data['password'],
- "remember": "false",
- "doNotRedirect": "true"})
- self.logDebug(response)
- response = json_loads(response)
+ "remember": "on",
+ "_remember": "on",
+ "returnTo": "http://www.4shared.com/account/home.jsp"})
- if not "ok" in response or response['ok'] != True:
- if "rejectReason" in response and response['rejectReason'] != True:
- self.logError(response['rejectReason'])
+ if 'Please log in to access your 4shared account' in response:
self.wrongPassword()