From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 8 Jun 2015 06:08:01 +0200
Subject: Update everything

---
 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 300943828..67869551a 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -3,13 +3,13 @@
 import re
 import time
 
-from module.plugins.Account import Account
+from module.plugins.internal.Account import Account
 
 
 class CzshareCom(Account):
     __name__    = "CzshareCom"
     __type__    = "account"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 16 Jun 2015 17:31:38 +0200
Subject: Update all

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

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 67869551a..c53c1807b 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -25,7 +25,7 @@ class CzshareCom(Account):
         validuntil  = None
         trafficleft = None
 
-        html = req.load("http://sdilej.cz/prehled_kreditu/")
+        html = self.load("http://sdilej.cz/prehled_kreditu/", req=req)
 
         try:
             m = re.search(self.CREDIT_LEFT_PATTERN, html)
@@ -44,11 +44,10 @@ class CzshareCom(Account):
 
 
     def login(self, user, data, req):
-        html = req.load('https://sdilej.cz/index.php',
+        html = self.load('https://sdilej.cz/index.php',
                         post={"Prihlasit": "Prihlasit",
                               "login-password": data['password'],
-                              "login-name": user},
-                        decode=True)
+                              "login-name": user}, req=req)
 
         if '<div class="login' in html:
             self.wrongPassword()
-- 
cgit v1.2.3


From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Jul 2015 01:23:55 +0200
Subject: No camelCase style anymore

---
 module/plugins/accounts/CzshareCom.py | 10 +++++-----
 1 file changed, 5 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 c53c1807b..f86264cf5 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
 class CzshareCom(Account):
     __name__    = "CzshareCom"
     __type__    = "account"
-    __version__ = "0.19"
+    __version__ = "0.20"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
@@ -20,7 +20,7 @@ class CzshareCom(Account):
     CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([\d ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
 
 
-    def loadAccountInfo(self, user, req):
+    def load_account_info(self, user, req):
         premium     = False
         validuntil  = None
         trafficleft = None
@@ -29,11 +29,11 @@ class CzshareCom(Account):
 
         try:
             m = re.search(self.CREDIT_LEFT_PATTERN, html)
-            trafficleft = self.parseTraffic(m.group(1).replace(' ', '').replace(',', '.')) + m.group(2)
+            trafficleft = self.parse_traffic(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)
+            self.log_error(e)
 
         else:
             premium = True
@@ -50,4 +50,4 @@ class CzshareCom(Account):
                               "login-name": user}, req=req)
 
         if '<div class="login' in html:
-            self.wrongPassword()
+            self.wrong_password()
-- 
cgit v1.2.3


From d2e2b127651a5a44b56337eb6d9ca246c97a208a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 17 Jul 2015 03:03:26 +0200
Subject: Spare fixes and code cosmetics

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

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index f86264cf5..6212ffafd 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -45,9 +45,10 @@ class CzshareCom(Account):
 
     def login(self, user, data, req):
         html = self.load('https://sdilej.cz/index.php',
-                        post={"Prihlasit": "Prihlasit",
-                              "login-password": data['password'],
-                              "login-name": user}, req=req)
+                         post={"Prihlasit"     : "Prihlasit",
+                               "login-password": data['password'],
+                               "login-name"    : user},
+                         req=req)
 
         if '<div class="login' in html:
             self.wrong_password()
-- 
cgit v1.2.3


From 1f5a55ae2133a782bdcca334ecbcdbde50dbcf99 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 17 Jul 2015 15:29:48 +0200
Subject: No more need to use the req argument when call load method

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

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 6212ffafd..4b1bb14cb 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -25,7 +25,7 @@ class CzshareCom(Account):
         validuntil  = None
         trafficleft = None
 
-        html = self.load("http://sdilej.cz/prehled_kreditu/", req=req)
+        html = self.load("http://sdilej.cz/prehled_kreditu/")
 
         try:
             m = re.search(self.CREDIT_LEFT_PATTERN, html)
@@ -47,8 +47,7 @@ class CzshareCom(Account):
         html = self.load('https://sdilej.cz/index.php',
                          post={"Prihlasit"     : "Prihlasit",
                                "login-password": data['password'],
-                               "login-name"    : user},
-                         req=req)
+                               "login-name"    : user})
 
         if '<div class="login' in html:
             self.wrong_password()
-- 
cgit v1.2.3


From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 19 Jul 2015 10:59:52 +0200
Subject: Code cosmetics (3)

---
 module/plugins/accounts/CzshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 4b1bb14cb..bce984d67 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -45,7 +45,7 @@ class CzshareCom(Account):
 
     def login(self, user, data, req):
         html = self.load('https://sdilej.cz/index.php',
-                         post={"Prihlasit"     : "Prihlasit",
+                         post={'Prihlasit'     : "Prihlasit",
                                "login-password": data['password'],
                                "login-name"    : user})
 
-- 
cgit v1.2.3


From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 19 Jul 2015 14:43:42 +0200
Subject: New __status__ magic key

---
 module/plugins/accounts/CzshareCom.py | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index bce984d67..267954859 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -10,6 +10,7 @@ class CzshareCom(Account):
     __name__    = "CzshareCom"
     __type__    = "account"
     __version__ = "0.20"
+    __status__  = "stable"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 24 Jul 2015 06:55:49 +0200
Subject: Hotfixes (2)

---
 module/plugins/accounts/CzshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 267954859..4b05155b5 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -10,7 +10,7 @@ class CzshareCom(Account):
     __name__    = "CzshareCom"
     __type__    = "account"
     __version__ = "0.20"
-    __status__  = "stable"
+    __status__  = "testing"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From 8f17f875f6e28f73ddb10da59c6464bd04922222 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 25 Jul 2015 04:59:27 +0200
Subject: Account rewritten

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

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 4b05155b5..4077b5909 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -21,7 +21,7 @@ class CzshareCom(Account):
     CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([\d ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
 
 
-    def load_account_info(self, user, req):
+    def parse_info(self, user, password, data, req):
         premium     = False
         validuntil  = None
         trafficleft = None
@@ -44,11 +44,11 @@ class CzshareCom(Account):
                 'trafficleft': trafficleft}
 
 
-    def login(self, user, data, req):
+    def login(self, user, password, data, req):
         html = self.load('https://sdilej.cz/index.php',
                          post={'Prihlasit'     : "Prihlasit",
-                               "login-password": data['password'],
+                               "login-password": password,
                                "login-name"    : user})
 
         if '<div class="login' in html:
-            self.wrong_password()
+            self.fail()
-- 
cgit v1.2.3


From a95c217627a1cb651b24e69f20640df40797aff9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 25 Jul 2015 09:34:18 +0200
Subject: Account rewritten (2)

---
 module/plugins/accounts/CzshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 4077b5909..e9a34cb83 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -51,4 +51,4 @@ class CzshareCom(Account):
                                "login-name"    : user})
 
         if '<div class="login' in html:
-            self.fail()
+            self.login_fail()
-- 
cgit v1.2.3