Then update others

13 files changed, 21 insertions, 21 deletions

diff --git a/module/plugins/captcha/ReCaptcha.py b/module/plugins/captcha/ReCaptcha.py
index 6ec5e89c8..a5aa356e2 100644
--- a/module/plugins/captcha/ReCaptcha.py
+++ b/module/plugins/captcha/ReCaptcha.py
@@ -81,7 +81,7 @@ class ReCaptcha(CaptchaService):
             self.fail(_("ReCaptcha second challenge pattern not found"))
 
         self.log_debug("Second challenge: %s" % challenge)
-        result = self.decrypt("%simage" % server,
+        result = self.decrypt(urlparse.urljoin(server, "image"),
                               get={'c': challenge},
                               cookies=True,
                               input_type="jpg",
diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
index eb583b105..2e9ae4e48 100644
--- a/module/plugins/hoster/BasePlugin.py
+++ b/module/plugins/hoster/BasePlugin.py
@@ -52,7 +52,7 @@ class BasePlugin(Hoster):
 
         for _i in xrange(5):
             try:
-                link = self.direct_link(self, urllib.unquote(pyfile.url))
+                link = self.direct_link(urllib.unquote(pyfile.url))
 
                 if link:
                     self.download(link, ref=False, disposition=True)
diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py
index 590d3b5c4..9432dcb3b 100644
--- a/module/plugins/hoster/CzshareCom.py
+++ b/module/plugins/hoster/CzshareCom.py
@@ -72,7 +72,7 @@ class CzshareCom(SimpleHoster):
             inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
         except Exception, e:
             self.log_error(e)
-            self.reset_account()
+            self.restart(reset=True)
 
         #: Download the file, destination is determined by pyLoad
         self.download("http://sdilej.cz/profi_down.php", post=inputs, disposition=True)
@@ -148,7 +148,7 @@ class CzshareCom(SimpleHoster):
             self.fail(_("File not available - try later"))
 
         elif check == "credit":
-            self.reset_account()
+            self.restart(reset=True)
 
         elif check == "multi-dl":
             self.wait(5 * 60, 12, _("Download limit reached"))
@@ -157,7 +157,7 @@ class CzshareCom(SimpleHoster):
             self.captcha.invalid()
             self.retry()
 
-        return super(CzshareCom, self).checkFile()
+        return super(CzshareCom, self).check_file()
 
 
 getInfo = create_getInfo(CzshareCom)
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)
diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py
index 8c8e01ed5..325b4bb27 100644
--- a/module/plugins/hoster/FilefactoryCom.py
+++ b/module/plugins/hoster/FilefactoryCom.py
@@ -71,7 +71,7 @@ class FilefactoryCom(SimpleHoster):
         elif check == "error":
             self.error(_("Unknown error"))
 
-        return super(FilefactoryCom, self).checkFile()
+        return super(FilefactoryCom, self).check_file()
 
 
     def handle_premium(self, pyfile):
diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py
index 7609dc9cd..1a2a7d344 100644
--- a/module/plugins/hoster/FilejungleCom.py
+++ b/module/plugins/hoster/FilejungleCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hoster.FileserveCom import FileserveCom, checkFile
+from module.plugins.hoster.FileserveCom import FileserveCom, check_file
 from module.plugins.internal.Plugin import chunks
 
 
@@ -27,4 +27,4 @@ class FilejungleCom(FileserveCom):
 
 def get_info(urls):
     for chunk in chunks(urls, 100):
-        yield checkFile(FilejungleCom, chunk)
+        yield check_file(FilejungleCom, chunk)
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
index ba6e253b0..21b5897ab 100644
--- a/module/plugins/hoster/FileserveCom.py
+++ b/module/plugins/hoster/FileserveCom.py
@@ -69,7 +69,7 @@ class FileserveCom(Hoster):
 
 
     def process(self, pyfile):
-        pyfile.name, pyfile.size, status, self.url = checkFile(self, [self.url])[0]
+        pyfile.name, pyfile.size, status, self.url = check_file(self, [self.url])[0]
         if status != 2:
             self.offline()
         self.log_debug("File Name: %s Size: %d" % (pyfile.name, pyfile.size))
@@ -196,7 +196,7 @@ class FileserveCom(Hoster):
                 elif res['error_code'] in ["305", "500"]:
                     self.temp_offline()
                 elif res['error_code'] in ["403", "605"]:
-                    self.reset_account()
+                    self.restart(reset=True)
                 elif res['error_code'] in ["606", "607", "608"]:
                     self.offline()
                 else:
@@ -211,4 +211,4 @@ class FileserveCom(Hoster):
 
 def get_info(urls):
     for chunk in chunks(urls, 100):
-        yield checkFile(FileserveCom, chunk)
+        yield check_file(FileserveCom, chunk)
diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py
index a63960b6c..6b69fa9c2 100644
--- a/module/plugins/hoster/MultishareCz.py
+++ b/module/plugins/hoster/MultishareCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class MultishareCz(SimpleHoster):
     __name__    = "MultishareCz"
     __type__    = "hoster"
-    __version__ = "0.41"
+    __version__ = "0.42"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)'
@@ -23,7 +23,7 @@ class MultishareCz(SimpleHoster):
     SIZE_REPLACEMENTS = [('&nbsp;', '')]
 
     CHECK_TRAFFIC = True
