From aa785ddd8d64fa25bd1b0fe20eaa07d2c67b6837 Mon Sep 17 00:00:00 2001 From: OndrejIT Date: Mon, 25 Apr 2016 21:40:15 +0200 Subject: Fix SdilejCZ --- module/plugins/accounts/CzshareCom.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'module/plugins/accounts/CzshareCom.py') diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 8852b5998..1aaedecfa 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -9,16 +9,18 @@ from module.plugins.internal.Account import Account class CzshareCom(Account): __name__ = "CzshareCom" __type__ = "account" - __version__ = "0.26" + __version__ = "0.27" __status__ = "testing" __description__ = """Czshare.com account plugin, now Sdilej.cz""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("stickell", "l.stickell@yahoo.it")] + ("stickell", "l.stickell@yahoo.it"), + ("ondrej", "git@ondrej.it"),] - CREDIT_LEFT_PATTERN = r'\s*([\d ,]+) (KiB|MiB|GiB)\s*(.*?)\s*' + CREDIT_LEFT_PATTERN = r'^\s+
\s+\n.+([\d,]+)(KB|MB|GB)\s+\n.+\s+$' + VALID_UNTIL_PATTERN = r'^\s+\s+\n.+\n\s+([\d\.: ]+)\s+$' def grab_info(self, user, password, data): @@ -29,9 +31,11 @@ class CzshareCom(Account): html = self.load("http://sdilej.cz/prehled_kreditu/") try: - m = re.search(self.CREDIT_LEFT_PATTERN, html) + m = re.search(self.CREDIT_LEFT_PATTERN, html, re.MULTILINE) trafficleft = self.parse_traffic(m.group(1), m.group(2)) - validuntil = time.mktime(time.strptime(m.group(3), '%d.%m.%y %H:%M')) + + v = re.search(self.VALID_UNTIL_PATTERN, html, re.MULTILINE) + validuntil = time.mktime(time.strptime(v.group(1), '%d.%m.%y %H:%M')) except Exception, e: self.log_error(e, trace=True) -- cgit v1.2.3