From d8cc7dac4e76f3ee10641b17f58994edb09c3695 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 10 Dec 2014 19:29:13 +0100 Subject: Fix bad merge --- pyload/plugins/account/DebridItaliaCom.py | 4 +- pyload/plugins/account/DevhostSt.py | 48 ------------------ pyload/plugins/account/DevhostStFolder.py | 58 ---------------------- pyload/plugins/account/KingfilesNet.py | 82 ------------------------------- pyload/plugins/crypter/DevhostStFolder.py | 58 ++++++++++++++++++++++ pyload/plugins/hoster/DevhostSt.py | 48 ++++++++++++++++++ pyload/plugins/hoster/KingfilesNet.py | 82 +++++++++++++++++++++++++++++++ 7 files changed, 190 insertions(+), 190 deletions(-) delete mode 100644 pyload/plugins/account/DevhostSt.py delete mode 100644 pyload/plugins/account/DevhostStFolder.py delete mode 100644 pyload/plugins/account/KingfilesNet.py create mode 100644 pyload/plugins/crypter/DevhostStFolder.py create mode 100644 pyload/plugins/hoster/DevhostSt.py create mode 100644 pyload/plugins/hoster/KingfilesNet.py (limited to 'pyload/plugins') diff --git a/pyload/plugins/account/DebridItaliaCom.py b/pyload/plugins/account/DebridItaliaCom.py index e0173fc8e..7252fc14b 100644 --- a/pyload/plugins/account/DebridItaliaCom.py +++ b/pyload/plugins/account/DebridItaliaCom.py @@ -22,14 +22,14 @@ class DebridItaliaCom(Account): def loadAccountInfo(self, user, req): - info = {"premium": False, "validuntil": None, "trafficleft": None} + info = {'premium': False, 'validuntil': None, 'trafficleft': None} html = req.load("http://debriditalia.com/") if 'Account premium not activated' not in html: m = re.search(self.WALID_UNTIL_PATTERN, html) if m: validuntil = int(mktime(strptime(m.group(1), "%d/%m/%Y %H:%M"))) - info = {"premium": True, "validuntil": validuntil, "trafficleft": -1} + info = {'premium': True, 'validuntil': validuntil, 'trafficleft': -1} else: self.logError(_("Unable to retrieve account information")) diff --git a/pyload/plugins/account/DevhostSt.py b/pyload/plugins/account/DevhostSt.py deleted file mode 100644 index 5be211809..000000000 --- a/pyload/plugins/account/DevhostSt.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Test links: -# http://d-h.st/mM8 - -import re - -from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo - - -class DevhostSt(SimpleHoster): - __name = "DevhostSt" - __type = "hoster" - __version = "0.03" - - __pattern = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' - - __description = """d-h.st hoster plugin""" - __license = "GPLv3" - __authors = [("zapp-brannigan", "fuerst.reinje@web.de")] - - - NAME_PATTERN = r'>Filename:
Size: (?P[\d.,]+) (?P[\w^_]+)' - - OFFLINE_PATTERN = r'>File Not Found<' - LINK_PATTERN = r'id="downloadfile" href="(.+?)"' - - - def setup(self): - self.multiDL = True - self.chunkLimit = 1 - - - def handleFree(self): - m = re.search(self.LINK_PATTERN, self.html) - if m is None: - self.error(_("Download link not found")) - - dl_url = m.group(1) - self.download(dl_url, disposition=True) - - check = self.checkDownload({'html': re.compile("html")}) - if check == "html": - self.error(_("Downloaded file is an html page")) - - -getInfo = create_getInfo(DevhostSt) diff --git a/pyload/plugins/account/DevhostStFolder.py b/pyload/plugins/account/DevhostStFolder.py deleted file mode 100644 index 942dc6b59..000000000 --- a/pyload/plugins/account/DevhostStFolder.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Test links: -# http://d-h.st/users/shine/?fld_id=37263#files - -import re - -from urlparse import urljoin - -from pyload.plugins.internal.SimpleCrypter import SimpleCrypter - - -class DevhostStFolder(SimpleCrypter): - __name = "DevhostStFolder" - __type = "crypter" - __version = "0.03" - - __pattern = r'http://(?:www\.)?d-h\.st/users/(?P\w+)(/\?fld_id=(?P\d+))?' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), - ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - - __description = """d-h.st folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zapp-brannigan", "fuerst.reinje@web.de"), - ("Walter Purcaro", "vuolter@gmail.com")] - - - LINK_PATTERN = r'(?:/> |;">)Back to \w+<)' - OFFLINE_PATTERN = r'"/cHP">test\.png<' - - - def getFileInfo(self): - if re.search(self.OFFLINE_PATTERN, self.html): - self.offline() - - try: - id = re.match(self.__pattern, self.pyfile.url).group('ID') - if id == "0": - raise - - p = r'href="(.+?)">Back to \w+<' - m = re.search(p, self.html) - html = self.load(urljoin("http://d-h.st", m.group(1)), - cookies=False) - - p = '\?fld_id=%s.*?">(.+?)<' % id - m = re.search(p, html) - name = folder = m.group(1) - - except Exception, e: - self.logDebug(e) - name = folder = re.match(self.__pattern, self.pyfile.url).group('USER') - - return {'name': name, 'folder': folder} - - - def getLinks(self): - return [urljoin("http://d-h.st", link) for link in re.findall(self.LINK_PATTERN, self.html)] diff --git a/pyload/plugins/account/KingfilesNet.py b/pyload/plugins/account/KingfilesNet.py deleted file mode 100644 index b8002741f..000000000 --- a/pyload/plugins/account/KingfilesNet.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from pyload.plugins.internal.captcha import SolveMedia -from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo - - -class KingfilesNet(SimpleHoster): - __name = "KingfilesNet" - __type = "hoster" - __version = "0.05" - - __pattern = r'http://(?:www\.)?kingfiles\.net/(?P\w{12})' - - __description = """Kingfiles.net hoster plugin""" - __license = "GPLv3" - __authors = [("zapp-brannigan", "fuerst.reinje@web.de"), - ("Walter Purcaro", "vuolter@gmail.com")] - - - NAME_PATTERN = r'name="fname" value="(?P.+?)">' - SIZE_PATTERN = r'>Size: .+?">(?P[\d.,]+) (?P[\w^_]+)' - - OFFLINE_PATTERN = r'>(File Not Found