-    MULTI_HOSTER  = True
+    LEECH_HOSTER  = True
 
     INFO_PATTERN    = ur'(?:<li>Název|Soubor): <strong>(?P<N>[^<]+)</strong><(?:/li><li|br)>Velikost: <strong>(?P<S>[^<]+)</strong>'
     OFFLINE_PATTERN = ur'<h1>Stáhnout soubor</h1><p><strong>Požadovaný soubor neexistuje.</strong></p>'
diff --git a/module/plugins/hoster/PremiumTo.py b/module/plugins/hoster/PremiumTo.py
index bade22519..ec02bb12d 100644
--- a/module/plugins/hoster/PremiumTo.py
+++ b/module/plugins/hoster/PremiumTo.py
@@ -52,7 +52,7 @@ class PremiumTo(MultiHoster):
         if err:
             self.fail(err)
 
-        return super(PremiumTo, self).checkFile()
+        return super(PremiumTo, self).check_file()
 
 
 getInfo = create_getInfo(PremiumTo)
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 5b634806f..01c245443 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -118,7 +118,7 @@ class ShareonlineBiz(SimpleHoster):
             self.captcha.invalid()
             self.retry(5, 5 * 60, _("Download failed"))
 
-        return super(ShareonlineBiz, self).checkFile()
+        return super(ShareonlineBiz, self).check_file()
 
 
     def handle_premium(self, pyfile):  #: Should be working better loading (account) api internally
diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py
index ce0865cbe..829609228 100644
--- a/module/plugins/hoster/SimplydebridCom.py
+++ b/module/plugins/hoster/SimplydebridCom.py
@@ -45,7 +45,7 @@ class SimplydebridCom(MultiHoster):
         if self.check_download({'error': "No address associated with hostname"}):
             self.retry(24, 3 * 60, _("Bad file downloaded"))
 
-        return super(SimplydebridCom, self).checkFile()
+        return super(SimplydebridCom, self).check_file()
 
 
 getInfo = create_getInfo(SimplydebridCom)
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index d2ac4ea28..73261324b 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -148,7 +148,7 @@ class UlozTo(SimpleHoster):
         elif check == "not_found":
             self.fail(_("Server error, file not downloadable"))
 
-        return super(UlozTo, self).checkFile()
+        return super(UlozTo, self).check_file()
 
 
 getInfo = create_getInfo(UlozTo)
diff --git a/module/plugins/hoster/UploadableCh.py b/module/plugins/hoster/UploadableCh.py
index 2f3abcfcd..88d79e9ba 100644
--- a/module/plugins/hoster/UploadableCh.py
+++ b/module/plugins/hoster/UploadableCh.py
@@ -71,7 +71,7 @@ class UploadableCh(SimpleHoster):
             self.wait(60 * 60, True)
             self.retry()
 
-        return super(UploadableCh, self).checkFile()
+        return super(UploadableCh, self).check_file()
 
 
 getInfo = create_getInfo(UploadableCh)