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/hoster/BezvadataCz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index b47c2902d..d3f25d52f 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -81,7 +81,7 @@ class BezvadataCz(SimpleHoster):
 
     def checkErrors(self):
         if 'images/button-download-disable.png' in self.html:
-            self.longWait(5 * 60, 24)  #: parallel dl limit
+            self.wait(5 * 60, 24, _("Download limit reached"))  #: parallel dl limit
         elif '<div class="infobox' in self.html:
             self.tempOffline()
         else:
-- 
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/hoster/BezvadataCz.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index d3f25d52f..f0514b817 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class BezvadataCz(SimpleHoster):
     __name__    = "BezvadataCz"
     __type__    = "hoster"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -24,22 +24,22 @@ class BezvadataCz(SimpleHoster):
 
 
     def setup(self):
-        self.resumeDownload = True
-        self.multiDL        = True
+        self.resume_download = True
+        self.multi_dl        = True
 
 
-    def handleFree(self, pyfile):
-        #download button
+    def handle_free(self, pyfile):
+        # download button
         m = re.search(r'<a class="stahnoutSoubor".*?href="(.*?)"', self.html)
         if m is None:
             self.error(_("Page 1 URL not found"))
         url = "http://bezvadata.cz%s" % m.group(1)
 
-        #captcha form
+        # captcha form
         self.html = self.load(url)
-        self.checkErrors()
+        self.check_errors()
         for _i in xrange(5):
-            action, inputs = self.parseHtmlForm('frm-stahnoutFreeForm')
+            action, inputs = self.parse_html_form('frm-stahnoutFreeForm')
             if not inputs:
                 self.error(_("FreeForm"))
 
@@ -47,31 +47,31 @@ class BezvadataCz(SimpleHoster):
             if m is None:
                 self.error(_("Wrong captcha image"))
 
-            #captcha image is contained in html page as base64encoded data but decryptCaptcha() expects image url
+            # captcha image is contained in html page as base64encoded data but decryptCaptcha() expects image url
             self.load, proper_load = self.loadcaptcha, self.load
             try:
-                inputs['captcha'] = self.decryptCaptcha(m.group(1), imgtype='png')
+                inputs['captcha'] = self.decrypt_captcha(m.group(1), imgtype='png')
             finally:
                 self.load = proper_load
 
             if '<img src="data:image/png;base64' in self.html:
-                self.invalidCaptcha()
+                self.invalid_captcha()
             else:
-                self.correctCaptcha()
+                self.correct_captcha()
                 break
         else:
             self.fail(_("No valid captcha code entered"))
 
-        #download url
+        # download url
         self.html = self.load("http://bezvadata.cz%s" % action, post=inputs)
-        self.checkErrors()
+        self.check_errors()
         m = re.search(r'<a class="stahnoutSoubor2" href="(.*?)">', self.html)
         if m is None:
             self.error(_("Page 2 URL not found"))
         url = "http://bezvadata.cz%s" % m.group(1)
-        self.logDebug("DL URL %s" % url)
+        self.log_debug("DL URL %s" % url)
 
-        #countdown
+        # countdown
         m = re.search(r'id="countdown">(\d\d):(\d\d)<', self.html)
         wait_time = (int(m.group(1)) * 60 + int(m.group(2))) if m else 120
         self.wait(wait_time, False)
@@ -79,11 +79,11 @@ class BezvadataCz(SimpleHoster):
         self.link = url
 
 
-    def checkErrors(self):
+    def check_errors(self):
         if 'images/button-download-disable.png' in self.html:
             self.wait(5 * 60, 24, _("Download limit reached"))  #: parallel dl limit
         elif '<div class="infobox' in self.html:
-            self.tempOffline()
+            self.temp_offline()
         else:
             return super(BezvadataCz, self).checkErrors()
 
-- 
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/hoster/BezvadataCz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index f0514b817..91d7e68b8 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -85,7 +85,7 @@ class BezvadataCz(SimpleHoster):
         elif '<div class="infobox' in self.html:
             self.temp_offline()
         else:
-            return super(BezvadataCz, self).checkErrors()
+            return super(BezvadataCz, self).check_errors()
 
 
     def loadcaptcha(self, data, *args, **kwargs):
-- 
cgit v1.2.3


From dad722ac7255640e7e0541c4094a4d2e4de79cd3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 19 Jul 2015 00:05:58 +0200
Subject: Code cosmetics (2)

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

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index 91d7e68b8..af3fb97f3 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -29,13 +29,13 @@ class BezvadataCz(SimpleHoster):
 
 
     def handle_free(self, pyfile):
-        # download button
+        #: Download button
         m = re.search(r'<a class="stahnoutSoubor".*?href="(.*?)"', self.html)
         if m is None:
             self.error(_("Page 1 URL not found"))
         url = "http://bezvadata.cz%s" % m.group(1)
 
-        # captcha form
+        #: Captcha form
         self.html = self.load(url)
         self.check_errors()
         for _i in xrange(5):