|File Not Found)' - - RAND_ID_PATTERN = r'type=\"hidden\" name=\"rand\" value=\"(.+)\">' - - LINK_PATTERN = r'var download_url = \'(.+)\';' - - - def setup(self): - self.resumeDownload = True - self.multiDL = True - - - def handleFree(self): - # Click the free user button - post_data = {'op' : "download1", - 'usr_login' : "", - 'id' : self.info['pattern']['ID'], - 'fname' : self.pyfile.name, - 'referer' : "", - 'method_free': "+"} - - self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) - - solvemedia = SolveMedia(self) - challenge, response = solvemedia.challenge() - - # Make the downloadlink appear and load the file - m = re.search(self.RAND_ID_PATTERN, self.html) - if m is None: - self.error(_("Random key not found")) - - rand = m.group(1) - self.logDebug("rand = ", rand) - - post_data = {'op' : "download2", - 'id' : self.info['pattern']['ID'], - 'rand' : rand, - 'referer' : self.pyfile.url, - 'method_free' : "+", - 'method_premium' : "", - 'adcopy_response' : response, - 'adcopy_challenge': challenge, - 'down_direct' : "1"} - - self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) - - m = re.search(self.LINK_PATTERN, self.html) - if m is None: - self.error(_("Download url not found")) - - self.download(m.group(1), cookies=True, disposition=True) - - check = self.checkDownload({'html': re.compile("")}) - if check == "html": - self.error(_("Downloaded file is an html page")) - - -getInfo = create_getInfo(KingfilesNet) diff --git a/pyload/plugins/crypter/DevhostStFolder.py b/pyload/plugins/crypter/DevhostStFolder.py new file mode 100644 index 000000000..942dc6b59 --- /dev/null +++ b/pyload/plugins/crypter/DevhostStFolder.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +# +# Test links: +# http://d-h.st/users/shine/?fld_id=37263#files + +import re + +from urlparse import urljoin + +from pyload.plugins.internal.SimpleCrypter import SimpleCrypter + + +class DevhostStFolder(SimpleCrypter): + __name = "DevhostStFolder" + __type = "crypter" + __version = "0.03" + + __pattern = r'http://(?:www\.)?d-h\.st/users/(?P\w+)(/\?fld_id=(?P\d+))?' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), + ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] + + __description = """d-h.st folder decrypter plugin""" + __license = "GPLv3" + __authors = [("zapp-brannigan", "fuerst.reinje@web.de"), + ("Walter Purcaro", "vuolter@gmail.com")] + + + LINK_PATTERN = r'(?:/> |;">)Back to \w+<)' + OFFLINE_PATTERN = r'"/cHP">test\.png<' + + + def getFileInfo(self): + if re.search(self.OFFLINE_PATTERN, self.html): + self.offline() + + try: + id = re.match(self.__pattern, self.pyfile.url).group('ID') + if id == "0": + raise + + p = r'href="(.+?)">Back to \w+<' + m = re.search(p, self.html) + html = self.load(urljoin("http://d-h.st", m.group(1)), + cookies=False) + + p = '\?fld_id=%s.*?">(.+?)<' % id + m = re.search(p, html) + name = folder = m.group(1) + + except Exception, e: + self.logDebug(e) + name = folder = re.match(self.__pattern, self.pyfile.url).group('USER') + + return {'name': name, 'folder': folder} + + + def getLinks(self): + return [urljoin("http://d-h.st", link) for link in re.findall(self.LINK_PATTERN, self.html)] diff --git a/pyload/plugins/hoster/DevhostSt.py b/pyload/plugins/hoster/DevhostSt.py new file mode 100644 index 000000000..5be211809 --- /dev/null +++ b/pyload/plugins/hoster/DevhostSt.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# +# Test links: +# http://d-h.st/mM8 + +import re + +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class DevhostSt(SimpleHoster): + __name = "DevhostSt" + __type = "hoster" + __version = "0.03" + + __pattern = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' + + __description = """d-h.st hoster plugin""" + __license = "GPLv3" + __authors = [("zapp-brannigan", "fuerst.reinje@web.de")] + + + NAME_PATTERN = r'>Filename:
Size: (?P[\d.,]+) (?P[\w^_]+)' + + OFFLINE_PATTERN = r'>File Not Found<' + LINK_PATTERN = r'id="downloadfile" href="(.+?)"' + + + def setup(self): + self.multiDL = True + self.chunkLimit = 1 + + + def handleFree(self): + m = re.search(self.LINK_PATTERN, self.html) + if m is None: + self.error(_("Download link not found")) + + dl_url = m.group(1) + self.download(dl_url, disposition=True) + + check = self.checkDownload({'html': re.compile("html")}) + if check == "html": + self.error(_("Downloaded file is an html page")) + + +getInfo = create_getInfo(DevhostSt) diff --git a/pyload/plugins/hoster/KingfilesNet.py b/pyload/plugins/hoster/KingfilesNet.py new file mode 100644 index 000000000..b8002741f --- /dev/null +++ b/pyload/plugins/hoster/KingfilesNet.py @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- + +import re + +from pyload.plugins.internal.captcha import SolveMedia +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class KingfilesNet(SimpleHoster): + __name = "KingfilesNet" + __type = "hoster" + __version = "0.05" + + __pattern = r'http://(?:www\.)?kingfiles\.net/(?P\w{12})' + + __description = """Kingfiles.net hoster plugin""" + __license = "GPLv3" + __authors = [("zapp-brannigan", "fuerst.reinje@web.de"), + ("Walter Purcaro", "vuolter@gmail.com")] + + + NAME_PATTERN = r'name="fname" value="(?P.+?)">' + SIZE_PATTERN = r'>Size: .+?">(?P[\d.,]+) (?P[\w^_]+)' + + OFFLINE_PATTERN = r'>(File Not Found

|File Not Found)' + + RAND_ID_PATTERN = r'type=\"hidden\" name=\"rand\" value=\"(.+)\">' + + LINK_PATTERN = r'var download_url = \'(.+)\';' + + + def setup(self): + self.resumeDownload = True + self.multiDL = True + + + def handleFree(self): + # Click the free user button + post_data = {'op' : "download1", + 'usr_login' : "", + 'id' : self.info['pattern']['ID'], + 'fname' : self.pyfile.name, + 'referer' : "", + 'method_free': "+"} + + self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) + + solvemedia = SolveMedia(self) + challenge, response = solvemedia.challenge() + + # Make the downloadlink appear and load the file + m = re.search(self.RAND_ID_PATTERN, self.html) + if m is None: + self.error(_("Random key not found")) + + rand = m.group(1) + self.logDebug("rand = ", rand) + + post_data = {'op' : "download2", + 'id' : self.info['pattern']['ID'], + 'rand' : rand, + 'referer' : self.pyfile.url, + 'method_free' : "+", + 'method_premium' : "", + 'adcopy_response' : response, + 'adcopy_challenge': challenge, + 'down_direct' : "1"} + + self.html = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) + + m = re.search(self.LINK_PATTERN, self.html) + if m is None: + self.error(_("Download url not found")) + + self.download(m.group(1), cookies=True, disposition=True) + + check = self.checkDownload({'html': re.compile("")}) + if check == "html": + self.error(_("Downloaded file is an html page")) + + +getInfo = create_getInfo(KingfilesNet) -- cgit v1.2.3