From 285c4bd667d303efb0818f71b2e26bc9038eeee5 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 8 Jun 2015 10:09:56 +0200
Subject: Update plugins

---
 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 330a6e3b9..e56a05d37 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.29"
+    __version__ = "0.30"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -58,7 +58,7 @@ class FastshareCz(SimpleHoster):
         self.download(urlparse.urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18})
 
 
-    def checkFile(self, rules={}):
+    def checkFile(self):
         check = self.checkDownload({
             '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'),
@@ -74,7 +74,7 @@ class FastshareCz(SimpleHoster):
         elif check == "credit":
             self.resetAccount()
 
-        return super(FastshareCz, self).checkFile(rules)
+        return super(FastshareCz, self).checkFile()
 
 
 getInfo = create_getInfo(FastshareCz)
-- 
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/FastshareCz.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index e56a05d37..1ed3213ff 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.30"
+    __version__ = "0.31"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -33,20 +33,20 @@ class FastshareCz(SimpleHoster):
     CREDIT_ERROR = " credit for "
 
 
-    def checkErrors(self):
+    def check_errors(self):
         if self.SLOT_ERROR in self.html:
             errmsg = self.info['error'] = _("No free slots")
             self.retry(12, 60, errmsg)
 
         if self.CREDIT_ERROR in self.html:
             errmsg = self.info['error'] = _("Not enough traffic left")
-            self.logWarning(errmsg)
-            self.resetAccount()
+            self.log_warning(errmsg)
+            self.reset_account()
 
         self.info.pop('error', None)
 
 
-    def handleFree(self, pyfile):
+    def handle_free(self, pyfile):
         m = re.search(self.FREE_URL_PATTERN, self.html)
         if m:
             action, captcha_src = m.groups()
@@ -54,12 +54,12 @@ class FastshareCz(SimpleHoster):
             self.error(_("FREE_URL_PATTERN not found"))
 
         baseurl = "http://www.fastshare.cz"
-        captcha = self.decryptCaptcha(urlparse.urljoin(baseurl, captcha_src))
+        captcha = self.decrypt_captcha(urlparse.urljoin(baseurl, captcha_src))
         self.download(urlparse.urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18})
 
 
-    def checkFile(self):
-        check = self.checkDownload({
+    def check_file(self):
+        check = self.check_download({
             '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)
@@ -72,7 +72,7 @@ class FastshareCz(SimpleHoster):
             self.retry(max_tries=5, reason=_("Wrong captcha"))
 
         elif check == "credit":
-            self.resetAccount()
+            self.reset_account()
 
         return super(FastshareCz, self).checkFile()
 
-- 
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/FastshareCz.py | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index 1ed3213ff..b18a937bc 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -10,6 +10,7 @@ class FastshareCz(SimpleHoster):
     __name__    = "FastshareCz"
     __type__    = "hoster"
     __version__ = "0.31"
+    __status__  = "stable"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
     __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/FastshareCz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index b18a937bc..abe2ef2d6 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -55,7 +55,7 @@ class FastshareCz(SimpleHoster):
             self.error(_("FREE_URL_PATTERN not found"))
 
         baseurl = "http://www.fastshare.cz"
-        captcha = self.decrypt_captcha(urlparse.urljoin(baseurl, captcha_src))
+        captcha = self.captcha.decrypt_image(urlparse.urljoin(baseurl, captcha_src))
         self.download(urlparse.urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18})
 
 
-- 
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/FastshareCz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index abe2ef2d6..13490441b 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -55,7 +55,7 @@ class FastshareCz(SimpleHoster):
             self.error(_("FREE_URL_PATTERN not found"))
 
         baseurl = "http://www.fastshare.cz"
-        captcha = self.captcha.decrypt_image(urlparse.urljoin(baseurl, captcha_src))
+        captcha = self.captcha.decrypt(urlparse.urljoin(baseurl, captcha_src))
         self.download(urlparse.urljoin(baseurl, action), post={'code': captcha, 'btn.x': 77, 'btn.y': 18})
 
 
-- 
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/FastshareCz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py
index 13490441b..667bbff1c 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -10,7 +10,7 @@ class FastshareCz(SimpleHoster):
     __name__    = "FastshareCz"
     __type__    = "hoster"
     __version__ = "0.31"
-    __status__  = "stable"
+    __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
-- 
cgit v1.2.3


From 5ceb174cb7eb6a3cf706a1ed861ddd778069d7b6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 27 Jul 2015 10:29:06 +0200
Subject: Then update others

---
 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 667bbff1c..472f7c906 100644
--- a/module/plugins/hoster/FastshareCz.py
+++ b/module/plugins/hoster/FastshareCz.py
@@ -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.reset_account()
+            self.restart(reset=True)
 
         self.info.pop('error', None)
 
@@ -73,9 +73,9 @@ class FastshareCz(SimpleHoster):
             self.retry(max_tries=5, reason=_("Wrong captcha"))
 
         elif check == "credit":
-            self.reset_account()
+            self.restart(reset=True)
 
-        return super(FastshareCz, self).checkFile()
+        return super(FastshareCz, self).check_file()
 
 
 getInfo = create_getInfo(FastshareCz)
-- 
cgit v1.2.3


From 21cf50c60a794b5ca7d54408b590f74d4567ca79 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 2 Aug 2015 07:15:28 +0200
Subject: Update some plugins

---
 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 472f7c906..485d69d15 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.31"
+    __version__ = "0.32"
     __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(reset=True)
+            self.restart(nopremium=True)
 
         self.info.pop('error', None)
 
@@ -73,7 +73,7 @@ class FastshareCz(SimpleHoster):
             self.retry(max_tries=5, reason=_("Wrong captcha"))
 
         elif check == "credit":
-            self.restart(reset=True)
+            self.restart(nopremium=True)
 
         return super(FastshareCz, self).check_file()
 
-- 
cgit v1.2.3