@@ -47,7 +47,7 @@ class BezvadataCz(SimpleHoster):
             if m is None:
                 self.error(_("Wrong captcha image"))
 
-            # captcha image is contained in html page as base64encoded data but decryptCaptcha() expects image url
+            #: Captcha image is contained in html page as base64encoded data but decryptCaptcha() expects image url
             self.load, proper_load = self.loadcaptcha, self.load
             try:
                 inputs['captcha'] = self.decrypt_captcha(m.group(1), imgtype='png')
@@ -62,7 +62,7 @@ class BezvadataCz(SimpleHoster):
         else:
             self.fail(_("No valid captcha code entered"))
 
-        # download url
+        #: Download url
         self.html = self.load("http://bezvadata.cz%s" % action, post=inputs)
         self.check_errors()
         m = re.search(r'<a class="stahnoutSoubor2" href="(.*?)">', self.html)
@@ -71,7 +71,7 @@ class BezvadataCz(SimpleHoster):
         url = "http://bezvadata.cz%s" % m.group(1)
         self.log_debug("DL URL %s" % url)
 
-        # countdown
+        #: countdown
         m = re.search(r'id="countdown">(\d\d):(\d\d)<', self.html)
         wait_time = (int(m.group(1)) * 60 + int(m.group(2))) if m else 120
         self.wait(wait_time, False)
@@ -81,7 +81,7 @@ class BezvadataCz(SimpleHoster):
 
     def check_errors(self):
         if 'images/button-download-disable.png' in self.html:
-            self.wait(5 * 60, 24, _("Download limit reached"))  #: parallel dl limit
+            self.wait(5 * 60, 24, _("Download limit reached"))  #: Parallel dl limit
         elif '<div class="infobox' in self.html:
             self.temp_offline()
         else:
-- 
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/hoster/BezvadataCz.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index af3fb97f3..be705d528 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -9,6 +9,7 @@ class BezvadataCz(SimpleHoster):
     __name__    = "BezvadataCz"
     __type__    = "hoster"
     __version__ = "0.28"
+    __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
-- 
cgit v1.2.3


From 027cb529d79558de19c47da88a782b31745a65c9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 21 Jul 2015 22:53:37 +0200
Subject: New Captcha skeleton

---
 module/plugins/hoster/BezvadataCz.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index be705d528..523e87541 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class BezvadataCz(SimpleHoster):
     __name__    = "BezvadataCz"
     __type__    = "hoster"
-    __version__ = "0.28"
+    __version__ = "0.29"
     __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+'
@@ -48,17 +48,12 @@ class BezvadataCz(SimpleHoster):
             if m is None:
                 self.error(_("Wrong captcha image"))
 
-            #: Captcha image is contained in html page as base64encoded data but decryptCaptcha() expects image url
-            self.load, proper_load = self.loadcaptcha, self.load
-            try:
-                inputs['captcha'] = self.decrypt_captcha(m.group(1), imgtype='png')
-            finally:
-                self.load = proper_load
+            inputs['captcha'] = self.captcha.decrypt(m.group(1).decode('base64'), input_type='png')
 
             if '<img src="data:image/png;base64' in self.html:
-                self.invalid_captcha()
+                self.captcha.invalid()
             else:
-                self.correct_captcha()
+                self.captcha.correct()
                 break
         else:
             self.fail(_("No valid captcha code entered"))
@@ -89,8 +84,4 @@ class BezvadataCz(SimpleHoster):
             return super(BezvadataCz, self).check_errors()
 
 
-    def loadcaptcha(self, data, *args, **kwargs):
-        return data.decode('base64')
-
-
 getInfo = create_getInfo(BezvadataCz)
-- 
cgit v1.2.3


From 6af9b38a8d5d49355b85aef6ddd003605d6bba05 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 23 Jul 2015 23:44:45 +0200
Subject: Improve Captcha

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

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index 523e87541..f332bc04b 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -48,7 +48,7 @@ class BezvadataCz(SimpleHoster):
             if m is None:
                 self.error(_("Wrong captcha image"))
 
-            inputs['captcha'] = self.captcha.decrypt(m.group(1).decode('base64'), input_type='png')
+            inputs['captcha'] = self.captcha._decrypt(m.group(1).decode('base64'), input_type='png')
 
             if '<img src="data:image/png;base64' in self.html:
                 self.captcha.invalid()
-- 
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/hoster/BezvadataCz.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/BezvadataCz.py')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index f332bc04b..d2af8272a 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -9,7 +9,7 @@ class BezvadataCz(SimpleHoster):
     __name__    = "BezvadataCz"
     __type__    = "hoster"
     __version__ = "0.29"
-    __status__  = "stable"
+    __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -26,7 +26,7 @@ class BezvadataCz(SimpleHoster):
 
     def setup(self):
         self.resume_download = True
-        self.multi_dl        = True
+        self.multiDL        = True
 
 
     def handle_free(self, pyfile):
-- 
cgit v1.2.3