Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 43 insertions, 42 deletions

diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py
index 8f72f2148..3d2de5f7f 100644
--- a/module/plugins/hoster/CzshareCom.py
+++ b/module/plugins/hoster/CzshareCom.py
@@ -6,13 +6,14 @@
 import re
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.utils import parseFileSize
+from module.utils import parseFileSize as parse_size
 
 
 class CzshareCom(SimpleHoster):
     __name__    = "CzshareCom"
     __type__    = "hoster"
-    __version__ = "0.99"
+    __version__ = "1.02"
+    __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -39,58 +40,58 @@ class CzshareCom(SimpleHoster):
     USER_CREDIT_PATTERN  = r'<div class="credit">\s*kredit: <strong>([\d .,]+)(\w+)</strong>\s*</div><!-- .credit -->'
 
 
-    def checkTrafficLeft(self):
-        # check if user logged in
+    def check_traffic_left(self):
+        #: Check if user logged in
         m = re.search(self.USER_CREDIT_PATTERN, self.html)
         if m is None:
             self.account.relogin(self.user)
-            self.html = self.load(self.pyfile.url, decode=True)
+            self.html = self.load(self.pyfile.url)
             m = re.search(self.USER_CREDIT_PATTERN, self.html)
             if m is None:
                 return False
 
-        # check user credit
+        #: Check user credit
         try:
-            credit = parseFileSize(m.group(1).replace(' ', ''), m.group(2))
-            self.logInfo(_("Premium download for %i KiB of Credit") % (self.pyfile.size / 1024))
-            self.logInfo(_("User %s has %i KiB left") % (self.user, credit / 1024))
+            credit = parse_size(m.group(1).replace(' ', ''), m.group(2))
+            self.log_info(_("Premium download for %i KiB of Credit") % (self.pyfile.size / 1024))
+            self.log_info(_("User %s has %i KiB left") % (self.user, credit / 1024))
             if credit < self.pyfile.size:
-                self.logInfo(_("Not enough credit to download file: %s") % self.pyfile.name)
+                self.log_info(_("Not enough credit to download file: %s") % self.pyfile.name)
                 return False
         except Exception, e:
-            # let's continue and see what happens...
-            self.logError(e)
+            #: let's continue and see what happens...
+            self.log_error(e)
 
         return True
 
 
-    def handlePremium(self, pyfile):
-    # parse download link
+    def handle_premium(self, pyfile):
+    #: Parse download link
         try:
             form = re.search(self.PREMIUM_FORM_PATTERN, self.html, re.S).group(1)
             inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
         except Exception, e:
-            self.logError(e)
-            self.resetAccount()
+            self.log_error(e)
+            self.restart(nopremium=True)
 
-        # download the file, destination is determined by pyLoad
+        #: Download the file, destination is determined by pyLoad
         self.download("http://sdilej.cz/profi_down.php", post=inputs, disposition=True)
 
 
-    def handleFree(self, pyfile):
-        # get free url
+    def handle_free(self, pyfile):
+        #: Get free url
         m = re.search(self.FREE_URL_PATTERN, self.html)
         if m is None:
             self.error(_("FREE_URL_PATTERN not found"))
 
         parsed_url = "http://sdilej.cz" + m.group(1)
 
-        self.logDebug("PARSED_URL:" + parsed_url)
+        self.log_debug("PARSED_URL:" + parsed_url)
 
-        # get download ticket and parse html
-        self.html = self.load(parsed_url, decode=True)
+        #: Get download ticket and parse html
+        self.html = self.load(parsed_url)
         if re.search(self.MULTIDL_PATTERN, self.html):
-            self.longWait(5 * 60, 12)
+            self.wait(5 * 60, 12, _("Download limit reached"))
 
         try:
             form = re.search(self.FREE_FORM_PATTERN, self.html, re.S).group(1)
@@ -98,32 +99,32 @@ class CzshareCom(SimpleHoster):
             pyfile.size = int(inputs['size'])
 
         except Exception, e:
-            self.logError(e)
+            self.log_error(e)
             self.error(_("Form"))
 
-        # get and decrypt captcha
+        #: Get and decrypt captcha
         captcha_url = 'http://sdilej.cz/captcha.php'
         for _i in xrange(5):
-            inputs['captchastring2'] = self.decryptCaptcha(captcha_url)
-            self.html = self.load(parsed_url, post=inputs, decode=True)
+            inputs['captchastring2'] = self.captcha.decrypt(captcha_url)
+            self.html = self.load(parsed_url, post=inputs)
 
             if u"<li>Zadaný ověřovací kód nesouhlasí!</li>" in self.html:
-                self.invalidCaptcha()
+                self.captcha.invalid()
 
             elif re.search(self.MULTIDL_PATTERN, self.html):
-                self.longWait(5 * 60, 12)
+                self.wait(5 * 60, 12, _("Download limit reached"))
 
             else:
-                self.correctCaptcha()
+                self.captcha.correct()
                 break
         else:
             self.fail(_("No valid captcha code entered"))
 
         m = re.search("countdown_number = (\d+);", self.html)
-        self.setWait(int(m.group(1)) if m else 50)
+        self.set_wait(int(m.group(1)) if m else 50)
 
-        # download the file, destination is determined by pyLoad
-        self.logDebug("WAIT URL", self.req.lastEffectiveURL)
+        #: Download the file, destination is determined by pyLoad
+        self.log_debug("WAIT URL", self.req.lastEffectiveURL)
 
         m = re.search("free_wait.php\?server=(.*?)&(.*)", self.req.lastEffectiveURL)
         if m is None:
@@ -134,29 +135,29 @@ class CzshareCom(SimpleHoster):
         self.wait()
 
 
-    def checkFile(self, rules={}):
-        # check download
-        check = self.checkDownload({
+    def check_file(self):
+        #: Check download
+        check = self.check_download({
             "temp offline" : re.compile(r"^Soubor je do.*asn.* nedostupn.*$"),
-            "credit"       : re.compile(r"^Nem.*te dostate.*n.* kredit.$"),
+            'credit'       : re.compile(r"^Nem.*te dostate.*n.* kredit.$"),
             "multi-dl"     : re.compile(self.MULTIDL_PATTERN),
-            "captcha"      : "<li>Zadaný ověřovací kód nesouhlasí!</li>"
+            'captcha'      : "<li>Zadaný ověřovací kód nesouhlasí!</li>"
         })
 
         if check == "temp offline":
             self.fail(_("File not available - try later"))
 
         elif check == "credit":
-            self.resetAccount()
+            self.restart(nopremium=True)
 
         elif check == "multi-dl":
-            self.longWait(5 * 60, 12)
+            self.wait(5 * 60, 12, _("Download limit reached"))
 
         elif check == "captcha":
-            self.invalidCaptcha()
+            self.captcha.invalid()
             self.retry()
 
-        return super(CzshareCom, self).checkFile(rules)
+        return super(CzshareCom, self).check_file()
 
 
 getInfo = create_getInfo(CzshareCom)