From 6cd895b4ee930cc0d1ed21bf13f58804f49fb304 Mon Sep 17 00:00:00 2001 From: EvolutionClip Date: Fri, 5 Jun 2015 22:49:14 +0200 Subject: Create HighWayMe.py --- module/plugins/accounts/HighWayMe.py | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 module/plugins/accounts/HighWayMe.py (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py new file mode 100644 index 000000000..b192f6fa4 --- /dev/null +++ b/module/plugins/accounts/HighWayMe.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- + +from module.common.json_layer import json_loads +from module.plugins.Account import Account + + +class HighWayMe.py(Account): + __name__ = "HighWayMe.py" + __type__ = "account" + __version__ = "0.01" + + __description__ = """High-Way.Me account plugin""" + __license__ = "GPLv3" + __authors__ = [("yannik995", "evolutionclip@live.de")] + + + def loadAccountInfo(self, user, req): + premium = False + validuntil = -1 + trafficleft = None + + json_data = req.load('https://high-way.me/api.php?user') + + self.logDebug("JSON data: %s" % json_data) + + json_data = json_loads(json_data) + + if 'premium' in json_data['user'] and json_data['user']['premium']: + premium = True + + if 'premium_bis' in json_data['user'] and json_data['user']['premium_bis']: + validuntil = float(json_data['user']['premium_bis']) + + if 'premium_traffic' in json_data['user'] and json_data['user']['premium_traffic']: + trafficleft = float(json_data['user']['premium_traffic']) / 1024 #@TODO: Remove `/ 1024` in 0.4.10 + + return {"premium": premium, "validuntil": validuntil, "trafficleft": trafficleft} + + + def login(self, user, data, req): + + html = req.load("https://high-way.me/api.php?login", + post={'login': '1', 'user': user, 'pass': data['password']}, + decode=True) + + if 'UserOrPassInvalid' in html: + self.wrongPassword() -- cgit v1.2.3 From 0e2188958988b8e39e6b0d899a73aadfda11c2ef Mon Sep 17 00:00:00 2001 From: EvolutionClip Date: Fri, 5 Jun 2015 22:50:43 +0200 Subject: Update HighWayMe.py --- module/plugins/accounts/HighWayMe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index b192f6fa4..76330a3d1 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -11,7 +11,7 @@ class HighWayMe.py(Account): __description__ = """High-Way.Me account plugin""" __license__ = "GPLv3" - __authors__ = [("yannik995", "evolutionclip@live.de")] + __authors__ = [("EvolutionClip", "evolutionclip@live.de")] def loadAccountInfo(self, user, req): -- cgit v1.2.3 From b81d202ab0eeb692a85ee4dda946810fb9886f59 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 6 Jun 2015 03:33:26 +0200 Subject: [HighWayMe] Cleanup --- module/plugins/accounts/HighWayMe.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index 76330a3d1..d09c53c63 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -9,7 +9,7 @@ class HighWayMe.py(Account): __type__ = "account" __version__ = "0.01" - __description__ = """High-Way.Me account plugin""" + __description__ = """High-Way.me account plugin""" __license__ = "GPLv3" __authors__ = [("EvolutionClip", "evolutionclip@live.de")] @@ -34,11 +34,12 @@ class HighWayMe.py(Account): if 'premium_traffic' in json_data['user'] and json_data['user']['premium_traffic']: trafficleft = float(json_data['user']['premium_traffic']) / 1024 #@TODO: Remove `/ 1024` in 0.4.10 - return {"premium": premium, "validuntil": validuntil, "trafficleft": trafficleft} + return {'premium' : premium, + 'validuntil' : validuntil, + 'trafficleft': trafficleft} def login(self, user, data, req): - html = req.load("https://high-way.me/api.php?login", post={'login': '1', 'user': user, 'pass': data['password']}, decode=True) -- cgit v1.2.3 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/HighWayMe.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index d09c53c63..3c2573e47 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- from module.common.json_layer import json_loads -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class HighWayMe.py(Account): __name__ = "HighWayMe.py" __type__ = "account" - __version__ = "0.01" + __version__ = "0.02" __description__ = """High-Way.me account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From d14dc03f2919247d31c06c15cee8b791716cd8c9 Mon Sep 17 00:00:00 2001 From: EvolutionClip Date: Thu, 11 Jun 2015 22:07:43 +0200 Subject: Fixed Syntax Error --- module/plugins/accounts/HighWayMe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index 76330a3d1..69219a834 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -4,7 +4,7 @@ from module.common.json_layer import json_loads from module.plugins.Account import Account -class HighWayMe.py(Account): +class HighWayMe(Account): __name__ = "HighWayMe.py" __type__ = "account" __version__ = "0.01" -- 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/HighWayMe.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index eba1b4692..d85db9769 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -19,7 +19,7 @@ class HighWayMe(Account): validuntil = -1 trafficleft = None - json_data = req.load('https://high-way.me/api.php?user') + json_data = self.load('https://high-way.me/api.php?user', req=req) self.logDebug("JSON data: %s" % json_data) @@ -40,9 +40,8 @@ class HighWayMe(Account): def login(self, user, data, req): - html = req.load("https://high-way.me/api.php?login", - post={'login': '1', 'user': user, 'pass': data['password']}, - decode=True) + html = self.load("https://high-way.me/api.php?login", + post={'login': '1', 'user': user, 'pass': data['password']}, req=req) if 'UserOrPassInvalid' in html: self.wrongPassword() -- 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/HighWayMe.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index d85db9769..f6baaa0a1 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -7,21 +7,21 @@ from module.plugins.internal.Account import Account class HighWayMe(Account): __name__ = "HighWayMe.py" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __description__ = """High-Way.me account plugin""" __license__ = "GPLv3" __authors__ = [("EvolutionClip", "evolutionclip@live.de")] - def loadAccountInfo(self, user, req): + def load_account_info(self, user, req): premium = False validuntil = -1 trafficleft = None json_data = self.load('https://high-way.me/api.php?user', req=req) - self.logDebug("JSON data: %s" % json_data) + self.log_debug("JSON data: %s" % json_data) json_data = json_loads(json_data) @@ -44,4 +44,4 @@ class HighWayMe(Account): post={'login': '1', 'user': user, 'pass': data['password']}, req=req) if 'UserOrPassInvalid' in html: - self.wrongPassword() + self.wrong_password() -- 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/HighWayMe.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index f6baaa0a1..8be933c37 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -41,7 +41,10 @@ class HighWayMe(Account): def login(self, user, data, req): html = self.load("https://high-way.me/api.php?login", - post={'login': '1', 'user': user, 'pass': data['password']}, req=req) + post={'login': '1', + 'user': user, + 'pass': data['password']}, + req=req) if 'UserOrPassInvalid' in html: self.wrong_password() -- 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/HighWayMe.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index 8be933c37..c3d99f88e 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -19,7 +19,7 @@ class HighWayMe(Account): validuntil = -1 trafficleft = None - json_data = self.load('https://high-way.me/api.php?user', req=req) + json_data = self.load('https://high-way.me/api.php?user') self.log_debug("JSON data: %s" % json_data) @@ -43,8 +43,7 @@ class HighWayMe(Account): html = self.load("https://high-way.me/api.php?login", post={'login': '1', 'user': user, - 'pass': data['password']}, - req=req) + 'pass': data['password']}) if 'UserOrPassInvalid' in html: self.wrong_password() -- 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/HighWayMe.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index c3d99f88e..e960a8b8f 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -8,6 +8,7 @@ class HighWayMe(Account): __name__ = "HighWayMe.py" __type__ = "account" __version__ = "0.04" + __status__ = "stable" __description__ = """High-Way.me 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/HighWayMe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index e960a8b8f..5f0d971ae 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -8,7 +8,7 @@ class HighWayMe(Account): __name__ = "HighWayMe.py" __type__ = "account" __version__ = "0.04" - __status__ = "stable" + __status__ = "testing" __description__ = """High-Way.me 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/HighWayMe.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index 5f0d971ae..f546c2fe1 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -15,7 +15,7 @@ class HighWayMe(Account): __authors__ = [("EvolutionClip", "evolutionclip@live.de")] - def load_account_info(self, user, req): + def parse_info(self, user, password, data, req): premium = False validuntil = -1 trafficleft = None @@ -40,11 +40,11 @@ class HighWayMe(Account): 'trafficleft': trafficleft} - def login(self, user, data, req): + def login(self, user, password, data, req): html = self.load("https://high-way.me/api.php?login", post={'login': '1', 'user': user, - 'pass': data['password']}) + 'pass': password}) if 'UserOrPassInvalid' in html: - self.wrong_password() + self.fail() -- 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/HighWayMe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/HighWayMe.py') diff --git a/module/plugins/accounts/HighWayMe.py b/module/plugins/accounts/HighWayMe.py index f546c2fe1..ff90ec2d2 100644 --- a/module/plugins/accounts/HighWayMe.py +++ b/module/plugins/accounts/HighWayMe.py @@ -47,4 +47,4 @@ class HighWayMe(Account): 'pass': password}) if 'UserOrPassInvalid' in html: - self.fail() + self.login_fail() -- cgit v1.2.3