From 59d2ad3541bf133ddd69fd3b7c633e7e226e4829 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 21 Sep 2015 01:08:35 +0200
Subject: Spare improvements and fixes

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

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index 485d69d15..62cf3889b 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FastshareCz(SimpleHoster):
     __name__    = "FastshareCz"
     __type__    = "hoster"
-    __version__ = "0.32"
+    __version__ = "0.33"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
@@ -70,7 +70,7 @@ class FastshareCz(SimpleHoster):
             self.retry(6, 10 * 60, _("Paralell download"))
 
         elif check == "wrong captcha":
-            self.retry(max_tries=5, reason=_("Wrong captcha"))
+            self.retry(max_tries=5, msg=_("Wrong captcha"))
 
         elif check == "credit":
             self.restart(nopremium=True)
-- 
cgit v1.2.3


From 3353ea228835ffa96cc73d5b5e23f6d92ba84203 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 29 Sep 2015 22:43:17 +0200
Subject: Update hoster plugins

---
 module/plugins/hoster/FastshareCz.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index 62cf3889b..985faaa93 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FastshareCz(SimpleHoster):
     __name__    = "FastshareCz"
     __type__    = "hoster"
-    __version__ = "0.33"
+    __version__ = "0.34"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
@@ -59,8 +59,8 @@ class FastshareCz(SimpleHoster):
         self.download(urlparse.urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18})
 
 
-    def check_file(self):
-        check = self.check_download({
+    def check_download(self):
+        check = self.check_file({
             'paralell-dl'  : re.compile(r"<title>FastShare.cz</title>|<script>alert\('Pres FREE muzete stahovat jen jeden soubor najednou.'\)"),
             'wrong captcha': re.compile(r'Download for FREE'),
             'credit'       : re.compile(self.CREDIT_ERROR)
@@ -70,12 +70,12 @@ class FastshareCz(SimpleHoster):
             self.retry(6, 10 * 60, _("Paralell download"))
 
         elif check == "wrong captcha":
-            self.retry(max_tries=5, msg=_("Wrong captcha"))
+            self.retry(attemps=5, msg=_("Wrong captcha"))
 
         elif check == "credit":
             self.restart(nopremium=True)
 
-        return super(FastshareCz, self).check_file()
+        return super(FastshareCz, self).check_download()
 
 
 getInfo = create_getInfo(FastshareCz)
-- 
cgit v1.2.3


From 25d5726d4953b93a2e286fd6af8d4ead20670ba6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 1 Oct 2015 04:55:17 +0200
Subject: A lot of plugin code cosmetics

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

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index 985faaa93..2919ebce2 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -49,7 +49,7 @@ class FastshareCz(SimpleHoster):
 
     def handle_free(self, pyfile):
         m = re.search(self.FREE_URL_PATTERN, self.html)
-        if m:
+        if m is not None:
             action, captcha_src = m.groups()
         else:
             self.error(_("FREE_URL_PATTERN not found"))
@@ -70,7 +70,7 @@ class FastshareCz(SimpleHoster):
             self.retry(6, 10 * 60, _("Paralell download"))
 
         elif check == "wrong captcha":
-            self.retry(attemps=5, msg=_("Wrong captcha"))
+            self.retry_captcha()
 
         elif check == "credit":
             self.restart(nopremium=True)
-- 
cgit v1.2.3


From 8d85a655d8cc408574f471306613bc05115c8c64 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 1 Oct 2015 18:59:55 +0200
Subject: Improve Hoster and Crypter + general fixup

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

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index 2919ebce2..b05edfb27 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FastshareCz(SimpleHoster):
     __name__    = "FastshareCz"
     __type__    = "hoster"
-    __version__ = "0.34"
+    __version__ = "0.35"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
@@ -42,7 +42,7 @@ class FastshareCz(SimpleHoster):
         if self.CREDIT_ERROR in self.html:
             errmsg = self.info['error'] = _("Not enough traffic left")
             self.log_warning(errmsg)
-            self.restart(nopremium=True)
+            self.restart()
 
         self.info.pop('error', None)
 
@@ -73,7 +73,7 @@ class FastshareCz(SimpleHoster):
             self.retry_captcha()
 
         elif check == "credit":
-            self.restart(nopremium=True)
+            self.restart()
 
         return super(FastshareCz, self).check_download()
 
-- 
cgit v1.2.3