From 04038a2cf0c4c2d9cc9a0c8e8bf9beb6426afae8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 10 Jul 2014 03:02:26 +0200
Subject: Use parseError instead PluginParseError + unified all download
 pattern attributes as LINK_PATTERN + removed some old patterns (not used
 anymore) + other code cosmetics

---
 module/plugins/hoster/DataportCz.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py
index a5ff05f39..582312b29 100644
--- a/module/plugins/hoster/DataportCz.py
+++ b/module/plugins/hoster/DataportCz.py
@@ -17,7 +17,7 @@
     @author: zoidberg
 """
 
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class DataportCz(SimpleHoster):
@@ -32,11 +32,13 @@ class DataportCz(SimpleHoster):
     FILE_NAME_PATTERN = r'<span itemprop="name">(?P<N>[^<]+)</span>'
     FILE_SIZE_PATTERN = r'<td class="fil">Velikost</td>\s*<td>(?P<S>[^<]+)</td>'
     OFFLINE_PATTERN = r'<h2>Soubor nebyl nalezen</h2>'
+
     FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.dataport.cz/file/\1')]
 
     CAPTCHA_URL_PATTERN = r'<section id="captcha_bg">\s*<img src="(.*?)"'
     FREE_SLOTS_PATTERN = ur'Počet volných slotů: <span class="darkblue">(\d+)</span><br />'
 
+
     def handleFree(self):
         captchas = {"1": "jkeG", "2": "hMJQ", "3": "vmEK", "4": "ePQM", "5": "blBd"}
 
@@ -44,19 +46,19 @@ class DataportCz(SimpleHoster):
             action, inputs = self.parseHtmlForm('free_download_form')
             self.logDebug(action, inputs)
             if not action or not inputs:
-                raise PluginParseError('free_download_form')
+                self.parseError('free_download_form')
 
             if "captchaId" in inputs and inputs["captchaId"] in captchas:
                 inputs['captchaCode'] = captchas[inputs["captchaId"]]
             else:
-                raise PluginParseError('captcha')
+                self.parseError('captcha')
 
             self.html = self.download("http://www.dataport.cz%s" % action, post=inputs)
 
             check = self.checkDownload({"captcha": 'alert("\u0160patn\u011b opsan\u00fd k\u00f3d z obr\u00e1zu");',
                                         "slot": 'alert("Je n\u00e1m l\u00edto, ale moment\u00e1ln\u011b nejsou'})
             if check == "captcha":
-                raise PluginParseError('invalid captcha')
+                self.parseError('invalid captcha')
             elif check == "slot":
                 self.logDebug("No free slots - wait 60s and retry")
                 self.wait(60, False)
-- 
cgit v1.2.3