Use parseError instead PluginParseError + unified all download pattern attributes as LINK_PATTERN + removed some old patterns (not used anymore) + other code cosmetics

1 files changed, 6 insertions, 4 deletions

diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py
index 5fab87157..ba43d8054 100644
--- a/module/plugins/hoster/CzshareCom.py
+++ b/module/plugins/hoster/CzshareCom.py
@@ -21,7 +21,7 @@
 # http://czshare.com/5278880/random.bin
 
 import re
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.utils import parseFileSize
 
 
@@ -40,6 +40,7 @@ class CzshareCom(SimpleHoster):
 
     FILE_SIZE_REPLACEMENTS = [(' ', '')]
     FILE_URL_REPLACEMENTS = [(r'http://[^/]*/download.php\?.*?id=(\w+).*', r'http://sdilej.cz/\1/x/')]
+
     SH_CHECK_TRAFFIC = True
 
     FREE_URL_PATTERN = r'<a href="([^"]+)" class="page-download">[^>]*alt="([^"]+)" /></a>'
@@ -49,6 +50,7 @@ class CzshareCom(SimpleHoster):
     MULTIDL_PATTERN = r"<p><font color='red'>Z[^<]*PROFI.</font></p>"
     USER_CREDIT_PATTERN = r'<div class="credit">\s*kredit: <strong>([0-9., ]+)([kKMG]i?B)</strong>\s*</div><!-- .credit -->'
 
+
     def checkTrafficLeft(self):
         # check if user logged in
         found = re.search(self.USER_CREDIT_PATTERN, self.html)
@@ -90,7 +92,7 @@ class CzshareCom(SimpleHoster):
         # get free url
         found = re.search(self.FREE_URL_PATTERN, self.html)
         if found is None:
-            raise PluginParseError('Free URL')
+            self.parseError('Free URL')
         parsed_url = "http://sdilej.cz" + found.group(1)
         self.logDebug("PARSED_URL:" + parsed_url)
 
@@ -105,7 +107,7 @@ class CzshareCom(SimpleHoster):
             self.pyfile.size = int(inputs['size'])
         except Exception, e:
             self.logError(e)
-            raise PluginParseError('Form')
+            self.parseError('Form')
 
         # get and decrypt captcha        
         captcha_url = 'http://sdilej.cz/captcha.php'
@@ -129,7 +131,7 @@ class CzshareCom(SimpleHoster):
         self.logDebug("WAIT URL", self.req.lastEffectiveURL)
         found = re.search("free_wait.php\?server=(.*?)&(.*)", self.req.lastEffectiveURL)
         if not found:
-            raise PluginParseError('Download URL')
+            self.parseError('Download URL')
 
         url = "http://%s/download.php?%s" % (found.group(1), found.group(2))