[CzshareCom] Account cleanup

1 files changed, 17 insertions, 6 deletions

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 640aa3eff..202a88e25 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -9,7 +9,7 @@ from module.plugins.Account import Account
 class CzshareCom(Account):
     __name__    = "CzshareCom"
     __type__    = "account"
-    __version__ = "0.17"
+    __version__ = "0.18"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
@@ -21,15 +21,26 @@ class CzshareCom(Account):
 
 
     def loadAccountInfo(self, user, req):
+        premium     = False
+        validuntil  = None
+        trafficleft = None
+
         html = req.load("http://sdilej.cz/prehled_kreditu/")
 
-        m = re.search(self.CREDIT_LEFT_PATTERN, html)
-        if m is None:
-            return {"validuntil": 0, "trafficleft": 0}
-        else:
+        try:
+            m = re.search(self.CREDIT_LEFT_PATTERN, html)
             trafficleft = self.parseTraffic(m.group(1).replace(' ', '').replace(',', '.')) + m.group(2)
             validuntil  = mktime(strptime(m.group(3), '%d.%m.%y %H:%M'))
-            return {"validuntil": validuntil, "trafficleft": trafficleft}
+
+        except Exception, e:
+            self.logError(e)
+
+        else:
+            premium = True
+
+        return {'premium'    : premium,
+                'validuntil' : validuntil,
+                'trafficleft': trafficleft}
 
 
     def login(self, user, data, req):