Merge pull request #1 from pyload/stable

sync stable

1 files changed, 24 insertions, 13 deletions

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 414883228..300943828 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from time import mktime, strptime
 import re
+import time
 
 from module.plugins.Account import Account
 
@@ -9,7 +9,7 @@ from module.plugins.Account import Account
 class CzshareCom(Account):
     __name__    = "CzshareCom"
     __type__    = "account"
-    __version__ = "0.15"
+    __version__ = "0.18"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
@@ -21,23 +21,34 @@ 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}
+        try:
+            m = re.search(self.CREDIT_LEFT_PATTERN, html)
+            trafficleft = self.parseTraffic(m.group(1).replace(' ', '').replace(',', '.')) + m.group(2)
+            validuntil  = time.mktime(time.strptime(m.group(3), '%d.%m.%y %H:%M'))
+
+        except Exception, e:
+            self.logError(e)
+
         else:
-            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}
+            premium = True
+
+        return {'premium'    : premium,
+                'validuntil' : validuntil,
+                'trafficleft': trafficleft}
 
 
     def login(self, user, data, req):
-        html = req.load('https://sdilej.cz/index.php', post={
-            "Prihlasit": "Prihlasit",
-            "login-password": data['password'],
-            "login-name": user
-        })
+        html = req.load('https://sdilej.cz/index.php',
+                        post={"Prihlasit": "Prihlasit",
+                              "login-password": data['password'],
+                              "login-name": user},
+                        decode=True)
 
         if '<div class="login' in html:
             self.wrongPassword()