diff options
Diffstat (limited to 'module/plugins/accounts/FileserveCom.py')
| -rw-r--r-- | module/plugins/accounts/FileserveCom.py | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 5eb6b844c..dabfc1932 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -2,43 +2,50 @@ import time -from module.plugins.Account import Account +from module.plugins.internal.Account import Account from module.common.json_layer import json_loads class FileserveCom(Account): __name__ = "FileserveCom" __type__ = "account" - __version__ = "0.20" + __version__ = "0.22" + __status__ = "testing" __description__ = """Fileserve.com account plugin""" __license__ = "GPLv3" __authors__ = [("mkaay", "mkaay@mkaay.de")] - def loadAccountInfo(self, user, req): - data = self.getAccountData(user) + def parse_info(self, user, password, data, req): + data = self.get_data(user) - html = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit": "Submit+Query"}) + html = self.load("http://app.fileserve.com/api/login/", + post={'username': user, + 'password': password, + 'submit': "Submit+Query"}) res = json_loads(html) if res['type'] == "premium": validuntil = time.mktime(time.strptime(res['expireTime'], "%Y-%m-%d %H:%M:%S")) - return {"trafficleft": res['traffic'], "validuntil": validuntil} + return {'trafficleft': res['traffic'], 'validuntil': validuntil} else: - return {"premium": False, "trafficleft": None, "validuntil": None} + return {'premium': False, 'trafficleft': None, 'validuntil': None} - def login(self, user, data, req): - html = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit": "Submit+Query"}) + def login(self, user, password, data, req): + html = self.load("http://app.fileserve.com/api/login/", + post={'username': user, + 'password': password, + 'submit' : "Submit+Query"}) res = json_loads(html) if not res['type']: - self.wrongPassword() - - #login at fileserv html - req.load("http://www.fileserve.com/login.php", - post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", - "loginFormSubmit": "Login"}) + self.login_fail() + + #: Login at fileserv html + self.load("http://www.fileserve.com/login.php", + post={'loginUserName' : user, + 'loginUserPassword': password, + 'autoLogin' : "checked", + 'loginFormSubmit' : "Login"}) |