From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/accounts/FileserveCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 5eb6b844c..38e21e246 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -2,14 +2,14 @@ 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.21" __description__ = """Fileserve.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/accounts/FileserveCom.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 38e21e246..bda6efc8d 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -19,8 +19,8 @@ class FileserveCom(Account): def loadAccountInfo(self, user, req): data = self.getAccountData(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": data['password'], + "submit": "Submit+Query"}, req=req) res = json_loads(html) if res['type'] == "premium": @@ -31,14 +31,14 @@ class FileserveCom(Account): def login(self, user, data, req): - 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": data['password'], + "submit": "Submit+Query"}, req=req) res = json_loads(html) if not res['type']: self.wrongPassword() #login at fileserv html - req.load("http://www.fileserve.com/login.php", + self.load("http://www.fileserve.com/login.php", post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", - "loginFormSubmit": "Login"}) + "loginFormSubmit": "Login"}, req=req) -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/accounts/FileserveCom.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index bda6efc8d..5c6c15167 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -9,15 +9,15 @@ from module.common.json_layer import json_loads class FileserveCom(Account): __name__ = "FileserveCom" __type__ = "account" - __version__ = "0.21" + __version__ = "0.22" __description__ = """Fileserve.com account plugin""" __license__ = "GPLv3" __authors__ = [("mkaay", "mkaay@mkaay.de")] - def loadAccountInfo(self, user, req): - data = self.getAccountData(user) + def load_account_info(self, user, req): + data = self.get_account_data(user) html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], "submit": "Submit+Query"}, req=req) @@ -36,9 +36,9 @@ class FileserveCom(Account): res = json_loads(html) if not res['type']: - self.wrongPassword() + self.wrong_password() - #login at fileserv html + # login at fileserv html self.load("http://www.fileserve.com/login.php", post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", "loginFormSubmit": "Login"}, req=req) -- cgit v1.2.3 From d2e2b127651a5a44b56337eb6d9ca246c97a208a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Jul 2015 03:03:26 +0200 Subject: Spare fixes and code cosmetics --- module/plugins/accounts/FileserveCom.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 5c6c15167..a5c1b333b 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -19,8 +19,11 @@ class FileserveCom(Account): def load_account_info(self, user, req): data = self.get_account_data(user) - html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit": "Submit+Query"}, req=req) + html = self.load("http://app.fileserve.com/api/login/", + post={"username": user, + "password": data['password'], + "submit": "Submit+Query"}, + req=req) res = json_loads(html) if res['type'] == "premium": @@ -31,8 +34,11 @@ class FileserveCom(Account): def login(self, user, data, req): - html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit": "Submit+Query"}, req=req) + html = self.load("http://app.fileserve.com/api/login/", + post={"username": user, + "password": data['password'], + "submit" : "Submit+Query"}, + req=req) res = json_loads(html) if not res['type']: @@ -40,5 +46,8 @@ class FileserveCom(Account): # login at fileserv html self.load("http://www.fileserve.com/login.php", - post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", - "loginFormSubmit": "Login"}, req=req) + post={"loginUserName": user, + "loginUserPassword": data['password'], + "autoLogin": "checked", + "loginFormSubmit": "Login"}, + req=req) -- cgit v1.2.3 From 1f5a55ae2133a782bdcca334ecbcdbde50dbcf99 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Jul 2015 15:29:48 +0200 Subject: No more need to use the req argument when call load method --- module/plugins/accounts/FileserveCom.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index a5c1b333b..90ddc5fd2 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -22,8 +22,7 @@ class FileserveCom(Account): html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit": "Submit+Query"}, - req=req) + "submit": "Submit+Query"}) res = json_loads(html) if res['type'] == "premium": @@ -37,8 +36,7 @@ class FileserveCom(Account): html = self.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'], - "submit" : "Submit+Query"}, - req=req) + "submit" : "Submit+Query"}) res = json_loads(html) if not res['type']: @@ -49,5 +47,4 @@ class FileserveCom(Account): post={"loginUserName": user, "loginUserPassword": data['password'], "autoLogin": "checked", - "loginFormSubmit": "Login"}, - req=req) + "loginFormSubmit": "Login"}) -- cgit v1.2.3 From dad722ac7255640e7e0541c4094a4d2e4de79cd3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 00:05:58 +0200 Subject: Code cosmetics (2) --- module/plugins/accounts/FileserveCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 90ddc5fd2..edbf4a1cf 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -42,7 +42,7 @@ class FileserveCom(Account): if not res['type']: self.wrong_password() - # login at fileserv html + #: Login at fileserv html self.load("http://www.fileserve.com/login.php", post={"loginUserName": user, "loginUserPassword": data['password'], -- cgit v1.2.3 From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/accounts/FileserveCom.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index edbf4a1cf..8a77325d4 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -20,23 +20,23 @@ class FileserveCom(Account): data = self.get_account_data(user) html = self.load("http://app.fileserve.com/api/login/", - post={"username": user, - "password": data['password'], - "submit": "Submit+Query"}) + post={'username': user, + 'password': data['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 = self.load("http://app.fileserve.com/api/login/", - post={"username": user, - "password": data['password'], - "submit" : "Submit+Query"}) + post={'username': user, + 'password': data['password'], + 'submit' : "Submit+Query"}) res = json_loads(html) if not res['type']: @@ -44,7 +44,7 @@ class FileserveCom(Account): #: Login at fileserv html self.load("http://www.fileserve.com/login.php", - post={"loginUserName": user, - "loginUserPassword": data['password'], - "autoLogin": "checked", - "loginFormSubmit": "Login"}) + post={'loginUserName' : user, + 'loginUserPassword': data['password'], + 'autoLogin' : "checked", + 'loginFormSubmit' : "Login"}) -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/accounts/FileserveCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 8a77325d4..085a62190 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -10,6 +10,7 @@ class FileserveCom(Account): __name__ = "FileserveCom" __type__ = "account" __version__ = "0.22" + __status__ = "stable" __description__ = """Fileserve.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/accounts/FileserveCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 085a62190..5bd129ab7 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -10,7 +10,7 @@ class FileserveCom(Account): __name__ = "FileserveCom" __type__ = "account" __version__ = "0.22" - __status__ = "stable" + __status__ = "testing" __description__ = """Fileserve.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 8f17f875f6e28f73ddb10da59c6464bd04922222 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 04:59:27 +0200 Subject: Account rewritten --- module/plugins/accounts/FileserveCom.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 5bd129ab7..528bf7e58 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -17,12 +17,12 @@ class FileserveCom(Account): __authors__ = [("mkaay", "mkaay@mkaay.de")] - def load_account_info(self, user, req): - data = self.get_account_data(user) + def parse_info(self, user, password, data, req): + data = self.get_data(user) html = self.load("http://app.fileserve.com/api/login/", post={'username': user, - 'password': data['password'], + 'password': password, 'submit': "Submit+Query"}) res = json_loads(html) @@ -33,19 +33,19 @@ class FileserveCom(Account): return {'premium': False, 'trafficleft': None, 'validuntil': None} - def login(self, user, data, req): + def login(self, user, password, data, req): html = self.load("http://app.fileserve.com/api/login/", post={'username': user, - 'password': data['password'], + 'password': password, 'submit' : "Submit+Query"}) res = json_loads(html) if not res['type']: - self.wrong_password() + self.fail() #: Login at fileserv html self.load("http://www.fileserve.com/login.php", post={'loginUserName' : user, - 'loginUserPassword': data['password'], + 'loginUserPassword': password, 'autoLogin' : "checked", 'loginFormSubmit' : "Login"}) -- cgit v1.2.3 From a95c217627a1cb651b24e69f20640df40797aff9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 09:34:18 +0200 Subject: Account rewritten (2) --- module/plugins/accounts/FileserveCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FileserveCom.py') diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 528bf7e58..dabfc1932 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -41,7 +41,7 @@ class FileserveCom(Account): res = json_loads(html) if not res['type']: - self.fail() + self.login_fail() #: Login at fileserv html self.load("http://www.fileserve.com/login.php", -- cgit v1.2.3