1 files changed, 41 insertions, 37 deletions

diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py
index 1e1cc0b4b..5224dfd9f 100644
--- a/module/plugins/hoster/EuroshareEu.py
+++ b/module/plugins/hoster/EuroshareEu.py
@@ -17,54 +17,58 @@
 """
 
 import re
-from module.plugins.Hoster import Hoster
-from module.network.RequestFactory import getURL
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
-def getInfo(urls):
-    result = []
-
-    for url in urls:
-
-        html = getURL(url, decode=True)
-        if re.search(EuroshareEu.FILE_OFFLINE_PATTERN, html):
-            # File offline
-            result.append((url, 0, 1, url))
-        else:
-            result.append((url, 0, 2, url))
-    yield result
-
-class EuroshareEu(Hoster):
+class EuroshareEu(SimpleHoster):
     __name__ = "EuroshareEu"
     __type__ = "hoster"
-    __pattern__ = r"http://(\w*\.)?euroshare.eu/file/.*"
-    __version__ = "0.30"
+    __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*"
+    __version__ = "0.25"
     __description__ = """Euroshare.eu"""
     __author_name__ = ("zoidberg")
 
-    URL_PATTERN = r'<a class="free" href="([^"]+)"></a>'
-    FILE_OFFLINE_PATTERN = r'<h2>S.bor sa nena.iel</h2>'
-    ERR_PARDL_PATTERN = r'<h2>Prebieha s.ahovanie</h2>'
-
-    def setup(self):
-        self.multiDL = False
+    FILE_INFO_PATTERN = r'<span style="float: left;"><strong>(?P<N>.+?)</strong> \((?P<S>.+?)\)</span>'
+    FILE_OFFLINE_PATTERN = ur'<h2>S.bor sa nena.iel</h2>|Požadovaná stránka neexistuje!'
 
-    def process(self, pyfile):
-        self.html = self.load(pyfile.url, decode=True)
+    FREE_URL_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/"'
 
-        if re.search(self.FILE_OFFLINE_PATTERN, self.html) is not None:
-            self.offline()
+    FILE_URL_REPLACEMENTS = [(r"(http://[^/]*\.)(sk|cz|hu|pl)/", r"\1eu/")]
 
+    def setup(self):
+        self.multiDL = self.resumeDownload = self.premium
+        self.req.setOption("timeout", 120)
+
+    def handlePremium(self):
+        if self.ERR_NOT_LOGGED_IN_PATTERN in self.html:
+            self.account.relogin(self.user)
+            self.retry(reason="User not logged in")
+
+        self.download(self.pyfile.url.rstrip('/') + "/download/")
+
+        check = self.checkDownload({"login": re.compile(self.ERR_NOT_LOGGED_IN_PATTERN),
+                                    "json": re.compile(r'\{"status":"error".*?"message":"(.*?)"')
+                                   })
+        if check == "login" or (check == "json" and self.lastCheck.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))
+
+    def handleFree(self):
         if re.search(self.ERR_PARDL_PATTERN, self.html) is not None:
-            self.waitForFreeSlot()
+            self.longWait(300, 12)
 
-        found = re.search(self.URL_PATTERN, self.html)
+        found = re.search(self.FREE_URL_PATTERN, self.html)
         if found is None:
-            self.fail("Parse error (URL)")
-        parsed_url = found.group(1)
-
+            self.parseError("Parse error (URL)")
+        parsed_url = "http://euroshare.eu%s" % found.group(1)
+        self.logDebug("URL", parsed_url)
         self.download(parsed_url, disposition=True)
 
-    def waitForFreeSlot(self):
-        self.setWait(300, True)
-        self.wait()
-        self.retry()
\ No newline at end of file
+        check = self.checkDownload({"multi_dl": re.compile(self.ERR_PARDL_PATTERN)})
+        if check == "multi_dl":
+            self.longWait(300, 12)
+
+getInfo = create_getInfo(EuroshareEu)
\ No newline at end of file