From 933323bddb64a6739eec8182100baab09e09be57 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 10 Dec 2014 19:28:37 +0100 Subject: [RapiduNet] Improve account plugin Conflicts: module/plugins/accounts/RapiduNet.py --- module/plugins/accounts/RapiduNet.py | 38 +++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'module/plugins/accounts/RapiduNet.py') diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index 2fabb6120..fe465bc48 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -6,40 +6,42 @@ from module.common.json_layer import json_loads class RapiduNet(Account): - __name__ = "RapiduNet" - __type__ = "account" - __version__ = "0.01" + __name__ = "RapiduNet" + __type__ = "account" + __version__ = "0.02" __description__ = """Rapidu.net account plugin""" - __license__ = "GPLv3" - __authors__ = [("prOq", None)] + __license__ = "GPLv3" + __authors__ = [("prOq", None)] - ACCOUNT_INFO_PATTERN = 'Account: (.*?)' + PREMIUM_PATTERN = r'Account: Premium' def loadAccountInfo(self, user, req): - premium = False + info = {'validuntil': None, 'trafficleft': None, 'premium': False} - req.load('https://rapidu.net/ajax.php?a=getChangeLang', post={"_go": "", "lang": "en"}) - self.html = req.load('https://rapidu.net/', decode=True) + req.load("https://rapidu.net/ajax.php", get={'a': "getChangeLang"}, post={"_go": "", "lang": "en"}) + html = req.load("https://rapidu.net/", decode=True) - m = re.search(self.ACCOUNT_INFO_PATTERN, self.html) - if m: - if m.group(1) == "Premium": - premium = True + if re.search(self.PREMIUM_PATTERN, html): + info['premium'] = True - return {"validuntil": None, "trafficleft": None, "premium": premium} + return info def login(self, user, data, req): try: - json = req.load('https://rapidu.net/ajax.php?a=getUserLogin', post={"_go": "", "login": user, "pass": data['password'], "member": "1"}) - json = json_loads(json) + json = json_loads(req.load("https://rapidu.net/ajax.php?a=getUserLogin", + post={'_go': "", + 'login': user, + 'pass': data['password'], + 'member': "1"})) + self.logDebug(json) if not json['message'] == "success": - self.wrongPassword() + self.wrongPassword() + except Exception, e: self.logError(e) - -- cgit v1.2.3 From 1f1e5cd57b08353c5f42add8f9b842c4926ba8ed Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 1 Jan 2015 02:01:37 +0100 Subject: [RapiduNet] Fixup --- module/plugins/accounts/RapiduNet.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'module/plugins/accounts/RapiduNet.py') diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index fe465bc48..60283e5bd 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -8,7 +8,7 @@ from module.common.json_layer import json_loads class RapiduNet(Account): __name__ = "RapiduNet" __type__ = "account" - __version__ = "0.02" + __version__ = "0.03" __description__ = """Rapidu.net account plugin""" __license__ = "GPLv3" @@ -19,24 +19,29 @@ class RapiduNet(Account): def loadAccountInfo(self, user, req): - info = {'validuntil': None, 'trafficleft': None, 'premium': False} + validuntil = None + trafficleft = None + premium = False + + req.load("https://rapidu.net/ajax.php?a=getChangeLang", + post={'_go': "", 'lang': "en"}) - req.load("https://rapidu.net/ajax.php", get={'a': "getChangeLang"}, post={"_go": "", "lang": "en"}) html = req.load("https://rapidu.net/", decode=True) if re.search(self.PREMIUM_PATTERN, html): - info['premium'] = True + premium = True + trafficleft = -1 - return info + return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} def login(self, user, data, req): try: json = json_loads(req.load("https://rapidu.net/ajax.php?a=getUserLogin", - post={'_go': "", - 'login': user, - 'pass': data['password'], - 'member': "1"})) + post={'_go' : "", + 'login' : user, + 'pass' : data['password'], + 'remember': "1"})) self.logDebug(json) -- cgit v1.2.3 From c06dbc2e7b7fbba6ad6de3a28b4fcf21df04814d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 2 Jan 2015 01:11:12 +0100 Subject: [RapiduNet] Fixup (2) --- module/plugins/accounts/RapiduNet.py | 54 +++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 23 deletions(-) (limited to 'module/plugins/accounts/RapiduNet.py') diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index 60283e5bd..2d4770f67 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- import re + +from time import time + from module.plugins.Account import Account from module.common.json_layer import json_loads @@ -8,45 +11,50 @@ from module.common.json_layer import json_loads class RapiduNet(Account): __name__ = "RapiduNet" __type__ = "account" - __version__ = "0.03" + __version__ = "0.04" __description__ = """Rapidu.net account plugin""" __license__ = "GPLv3" - __authors__ = [("prOq", None)] + __authors__ = [("prOq", None), + ("Walter Purcaro", "vuolter@gmail.com")] - PREMIUM_PATTERN = r'Account: Premium' + PREMIUM_PATTERN = r'>Account: Premium' + + VALID_UNTIL_PATTERN = r'>Account: \w+ \((\d+)' def loadAccountInfo(self, user, req): validuntil = None - trafficleft = None + trafficleft = -1 premium = False - req.load("https://rapidu.net/ajax.php?a=getChangeLang", - post={'_go': "", 'lang': "en"}) - html = req.load("https://rapidu.net/", decode=True) if re.search(self.PREMIUM_PATTERN, html): - premium = True - trafficleft = -1 + premium = True + + m = re.search(self.VALID_UNTIL_PATTERN, html) + if m: + validuntil = time() + (86400 * int(m.group(1))) return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} def login(self, user, data, req): - try: - json = json_loads(req.load("https://rapidu.net/ajax.php?a=getUserLogin", - post={'_go' : "", - 'login' : user, - 'pass' : data['password'], - 'remember': "1"})) - - self.logDebug(json) - - if not json['message'] == "success": - self.wrongPassword() - - except Exception, e: - self.logError(e) + req.load("https://rapidu.net/ajax.php", + get={'a': "getChangeLang"}, + post={'_go' : "", + 'lang': "en"}) + + json = json_loads(req.load("https://rapidu.net/ajax.php", + get={'a': "getUserLogin"}, + post={'_go' : "", + 'login' : user, + 'pass' : data['password'], + 'remember': "1"})) + + self.logDebug(json) + + if not json['message'] == "success": + self.wrongPassword() -- cgit v1.2.3 From 3639af423fab5d905e9222f0125aeea2dcf58118 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 2 Jan 2015 01:17:16 +0100 Subject: [RapiduNet] Account trafficleft --- module/plugins/accounts/RapiduNet.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'module/plugins/accounts/RapiduNet.py') diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py index 2d4770f67..8da698c57 100644 --- a/module/plugins/accounts/RapiduNet.py +++ b/module/plugins/accounts/RapiduNet.py @@ -11,7 +11,7 @@ from module.common.json_layer import json_loads class RapiduNet(Account): __name__ = "RapiduNet" __type__ = "account" - __version__ = "0.04" + __version__ = "0.05" __description__ = """Rapidu.net account plugin""" __license__ = "GPLv3" @@ -23,6 +23,8 @@ class RapiduNet(Account): VALID_UNTIL_PATTERN = r'>Account: \w+ \((\d+)' + TRAFFIC_LEFT_PATTERN = r'class="tipsyS">(.+?)<' + def loadAccountInfo(self, user, req): validuntil = None @@ -38,6 +40,10 @@ class RapiduNet(Account): if m: validuntil = time() + (86400 * int(m.group(1))) + m = re.search(self.TRAFFIC_LEFT_PATTERN, html) + if m: + trafficleft = self.parseTraffic(m.group(1)) + return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} -- cgit v1.2.3