From a3ecb6eaa2b449c15ce6367e21b3744401e5ab18 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Mon, 1 Oct 2012 23:52:18 +0200 Subject: rapidgator.net premium, novafile.com free, multihoster schedule refresh --- module/plugins/hoster/EuroshareEu.py | 48 +++++++++++------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) (limited to 'module/plugins/hoster/EuroshareEu.py') diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index a0bfe0ab2..2c356f02a 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -17,51 +17,31 @@ """ import re -from module.plugins.Hoster import Hoster -from module.network.RequestFactory import getURL +from module.plugins.internal.SimpleHoster import SimpleHoster -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.2b" + __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*" + __version__ = "0.21" __description__ = """Euroshare.eu""" __author_name__ = ("zoidberg") - URL_PATTERN = r'' - FILE_OFFLINE_PATTERN = r'

S.bor sa nena.iel

' - ERR_PARDL_PATTERN = r'

Prebieha s.ahovanie

' - - def setup(self): - self.multiDL = False - - def process(self, pyfile): - self.html = self.load(pyfile.url, decode=True) - - if re.search(self.FILE_OFFLINE_PATTERN, self.html) is not None: - self.offline() + FILE_INFO_PATTERN = r'(?P.+?) \((?P.+?)\)' + FILE_OFFLINE_PATTERN = ur'

S.bor sa nena.iel

|Požadovaná stránka neexistuje!' + + FREE_URL_PATTERN = r'
Prebieha s.ahovanie' + def handleFree(self): if re.search(self.ERR_PARDL_PATTERN, self.html) is not None: self.waitForFreeSlot() - 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): -- cgit v1.2.3 From b01b2b3d9559b8352ee65ee2eff30843e6071987 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Tue, 9 Oct 2012 01:10:18 +0200 Subject: euroshare.eu premium --- module/plugins/hoster/EuroshareEu.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'module/plugins/hoster/EuroshareEu.py') diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 2c356f02a..79df56ac4 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -23,7 +23,7 @@ class EuroshareEu(SimpleHoster): __name__ = "EuroshareEu" __type__ = "hoster" __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*" - __version__ = "0.21" + __version__ = "0.22" __description__ = """Euroshare.eu""" __author_name__ = ("zoidberg") @@ -31,11 +31,16 @@ class EuroshareEu(SimpleHoster): FILE_OFFLINE_PATTERN = ur'

S.bor sa nena.iel

|Požadovaná stránka neexistuje!' FREE_URL_PATTERN = r'
Prebieha s.ahovanie' + ERR_PARDL_PATTERN = r'

Prebieha s.ahovanie

|

Naraz je z jednej IP adresy mo.n. s.ahova. iba jeden s.bor' + + FILE_URL_REPLACEMENTS = [(r"(http://[^/]*\.)(sk|cz|hu|pl)/", r"\1eu/")] + + def handlePremium(self): + self.download(self.pyfile.url.rstrip('/') + "/download/") 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.FREE_URL_PATTERN, self.html) if found is None: @@ -43,8 +48,9 @@ class EuroshareEu(SimpleHoster): 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 -- cgit v1.2.3 From 87effaa3c99406ec8f8de157fcfc39ccb0a92b8b Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Wed, 10 Oct 2012 23:41:06 +0200 Subject: fix sharerapid, euroshare --- module/plugins/hoster/EuroshareEu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/EuroshareEu.py') diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 79df56ac4..448862f5b 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -17,13 +17,13 @@ """ import re -from module.plugins.internal.SimpleHoster import SimpleHoster +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class EuroshareEu(SimpleHoster): __name__ = "EuroshareEu" __type__ = "hoster" __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*" - __version__ = "0.22" + __version__ = "0.23" __description__ = """Euroshare.eu""" __author_name__ = ("zoidberg") -- cgit v1.2.3 From 472870794ba8a9706f82cd79a22c2d959e5c2626 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Sat, 3 Nov 2012 18:06:19 +0100 Subject: update plugins - easybytez,filefactory,rusfolder,euroshare --- module/plugins/hoster/EuroshareEu.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/EuroshareEu.py') diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 448862f5b..97e6a989a 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -23,7 +23,7 @@ class EuroshareEu(SimpleHoster): __name__ = "EuroshareEu" __type__ = "hoster" __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*" - __version__ = "0.23" + __version__ = "0.24" __description__ = """Euroshare.eu""" __author_name__ = ("zoidberg") @@ -32,11 +32,29 @@ class EuroshareEu(SimpleHoster): FREE_URL_PATTERN = r'

Prebieha s.ahovanie|

Naraz je z jednej IP adresy mo.n. s.ahova. iba jeden s.bor' + ERR_NOT_LOGGED_IN_PATTERN = r'href="/customer-zone/login/"' 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): - self.download(self.pyfile.url.rstrip('/') + "/download/") + if self.ERR_NOT_LOGGED_IN_PATTERN in self.html: + self.account.relogin(user) + self.retry() + + 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(user) + self.retry() + elif check == "json": + self.fail(self.lastCheck.group(1)) def handleFree(self): if re.search(self.ERR_PARDL_PATTERN, self.html) is not None: -- cgit v1.2.3 From 543df32e61d61315b7d709b5a623c17d3dc91f49 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Sun, 4 Nov 2012 10:18:55 +0100 Subject: fix euroshare.eu - closed #692 --- module/plugins/hoster/EuroshareEu.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'module/plugins/hoster/EuroshareEu.py') diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 97e6a989a..5224dfd9f 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -23,40 +23,40 @@ class EuroshareEu(SimpleHoster): __name__ = "EuroshareEu" __type__ = "hoster" __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*" - __version__ = "0.24" + __version__ = "0.25" __description__ = """Euroshare.eu""" __author_name__ = ("zoidberg") FILE_INFO_PATTERN = r'(?P.+?) \((?P.+?)\)' FILE_OFFLINE_PATTERN = ur'

S.bor sa nena.iel

|Požadovaná stránka neexistuje!' - + FREE_URL_PATTERN = r'
Prebieha s.ahovanie|

Naraz je z jednej IP adresy mo.n. s.ahova. iba jeden s.bor' ERR_NOT_LOGGED_IN_PATTERN = r'href="/customer-zone/login/"' - + 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(user) - self.retry() + 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(user) - self.retry() + self.account.relogin(self.user) + self.retry(reason="Access token expired") elif check == "json": self.fail(self.lastCheck.group(1)) - def handleFree(self): + def handleFree(self): if re.search(self.ERR_PARDL_PATTERN, self.html) is not None: self.longWait(300, 12) @@ -66,9 +66,9 @@ class EuroshareEu(SimpleHoster): parsed_url = "http://euroshare.eu%s" % found.group(1) self.logDebug("URL", parsed_url) self.download(parsed_url, disposition=True) - + 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 + +getInfo = create_getInfo(EuroshareEu) \ No newline at end of file -- cgit v1.2.3