From f62715c5d2c6eb6379119b220a271b5b73da689f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 3 Oct 2014 17:46:50 +0200 Subject: Fix previous merge commit --- module/plugins/accounts/TusfilesNet.py | 69 ------------------------ module/plugins/crypter/DevhostStFolder.py | 29 ---------- module/plugins/hoster/DevhostSt.py | 49 ----------------- module/plugins/hoster/DropboxCom.py | 42 --------------- module/plugins/hoster/KingfilesNet.py | 86 ------------------------------ pyload/plugins/accounts/DevhostSt.py | 49 +++++++++++++++++ pyload/plugins/accounts/DevhostStFolder.py | 29 ++++++++++ pyload/plugins/accounts/DropboxCom.py | 42 +++++++++++++++ pyload/plugins/accounts/KingfilesNet.py | 86 ++++++++++++++++++++++++++++++ pyload/plugins/accounts/TusfilesNet.py | 69 ++++++++++++++++++++++++ 10 files changed, 275 insertions(+), 275 deletions(-) delete mode 100644 module/plugins/accounts/TusfilesNet.py delete mode 100644 module/plugins/crypter/DevhostStFolder.py delete mode 100644 module/plugins/hoster/DevhostSt.py delete mode 100644 module/plugins/hoster/DropboxCom.py delete mode 100644 module/plugins/hoster/KingfilesNet.py create mode 100644 pyload/plugins/accounts/DevhostSt.py create mode 100644 pyload/plugins/accounts/DevhostStFolder.py create mode 100644 pyload/plugins/accounts/DropboxCom.py create mode 100644 pyload/plugins/accounts/KingfilesNet.py create mode 100644 pyload/plugins/accounts/TusfilesNet.py diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py deleted file mode 100644 index d7cdbaebb..000000000 --- a/module/plugins/accounts/TusfilesNet.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from time import mktime, strptime, gmtime - -from module.plugins.Account import Account -from module.plugins.internal.SimpleHoster import parseHtmlForm -from module.utils import parseFileSize - - -class TusfilesNet(Account): - __name__ = "TusfilesNet" - __type__ = "account" - __version__ = "0.01" - - __description__ = """ Tusfile.net account plugin """ - __author_name__ = "guidobelix" - __author_mail__ = "guidobelix@hotmail.it" - - VALID_UNTIL_PATTERN = r'([^<]+)' - TRAFFIC_LEFT_PATTERN = r'\n (?P[^<]+)' - - - def loadAccountInfo(self, user, req): - html = req.load("http://www.tusfiles.net/?op=my_account", decode=True) - - validuntil = None - trafficleft = None - premium = False - - m = re.search(self.VALID_UNTIL_PATTERN, html) - if m: - expiredate = m.group(1) - self.logDebug("Expire date: " + expiredate) - - try: - validuntil = mktime(strptime(expiredate, "%d %B %Y")) - except Exception, e: - self.logError(e) - - if validuntil > mktime(gmtime()): - premium = True - else: - premium = False - validuntil = None - - m = re.search(self.TRAFFIC_LEFT_PATTERN, html) - if m: - trafficleft = m.group(1) - if "Unlimited" in trafficleft: - trafficleft = -1 - else: - trafficleft = parseFileSize(trafficleft) * 1024 - - return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} - - - def login(self, user, data, req): - html = req.load("http://www.tusfiles.net/login.html", decode=True) - action, inputs = parseHtmlForm('name="FL"', html) - inputs.update({'login': user, - 'password': data['password'], - 'redirect': "http://www.tusfiles.net/"}) - - html = req.load("http://www.tusfiles.net/", post=inputs, decode=True) - - if 'Incorrect Login or Password' in html or '>Error<' in html: - self.wrongPassword() diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py deleted file mode 100644 index 0d9c032cb..000000000 --- a/module/plugins/crypter/DevhostStFolder.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Test links: -# http://d-h.st/users/shine/?fld_id=37263#files - -import re - -from urlparse import urljoin - -from module.plugins.internal.SimpleCrypter import SimpleCrypter - - -class DevhostStFolder(SimpleCrypter): - __name__ = "DevhostStFolder" - __type__ = "crypter" - __version__ = "0.01" - - __pattern__ = r'http://(?:www\.)?d-h\.st/users/\w+/\?fld_id=\d+' - - __description__ = """d-h.st decrypter plugin""" - __author_name_ = "zapp-brannigan" - __author_mail_ = "fuerst.reinje@web.de" - - - LINK_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.parseError("Download link not found") - - dl_url = m.group(1) - self.logDebug("Download URL = " + dl_url) - self.download(dl_url, disposition=True) - - check = self.checkDownload({'is_html': re.compile("html")}) - if check == "is_html": - self.parseError("Downloaded file is an html file") - - -getInfo = create_getInfo(DevhostSt) diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py deleted file mode 100644 index ab63fc801..000000000 --- a/module/plugins/hoster/DropboxCom.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo - - -class DropboxCom(SimpleHoster): - __name__ = "DropboxCom" - __type__ = "hoster" - __version__ = "0.01" - - __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+' - - __description__ = """Dropbox.com hoster plugin""" - __author_name__ = "zapp-brannigan" - __author_mail__ = "fuerst.reinje@web.de" - - - FILE_NAME_PATTERN = r'Dropbox - (?P<N>.+?)<' - FILE_SIZE_PATTERN = r' ·  (?P<S>[\d,]+) (?P<U>\w+)' - - OFFLINE_PATTERN = r'<title>Dropbox - (404|Shared link error)<' - - SH_COOKIES = [(".dropbox.com", "lang", "en")] - - - def setup(self): - self.multiDL = True - self.chunkLimit = 1 - self.resumeDownload = True - - - def handleFree(self): - self.download(self.pyfile.url, get={'dl': "1"}) - - check = self.checkDownload({'is_html': re.compile("html")}) - if check == "is_html": - self.parseError("Downloaded file is an html file") - - -getInfo = create_getInfo(DropboxCom) diff --git a/module/plugins/hoster/KingfilesNet.py b/module/plugins/hoster/KingfilesNet.py deleted file mode 100644 index e8aefa53b..000000000 --- a/module/plugins/hoster/KingfilesNet.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from module.plugins.internal.CaptchaService import SolveMedia -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo - - -class KingfilesNet(SimpleHoster): - __name__ = "KingfilesNet" - __type__ = "hoster" - __version__ = "0.01" - - __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' - - __description__ = """Kingfiles.net hoster plugin""" - __author_name__ = ("zapp-brannigan", "Walter Purcaro") - __author_mail__ = ("fuerst.reinje@web.de", "vuolter@gmail.com") - - - FILE_NAME_PATTERN = r'name="fname" value="(?P<N>.+?)">' - FILE_SIZE_PATTERN = r'>Size: .+?">(?P<S>[\d.]+) (?P<U>\w+)' - - OFFLINE_PATTERN = r'>(File Not Found</b><br><br>|File Not Found</h2>)' - - RAND_ID_PATTERN = r'type=\"hidden\" name=\"rand\" value=\"(.+)\">' - - LINK_PATTERN = r'var download_url = \'(.+)\';' - - - def setup(self): - self.multiDL = True - self.resumeDownload = True - - - def handleFree(self): - # Click the free user button - post_data = {'op': "download1", - 'usr_login': "", - 'id': file_info['ID'], - 'fname': self.pyfile.name, - 'referer': "", - 'method_free': "+"} - b = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) - - solvemedia = SolveMedia(self) - - captcha_key = solvemedia.detect_key() - if captcha_key is None: - self.parseError("SolveMedia key not found") - - self.logDebug("captcha_key", captcha_key) - captcha_challenge, captcha_response = solvemedia.challenge(captcha_key) - - # Make the downloadlink appear and load the file - m = re.search(self.RAND_ID_PATTERN, b) - if m is None: - self.parseError("Random key not found") - - rand = m.group(1) - self.logDebug("rand", rand) - - post_data = {'op': "download2", - 'id': file_id, - 'rand': rand, - 'referer': self.pyfile.url, - 'method_free': "+", - 'method_premium': "", - 'adcopy_response': captcha_response, - 'adcopy_challenge': captcha_challenge, - 'down_direct': "1"} - c = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) - - m = re.search(self.LINK_PATTERN, c) - if m is None: - self.parseError("Download url not found") - - dl_url = m.group(1) - self.download(dl_url, cookies=True, disposition=True) - - check = self.checkDownload({'is_html': re.compile("<html>")}) - if check == "is_html": - self.parseError("Downloaded file is an html file") - - -getInfo = create_getInfo(KingfilesNet) diff --git a/pyload/plugins/accounts/DevhostSt.py b/pyload/plugins/accounts/DevhostSt.py new file mode 100644 index 000000000..03d7d9964 --- /dev/null +++ b/pyload/plugins/accounts/DevhostSt.py @@ -0,0 +1,49 @@ +# -*- 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__ = "Devhost" + __type__ = "hoster" + __version__ = "0.01" + + __pattern__ = r'http://(?:www\.)?d-h\.st/\w+' + + __description__ = """d-h.st hoster plugin""" + __author_name__ = "zapp-brannigan" + __author_mail__ = "fuerst.reinje@web.de" + + + FILE_NAME_PATTERN = r'>Filename:</span> <div title="(?P<N>.+?)"' + FILE_SIZE_PATTERN = r'>Size:</span> (?P<S>[\d.]+) (?P<U>\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.parseError("Download link not found") + + dl_url = m.group(1) + self.logDebug("Download URL = " + dl_url) + self.download(dl_url, disposition=True) + + check = self.checkDownload({'is_html': re.compile("html")}) + if check == "is_html": + self.parseError("Downloaded file is an html file") + + +getInfo = create_getInfo(DevhostSt) diff --git a/pyload/plugins/accounts/DevhostStFolder.py b/pyload/plugins/accounts/DevhostStFolder.py new file mode 100644 index 000000000..1c9bd3889 --- /dev/null +++ b/pyload/plugins/accounts/DevhostStFolder.py @@ -0,0 +1,29 @@ +# -*- 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.01" + + __pattern__ = r'http://(?:www\.)?d-h\.st/users/\w+/\?fld_id=\d+' + + __description__ = """d-h.st decrypter plugin""" + __author_name_ = "zapp-brannigan" + __author_mail_ = "fuerst.reinje@web.de" + + + LINK_PATTERN = r';"><a href="/(\w+)' + + + 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/accounts/DropboxCom.py b/pyload/plugins/accounts/DropboxCom.py new file mode 100644 index 000000000..d3078c7f6 --- /dev/null +++ b/pyload/plugins/accounts/DropboxCom.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- + +import re + +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class DropboxCom(SimpleHoster): + __name__ = "DropboxCom" + __type__ = "hoster" + __version__ = "0.01" + + __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+' + + __description__ = """Dropbox.com hoster plugin""" + __author_name__ = "zapp-brannigan" + __author_mail__ = "fuerst.reinje@web.de" + + + FILE_NAME_PATTERN = r'<title>Dropbox - (?P<N>.+?)<' + FILE_SIZE_PATTERN = r' ·  (?P<S>[\d,]+) (?P<U>\w+)' + + OFFLINE_PATTERN = r'<title>Dropbox - (404|Shared link error)<' + + SH_COOKIES = [(".dropbox.com", "lang", "en")] + + + def setup(self): + self.multiDL = True + self.chunkLimit = 1 + self.resumeDownload = True + + + def handleFree(self): + self.download(self.pyfile.url, get={'dl': "1"}) + + check = self.checkDownload({'is_html': re.compile("html")}) + if check == "is_html": + self.parseError("Downloaded file is an html file") + + +getInfo = create_getInfo(DropboxCom) diff --git a/pyload/plugins/accounts/KingfilesNet.py b/pyload/plugins/accounts/KingfilesNet.py new file mode 100644 index 000000000..44c01f770 --- /dev/null +++ b/pyload/plugins/accounts/KingfilesNet.py @@ -0,0 +1,86 @@ +# -*- coding: utf-8 -*- + +import re + +from pyload.plugins.internal.CaptchaService import SolveMedia +from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class KingfilesNet(SimpleHoster): + __name__ = "KingfilesNet" + __type__ = "hoster" + __version__ = "0.01" + + __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' + + __description__ = """Kingfiles.net hoster plugin""" + __author_name__ = ("zapp-brannigan", "Walter Purcaro") + __author_mail__ = ("fuerst.reinje@web.de", "vuolter@gmail.com") + + + FILE_NAME_PATTERN = r'name="fname" value="(?P<N>.+?)">' + FILE_SIZE_PATTERN = r'>Size: .+?">(?P<S>[\d.]+) (?P<U>\w+)' + + OFFLINE_PATTERN = r'>(File Not Found</b><br><br>|File Not Found</h2>)' + + RAND_ID_PATTERN = r'type=\"hidden\" name=\"rand\" value=\"(.+)\">' + + LINK_PATTERN = r'var download_url = \'(.+)\';' + + + def setup(self): + self.multiDL = True + self.resumeDownload = True + + + def handleFree(self): + # Click the free user button + post_data = {'op': "download1", + 'usr_login': "", + 'id': file_info['ID'], + 'fname': self.pyfile.name, + 'referer': "", + 'method_free': "+"} + b = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) + + solvemedia = SolveMedia(self) + + captcha_key = solvemedia.detect_key() + if captcha_key is None: + self.parseError("SolveMedia key not found") + + self.logDebug("captcha_key", captcha_key) + captcha_challenge, captcha_response = solvemedia.challenge(captcha_key) + + # Make the downloadlink appear and load the file + m = re.search(self.RAND_ID_PATTERN, b) + if m is None: + self.parseError("Random key not found") + + rand = m.group(1) + self.logDebug("rand", rand) + + post_data = {'op': "download2", + 'id': file_id, + 'rand': rand, + 'referer': self.pyfile.url, + 'method_free': "+", + 'method_premium': "", + 'adcopy_response': captcha_response, + 'adcopy_challenge': captcha_challenge, + 'down_direct': "1"} + c = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True) + + m = re.search(self.LINK_PATTERN, c) + if m is None: + self.parseError("Download url not found") + + dl_url = m.group(1) + self.download(dl_url, cookies=True, disposition=True) + + check = self.checkDownload({'is_html': re.compile("<html>")}) + if check == "is_html": + self.parseError("Downloaded file is an html file") + + +getInfo = create_getInfo(KingfilesNet) diff --git a/pyload/plugins/accounts/TusfilesNet.py b/pyload/plugins/accounts/TusfilesNet.py new file mode 100644 index 000000000..870abea08 --- /dev/null +++ b/pyload/plugins/accounts/TusfilesNet.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- + +import re + +from time import mktime, strptime, gmtime + +from pyload.plugins.Account import Account +from pyload.plugins.internal.SimpleHoster import parseHtmlForm +from pyload.utils import parseFileSize + + +class TusfilesNet(Account): + __name__ = "TusfilesNet" + __type__ = "account" + __version__ = "0.01" + + __description__ = """ Tusfile.net account plugin """ + __author_name__ = "guidobelix" + __author_mail__ = "guidobelix@hotmail.it" + + VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>' + TRAFFIC_LEFT_PATTERN = r'<td><img src="//www.tusfiles.net/i/icon/meter.png" alt=""/></td>\n<td> (?P<S>[^<]+)</td>' + + + def loadAccountInfo(self, user, req): + html = req.load("http://www.tusfiles.net/?op=my_account", decode=True) + + validuntil = None + trafficleft = None + premium = False + + m = re.search(self.VALID_UNTIL_PATTERN, html) + if m: + expiredate = m.group(1) + self.logDebug("Expire date: " + expiredate) + + try: + validuntil = mktime(strptime(expiredate, "%d %B %Y")) + except Exception, e: + self.logError(e) + + if validuntil > mktime(gmtime()): + premium = True + else: + premium = False + validuntil = None + + m = re.search(self.TRAFFIC_LEFT_PATTERN, html) + if m: + trafficleft = m.group(1) + if "Unlimited" in trafficleft: + trafficleft = -1 + else: + trafficleft = parseFileSize(trafficleft) * 1024 + + return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} + + + def login(self, user, data, req): + html = req.load("http://www.tusfiles.net/login.html", decode=True) + action, inputs = parseHtmlForm('name="FL"', html) + inputs.update({'login': user, + 'password': data['password'], + 'redirect': "http://www.tusfiles.net/"}) + + html = req.load("http://www.tusfiles.net/", post=inputs, decode=True) + + if 'Incorrect Login or Password' in html or '>Error<' in html: + self.wrongPassword() -- cgit v1.2.3