From 53540e0df49ae52d67294512d13109c2249805cd Mon Sep 17 00:00:00 2001 From: CryNickSystems Date: Fri, 11 Nov 2011 19:38:28 +0100 Subject: Check validity of OronCom and NetloadIn accounts --- module/plugins/accounts/OronCom.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) mode change 100644 => 100755 module/plugins/accounts/OronCom.py (limited to 'module/plugins/accounts/OronCom.py') diff --git a/module/plugins/accounts/OronCom.py b/module/plugins/accounts/OronCom.py old mode 100644 new mode 100755 index 4e4d26e7c..fdb23c93a --- a/module/plugins/accounts/OronCom.py +++ b/module/plugins/accounts/OronCom.py @@ -27,17 +27,24 @@ class OronCom(Account): __type__ = "account" __description__ = """oron.com account plugin""" __author_name__ = ("DHMH") - __author_mail__ = ("webmaster@pcProfil.de") + __author_mail__ = ("oron@pyload.org") def loadAccountInfo(self, user, req): req.load("http://oron.com/?op=change_lang&lang=german") src = req.load("http://oron.com/?op=my_account").replace("\n", "") - validuntil = re.search(r"Premiumaccount läuft bis:\s*(.*?)", src).group(1) - validuntil = int(mktime(strptime(validuntil, "%d %B %Y"))) - trafficleft = re.search(r'Download Traffic verfügbar:\s*(.*?)', src).group(1) - self.logDebug("Oron left: " + trafficleft) - trafficleft = int(self.parseTraffic(trafficleft)) - tmp = {"validuntil": validuntil, "trafficleft": trafficleft} + validuntil = re.search(r"Premiumaccount läuft bis:\s*(.*?)", src) + if validuntil: + validuntil = validuntil.group(1) + validuntil = int(mktime(strptime(validuntil, "%d %B %Y"))) + trafficleft = re.search(r'Download Traffic verfügbar:\s*(.*?)', src).group(1) + self.logDebug("Oron left: " + trafficleft) + trafficleft = int(self.parseTraffic(trafficleft)) + premium = True + else: + validuntil = -1 + trafficleft = None + premium = False + tmp = {"validuntil": validuntil, "trafficleft": trafficleft, "premium" : premium} return tmp def login(self, user, data, req): -- cgit v1.2.3