Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 13 insertions, 19 deletions

diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py
index 842e0cb87..53ac9ff06 100644
--- a/module/plugins/hoster/EuroshareEu.py
+++ b/module/plugins/hoster/EuroshareEu.py
@@ -8,7 +8,8 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class EuroshareEu(SimpleHoster):
     __name__    = "EuroshareEu"
     __type__    = "hoster"
-    __version__ = "0.28"
+    __version__ = "0.30"
+    __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -23,33 +24,33 @@ class EuroshareEu(SimpleHoster):
 
     LINK_FREE_PATTERN = r'<a href="(/file/\d+/[^/]*/download/)"><div class="downloadButton"'
 
-    ERR_PARDL_PATTERN         = r'<h2>Prebieha s.ahovanie</h2>|<p>Naraz je z jednej IP adresy mo.n. s.ahova. iba jeden s.bor'
-    ERR_NOT_LOGGED_IN_PATTERN = r'href="/customer-zone/login/"'
+    DL_LIMIT_PATTERN = r'<h2>Prebieha s.ahovanie</h2>|<p>Naraz je z jednej IP adresy mo.n. s.ahova. iba jeden s.bor'
+    ERROR_PATTERN    = r'href="/customer-zone/login/"'
 
     URL_REPLACEMENTS = [(r"(http://[^/]*\.)(sk|cz|hu|pl)/", r"\1eu/")]
 
 
-    def handlePremium(self, pyfile):
-        if self.ERR_NOT_LOGGED_IN_PATTERN in self.html:
+    def handle_premium(self, pyfile):
+        if self.ERROR_PATTERN in self.html:
             self.account.relogin(self.user)
             self.retry(reason=_("User not logged in"))
 
         self.link = pyfile.url.rstrip('/') + "/download/"
 
-        check = self.checkDownload({"login": re.compile(self.ERR_NOT_LOGGED_IN_PATTERN),
-                                    "json" : re.compile(r'\{"status":"error".*?"message":"(.*?)"')})
+        check = self.check_download({'login': re.compile(self.ERROR_PATTERN),
+                                    'json' : re.compile(r'\{"status":"error".*?"message":"(.*?)"')})
 
-        if check == "login" or (check == "json" and self.lastCheck.group(1) == "Access token expired"):
+        if check == "login" or (check == "json" and self.last_check.group(1) == "Access token expired"):
             self.account.relogin(self.user)
             self.retry(reason=_("Access token expired"))
 
         elif check == "json":
-            self.fail(self.lastCheck.group(1))
+            self.fail(self.last_check.group(1))
 
 
-    def handleFree(self, pyfile):
-        if re.search(self.ERR_PARDL_PATTERN, self.html):
-            self.longWait(5 * 60, 12)
+    def handle_free(self, pyfile):
+        if re.search(self.DL_LIMIT_PATTERN, self.html):
+            self.wait(5 * 60, 12, _("Download limit reached"))
 
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
@@ -58,11 +59,4 @@ class EuroshareEu(SimpleHoster):
         self.link = "http://euroshare.eu%s" % m.group(1)
 
 
-    def checkFile(self, rules={}):
-        if self.checkDownload({"multi-dl": re.compile(self.ERR_PARDL_PATTERN)})
-            self.longWait(5 * 60, 12)
-
-        return super(EuroshareEu, self).checkFile(rules)
-
-
 getInfo = create_getInfo(EuroshareEu)