From fb65d5354c3cc80c3f48c3a2745b8dc01105edfd Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 18 Dec 2014 16:02:29 +0100
Subject: Update account plugins

---
 module/plugins/accounts/CzshareCom.py | 9 ++++-----
 1 file changed, 4 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 844ec9999..414883228 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.14"
+    __version__ = "0.15"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
@@ -27,10 +27,9 @@ class CzshareCom(Account):
         if m is None:
             return {"validuntil": 0, "trafficleft": 0}
         else:
-            credits = float(m.group(1).replace(' ', '').replace(',', '.'))
-            credits = credits * 1024 ** {'KiB': 0, 'MiB': 1, 'GiB': 2}[m.group(2)]
-            validuntil = mktime(strptime(m.group(3), '%d.%m.%y %H:%M'))
-            return {"validuntil": validuntil, "trafficleft": credits}
+            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}
 
 
     def login(self, user, data, req):
-- 
cgit v1.2.3


From 36e60a23497ae05736c24fed2f4ce936fb61f744 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 8 Jan 2015 23:31:33 +0100
Subject: "New Year" Update: account plugins

---
 module/plugins/accounts/CzshareCom.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins/accounts/CzshareCom.py')

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 414883228..f84bc67f3 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.15"
+    __version__ = "0.16"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
@@ -33,11 +33,11 @@ class CzshareCom(Account):
 
 
     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()
-- 
cgit v1.2.3


From 41a07b7f2f64e76cd7df1fb78855c8c353df65b0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 7 Feb 2015 21:42:49 +0100
Subject: [CzshareCom] Fix https://github.com/pyload/pyload/issues/1147

---
 module/plugins/accounts/CzshareCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts/CzshareCom.py')

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index f84bc67f3..640aa3eff 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.16"
+    __version__ = "0.17"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
@@ -27,7 +27,7 @@ class CzshareCom(Account):
         if m is None:
             return {"validuntil": 0, "trafficleft": 0}
         else:
-            trafficleft = self.parseTraffic(m.group(1).replace(' ', '').replace(',', '.')) + m.group(2)]
+            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}
 
-- 
cgit v1.2.3


From 0755b5ca4189e1e3abb46620a5ce1406196a3628 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 7 Feb 2015 21:47:11 +0100
Subject: [CzshareCom] Account cleanup

---
 module/plugins/accounts/CzshareCom.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'module/plugins/accounts/CzshareCom.py')

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):
-- 
cgit v1.2.3