From 50ef18bfb7ced07dfacc8db28aa11dd376be65da Mon Sep 17 00:00:00 2001 From: Leon Bergmann Date: Sat, 4 Jan 2014 01:49:16 +0100 Subject: [PATCH 0001/3774] Update StreamcloudEu.py update DIRECT_LINK_PATTERN streamcloud uses flv files and mp4 --- module/plugins/hoster/StreamcloudEu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index dd9bf9429c..b9ff37052d 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -16,7 +16,7 @@ class StreamcloudEu(XFileSharingPro): __author_mail__ = ("seoester@googlemail.com") HOSTER_NAME = "streamcloud.eu" - DIRECT_LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",' + DIRECT_LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.(mp4|flv))",' def setup(self): super(StreamcloudEu, self).setup() From 9f6eddf1799f372f21a4dbdc44adf669d3e1fdc0 Mon Sep 17 00:00:00 2001 From: Maximilian Berger Date: Sat, 4 Jan 2014 09:11:24 +0100 Subject: [PATCH 0002/3774] Update AlldebridCom.py Fixed wrong description --- module/plugins/hooks/AlldebridCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/plugins/hooks/AlldebridCom.py b/module/plugins/hooks/AlldebridCom.py index d0e9b1f779..775e6adc3a 100644 --- a/module/plugins/hooks/AlldebridCom.py +++ b/module/plugins/hooks/AlldebridCom.py @@ -18,7 +18,7 @@ class AlldebridCom(MultiHoster): ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - __description__ = """Real-Debrid.com hook plugin""" + __description__ = """Alldebrid.com hook plugin""" __author_name__ = ("Andy, Voigt") __author_mail__ = ("spamsales@online.de") From 952fbd8638916555145ff1965b8e961b350a59ca Mon Sep 17 00:00:00 2001 From: Maximilian Berger Date: Sat, 4 Jan 2014 09:13:36 +0100 Subject: [PATCH 0003/3774] Update README Updated repo link. --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index 7f3c4f4c83..be6200ead9 100644 --- a/README +++ b/README @@ -1,4 +1,3 @@ - Description =========== @@ -11,7 +10,7 @@ pyLoad is written entirely in Python and is currently under heavy development. For news, downloads, wiki, forum and further information visit http://pyload.org/ To report bugs, suggest features, ask a question, get the developer version -or help us out, visit http://bitbucket.org/spoob/pyload/ +or help us out, visit http://github.com/pyload/pyload Documentation about extending pyLoad can be found at http://docs.pyload.org or join us at #pyload on irc.freenode.net From 22048007abb2df02ee4ac97f61bd6d615c68a529 Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 4 Jan 2014 17:24:08 +0100 Subject: [PATCH 0004/3774] StreamcloudEu: increased version number after 50ef18bfb7ced07dfacc8db28aa11dd376be65da --- module/plugins/hoster/StreamcloudEu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index b9ff37052d..dea2781d53 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -10,7 +10,7 @@ class StreamcloudEu(XFileSharingPro): __name__ = "StreamcloudEu" __type__ = "hoster" __pattern__ = r"http://(www\.)?streamcloud\.eu/\S+" - __version__ = "0.02" + __version__ = "0.03" __description__ = """Streamcloud.eu hoster plugin""" __author_name__ = ("seoester") __author_mail__ = ("seoester@googlemail.com") From 561ed2890ec6c4512badcf5ffd3758bc6dafb48d Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 4 Jan 2014 18:28:45 +0100 Subject: [PATCH 0005/3774] CloudzerNet: improved getInfo See #185 --- module/plugins/hoster/CloudzerNet.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py index e95f907923..28c4dc6b1b 100644 --- a/module/plugins/hoster/CloudzerNet.py +++ b/module/plugins/hoster/CloudzerNet.py @@ -13,10 +13,8 @@ def getInfo(urls): if 'Location: http://cloudzer.net/404' in header: file_info = (url, 0, 1, url) else: - if url.endswith('/'): - api_data = getURL(url + 'status') - else: - api_data = getURL(url + '/status') + fid = re.search(CloudzerNet.__pattern__, url).group('ID') + api_data = getURL('http://cloudzer.net/file/%s/status' % fid) name, size = api_data.splitlines() size = parseFileSize(size) file_info = (name, size, 2, url) @@ -27,7 +25,7 @@ class CloudzerNet(SimpleHoster): __name__ = "CloudzerNet" __type__ = "hoster" __pattern__ = r"http://(www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)(?P\w+).*" - __version__ = "0.03" + __version__ = "0.04" __description__ = """Cloudzer.net hoster plugin""" __author_name__ = ("gs", "z00nx", "stickell") __author_mail__ = ("I-_-I-_-I@web.de", "z00nx0@gmail.com", "l.stickell@yahoo.it") From b7cff12cef8a0c1843a6214aa3f1b4a3a91d9123 Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 4 Jan 2014 20:39:24 +0100 Subject: [PATCH 0006/3774] CloudzerNet: fixed #185 --- module/plugins/hoster/CloudzerNet.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py index 28c4dc6b1b..8253c35b9b 100644 --- a/module/plugins/hoster/CloudzerNet.py +++ b/module/plugins/hoster/CloudzerNet.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import re + from module.plugins.internal.SimpleHoster import SimpleHoster from module.common.json_layer import json_loads from module.plugins.internal.CaptchaService import ReCaptcha @@ -30,9 +31,7 @@ class CloudzerNet(SimpleHoster): __author_name__ = ("gs", "z00nx", "stickell") __author_mail__ = ("I-_-I-_-I@web.de", "z00nx0@gmail.com", "l.stickell@yahoo.it") - FILE_SIZE_PATTERN = '(?P[^<]+)' WAIT_PATTERN = '' - FILE_OFFLINE_PATTERN = r'Please check the URL for typing errors, respectively' CAPTCHA_KEY = '6Lcqz78SAAAAAPgsTYF3UlGf2QFQCNuPMenuyHF3' def handleFree(self): @@ -69,3 +68,18 @@ def handleFree(self): url = response["url"] self.logDebug("Download link", url) self.download(url, disposition=True) + + def getFileInfo(self): + self.logDebug("URL: %s" % self.pyfile.url) + + header = getURL(self.pyfile.url, just_header=True) + + if 'Location: http://cloudzer.net/404' in header: + self.offline() + else: + self.fid = re.search(self.__pattern__, self.pyfile.url).group('ID') + api_data = getURL('http://cloudzer.net/file/%s/status' % self.fid) + self.pyfile.name, size = api_data.splitlines() + self.pyfile.size = parseFileSize(size) + + self.logDebug("FILE NAME: %s FILE SIZE: %s" % (self.pyfile.name, self.pyfile.size)) From 2429e9666fb849236126d310791f3eed3a622442 Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 4 Jan 2014 21:25:59 +0100 Subject: [PATCH 0007/3774] WebshareCz: rewritten Fixes #452 --- module/plugins/hoster/WebshareCz.py | 86 +++++++++++++++++++---------- 1 file changed, 56 insertions(+), 30 deletions(-) diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py index 1c9ddb290b..1a3aabaaa5 100644 --- a/module/plugins/hoster/WebshareCz.py +++ b/module/plugins/hoster/WebshareCz.py @@ -1,46 +1,72 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +############################################################################ - You should have received a copy of the GNU General Public License - along with this program; if not, see . +import re - @author: zoidberg -""" +from module.plugins.internal.SimpleHoster import SimpleHoster +from module.network.RequestFactory import getRequest -import re -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + +def getInfo(urls): + h = getRequest() + for url in urls: + h.load(url) + fid = re.search(WebshareCz.__pattern__, url).group('ID') + api_data = h.load('https://webshare.cz/api/file_info/', post={'ident': fid}) + if 'File not found' in api_data: + file_info = (url, 0, 1, url) + else: + name = re.search('(.+)', api_data).group(1) + size = re.search('(.+)', api_data).group(1) + file_info = (name, size, 2, url) + yield file_info class WebshareCz(SimpleHoster): __name__ = "WebshareCz" __type__ = "hoster" - __pattern__ = r"http://(\w+\.)?webshare.cz/(stahnout/)?(?P\w{10})-.+" - __version__ = "0.12" - __description__ = """WebShare.cz""" - __author_name__ = ("zoidberg") + __pattern__ = r"https?://(?:www\.)?webshare.cz/(?:#/)?file/(?P\w+)" + __version__ = "0.13" + __description__ = """WebShare.cz hoster plugin""" + __author_name__ = ("stickell") + __author_mail__ = ("l.stickell@yahoo.it") - FILE_NAME_PATTERN = r'

Stahujete soubor:

\s*
(?P[^<]+)
' - FILE_SIZE_PATTERN = r'

Velikost souboru je:

\s*
(?P[^<]+)
' - FILE_OFFLINE_PATTERN = r'

Soubor ".*?" nebyl nalezen.

' + def handleFree(self): + api_data = self.load('https://webshare.cz/api/file_link/', post={'ident': self.fid}) + self.logDebug("API data: " + api_data) + m = re.search('(.+)', api_data) + if not m: + self.parseError('Unable to detect direct link') + direct = m.group(1) + self.logDebug("Direct link: " + direct) + self.download(direct, disposition=True) - DOWNLOAD_LINK_PATTERN = r'id="download_link" href="(?P.*?)"' + def getFileInfo(self): + self.logDebug("URL: %s" % self.pyfile.url) - def handleFree(self): - url_a = re.search(r"(var l.*)", self.html).group(1) - url_b = re.search(r"(var keyStr.*)", self.html).group(1) - url = self.js.eval("%s\n%s\ndec(l)" % (url_a, url_b)) + self.fid = re.search(self.__pattern__, self.pyfile.url).group('ID') - self.logDebug('Download link: ' + url) - self.download(url) + self.load(self.pyfile.url) + api_data = self.load('https://webshare.cz/api/file_info/', post={'ident': self.fid}) + if 'File not found' in api_data: + self.offline() + else: + self.pyfile.name = re.search('(.+)', api_data).group(1) + self.pyfile.size = re.search('(.+)', api_data).group(1) -getInfo = create_getInfo(WebshareCz) + self.logDebug("FILE NAME: %s FILE SIZE: %s" % (self.pyfile.name, self.pyfile.size)) From d664484a466f1b9c53b1f2b5ff9a5ffa9a80440b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 9 Jan 2014 11:47:51 +0100 Subject: [PATCH 0008/3774] ShareonlineBiz: Https fix + code cosmetics Merged #459 --- module/plugins/hoster/ShareonlineBiz.py | 116 ++++++++++-------------- 1 file changed, 49 insertions(+), 67 deletions(-) diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index 5b7a0e913c..d51935d338 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -10,12 +10,14 @@ from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.plugins.Plugin import chunks -from module.plugins.internal.CaptchaService import ReCaptcha as _ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha def getInfo(urls): api_url_base = "http://api.share-online.biz/linkcheck.php" + urls = [url.replace("https://", "http://") for url in urls] + for chunk in chunks(urls, 90): api_param_file = {"links": "\n".join(x.replace("http://www.share-online.biz/dl/", "").rstrip("/") for x in chunk)} # api only supports old style links @@ -37,21 +39,14 @@ def getInfo(urls): yield result -#suppress ocr plugin -class ReCaptcha(_ReCaptcha): - def result(self, server, challenge): - return self.plugin.decryptCaptcha("%simage" % server, get={"c": challenge}, - cookies=True, forceUser=True, imgtype="jpg") - - class ShareonlineBiz(Hoster): __name__ = "ShareonlineBiz" __type__ = "hoster" - __pattern__ = r"https?://[\w\.]*?(share\-online\.biz|egoshare\.com)/(download.php\?id\=|dl/)[\w]+" - __version__ = "0.37" + __pattern__ = r"https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download.php\?id=|dl/)(?P\w+)" + __version__ = "0.38" __description__ = """Shareonline.biz Download Hoster""" - __author_name__ = ("spoob", "mkaay", "zoidberg") - __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz") + __author_name__ = ("spoob", "mkaay", "zoidberg", "Walter Purcaro") + __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz", "vuolter@gmail.com") ERROR_INFO_PATTERN = r'

Information:

\s*
\s*(.*?)' @@ -59,7 +54,7 @@ def setup(self): # range request not working? # api supports resume, only one chunk # website isn't supporting resuming in first place - self.file_id = re.search(r"(id\=|/dl/)([a-zA-Z0-9]+)", self.pyfile.url).group(2) + self.file_id = re.match(self.__pattern__, self.pyfile.url).group("ID") self.pyfile.url = "http://www.share-online.biz/dl/" + self.file_id self.resumeDownload = self.premium @@ -70,7 +65,7 @@ def setup(self): def process(self, pyfile): if self.premium: - self.handleAPIPremium() + self.handlePremium() #web-download fallback removed - didn't work anyway else: self.handleFree() @@ -85,10 +80,9 @@ def process(self, pyfile): if self.api_data: self.check_data = {"size": int(self.api_data['size']), "md5": self.api_data['md5']} - def downloadAPIData(self): + def loadAPIData(self): api_url_base = "http://api.share-online.biz/linkcheck.php?md5=1" - api_param_file = {"links": self.pyfile.url.replace( - "http://www.share-online.biz/dl/", "")} # api only supports old style links + api_param_file = {"links": self.file_id} # api only supports old style links src = self.load(api_url_base, cookies=False, post=api_param_file, decode=True) fields = src.split(";") @@ -96,12 +90,13 @@ def downloadAPIData(self): "status": fields[1]} if not self.api_data["status"] == "OK": self.offline() - self.api_data["filename"] = fields[2] - self.api_data["size"] = fields[3] # in bytes - self.api_data["md5"] = fields[4].strip().lower().replace("\n\n", "") # md5 + else: + self.api_data["filename"] = fields[2] + self.api_data["size"] = fields[3] # in bytes + self.api_data["md5"] = fields[4].strip().lower().replace("\n\n", "") # md5 def handleFree(self): - self.downloadAPIData() + self.loadAPIData() self.pyfile.name = self.api_data["filename"] self.pyfile.size = int(self.api_data["size"]) @@ -115,7 +110,7 @@ def handleFree(self): found = re.search(r'var wait=(\d+);', self.html) recaptcha = ReCaptcha(self) - for i in range(5): + for _ in xrange(5): challenge, response = recaptcha.challenge("6LdatrsSAAAAAHZrB70txiV5p-8Iv8BtVxlTtjKX") self.setWait(int(found.group(1)) if found else 30) response = self.load("%s/free/captcha/%d" % (self.pyfile.url, int(time() * 1000)), post={ @@ -125,7 +120,6 @@ def handleFree(self): if not response == '0': break - else: self.fail("No valid captcha solution received") @@ -146,29 +140,7 @@ def handleFree(self): elif check == "fail": self.retry(5, 300, "Download failed") - def checkErrors(self): - found = re.search(r"/failure/(.*?)/1", self.req.lastEffectiveURL) - if found: - err = found.group(1) - found = re.search(self.ERROR_INFO_PATTERN, self.html) - msg = found.group(1) if found else "" - self.logError(err, msg or "Unknown error occurred") - - if err in ('freelimit', 'size', 'proxy'): - self.fail(msg or "Premium account needed") - if err in 'invalid': - self.fail(msg or "File not available") - elif err in 'server': - self.setWait(600, False) - elif err in 'expired': - self.setWait(30, False) - else: - self.setWait(300, True) - - self.wait() - self.retry(max_tries=25, reason=msg) - - def handleAPIPremium(self): # should be working better + def handlePremium(self): # should be working better loading (account) api internally self.account.getAccountInfo(self.user, True) src = self.load("http://api.share-online.biz/account.php", {"username": self.user, "password": self.account.accounts[self.user]["password"], @@ -182,28 +154,38 @@ def handleAPIPremium(self): # should be working better self.logDebug(dlinfo) if not dlinfo["status"] == "online": self.offline() + else: + self.pyfile.name = dlinfo["name"] + self.pyfile.size = int(dlinfo["size"]) - self.pyfile.name = dlinfo["name"] - self.pyfile.size = int(dlinfo["size"]) + dlLink = dlinfo["url"] + if dlLink == "server_under_maintenance": + self.tempOffline() + else: + self.multiDL = True + self.download(dlLink) - dlLink = dlinfo["url"] - if dlLink == "server_under_maintenance": - self.tempoffline() + def checkErrors(self): + found = re.search(r"/failure/(.*?)/1", self.req.lastEffectiveURL) + if not found: + return + + err = found.group(1) + found = re.search(self.ERROR_INFO_PATTERN, self.html) + msg = found.group(1) if found else "" + self.logError(err, msg or "Unknown error occurred") + + if err in ('invalid'): + self.fail(msg or "File not available") + elif err in ('freelimit', 'size', 'proxy'): + self.fail(msg or "Premium account needed") else: - self.multiDL = True - self.download(dlLink) - - def checksum(self, local_file): - if self.api_data and "md5" in self.api_data and self.api_data["md5"]: - h = hashlib.md5() - f = open(local_file, "rb") - h.update(f.read()) - f.close() - hexd = h.hexdigest() - if hexd == self.api_data["md5"]: - return True, 0 + if err in 'server': + self.setWait(600, False) + elif err in 'expired': + self.setWait(30, False) else: - return False, 1 - else: - self.logWarning("MD5 checksum missing") - return True, 5 + self.setWait(300, True) + + self.wait() + self.retry(max_tries=25, reason=msg) From 41382d0151d7ce2ac89129717c9dc6d66cb384c3 Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 9 Jan 2014 12:03:28 +0100 Subject: [PATCH 0009/3774] Uptobox: fixed premium expire detection See #423 --- module/plugins/accounts/UptoboxCom.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index 7fc62694a2..92807439ee 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -11,3 +11,5 @@ class UptoboxCom(XFSPAccount): __author_mail__ = ("zoidberg@mujmail.cz") MAIN_PAGE = "http://uptobox.com/" + + VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire: ([^<]+)' From b1ef1518028f264cf3429f0fb490f7eaf27dffd3 Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 9 Jan 2014 12:04:24 +0100 Subject: [PATCH 0010/3774] Uptobox: version increased after 41382d0 --- module/plugins/accounts/UptoboxCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index 92807439ee..17ca81f68a 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -4,7 +4,7 @@ class UptoboxCom(XFSPAccount): __name__ = "UptoboxCom" - __version__ = "0.01" + __version__ = "0.02" __type__ = "account" __description__ = """DDLStorage.com account plugin""" __author_name__ = ("zoidberg") From 5a8697f05355fde265337784804a81a60365c33e Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 9 Jan 2014 12:22:31 +0100 Subject: [PATCH 0011/3774] XFileSharingPro: improved DIRECT_LINK_PATTERN to fix #423 --- module/plugins/hoster/XFileSharingPro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index d6fb313078..1fb0cf96c6 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -36,7 +36,7 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.23" + __version__ = "0.24" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -101,7 +101,7 @@ def prepare(self): if not hasattr(self, "HOSTER_NAME"): self.HOSTER_NAME = re.search(self.__pattern__, self.pyfile.url).group(1) if not hasattr(self, "DIRECT_LINK_PATTERN"): - self.DIRECT_LINK_PATTERN = r'(http://([^/]*?%s|\d+\.\d+\.\d+\.\d+)(:\d+/d/|(?:/files)?/\d+/\w+/)[^"\'<]+)' % self.HOSTER_NAME + self.DIRECT_LINK_PATTERN = r'(http://([^/]*?%s|\d+\.\d+\.\d+\.\d+)(:\d+)?(/d/|(?:/files)?/\d+/\w+/)[^"\'<]+)' % self.HOSTER_NAME self.captcha = self.errmsg = None self.passwords = self.getPassword().splitlines() From fb630e7ffcc3d36dedcae7e14bc77b4a8098f03e Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 9 Jan 2014 12:23:00 +0100 Subject: [PATCH 0012/3774] Uptobox: fixed file info retrieve See #423 --- module/plugins/hoster/UptoboxCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index fe05bf9162..420610ee40 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -6,12 +6,12 @@ class UptoboxCom(XFileSharingPro): __name__ = "UptoboxCom" __type__ = "hoster" __pattern__ = r"http://(?:\w*\.)*?uptobox.com/\w{12}" - __version__ = "0.06" + __version__ = "0.07" __description__ = """Uptobox.com hoster plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - FILE_INFO_PATTERN = r'

\s*Download File\s*]*>(?P[^>]+)

\s*[^\(]*\((?P[^\)]+)\)' + FILE_INFO_PATTERN = r'
(?P.+) \((?P[^)]+)\)
' FILE_OFFLINE_PATTERN = r'
File Not Found
' HOSTER_NAME = "uptobox.com" From 83ef7f55716ff7fe5b067c6109e51d2e6a82b499 Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 9 Jan 2014 13:53:55 +0100 Subject: [PATCH 0013/3774] Depositfiles: added dfiles.ru domain May fix #461 --- module/plugins/hoster/DepositfilesCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index 99c0d13a19..81458ac629 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -10,8 +10,8 @@ class DepositfilesCom(SimpleHoster): __name__ = "DepositfilesCom" __type__ = "hoster" - __pattern__ = r"https?://[\w\.]*?(depositfiles\.com|dfiles\.eu)(/\w{1,3})?/files/[\w]+" - __version__ = "0.45" + __pattern__ = r"https?://[\w\.]*?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/[\w]+" + __version__ = "0.46" __description__ = """Depositfiles.com Download Hoster""" __author_name__ = ("spoob", "zoidberg") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz") From c2886928e0e17d2e6252d0af500dea7e27eea53c Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 9 Jan 2014 17:12:34 +0100 Subject: [PATCH 0014/3774] Filefactory: added offline pattern --- module/plugins/hoster/FilefactoryCom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index 8d98140070..b12f1b9df3 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -24,13 +24,14 @@ class FilefactoryCom(SimpleHoster): __name__ = "FilefactoryCom" __type__ = "hoster" __pattern__ = r"https?://(?:www\.)?filefactory\.com/file/(?P[a-zA-Z0-9]+)" - __version__ = "0.44" + __version__ = "0.45" __description__ = """Filefactory.Com File Download Hoster""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") FILE_INFO_PATTERN = r'
]*>\s*

(?P[^<]+)

\s*
\s*(?P[\d.]+) (?P\w+) uploaded' DIRECT_LINK_PATTERN = r'' + FILE_OFFLINE_PATTERN = r'

File Removed

' def handleFree(self): self.html = self.load(self.pyfile.url, decode=True) From 97f1a5ddabdb168fcacd36cfca2ca9f89c8d5bb0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 10 Jan 2014 00:12:55 +0100 Subject: [PATCH 0015/3774] Hoster: ExtabitCom: Fix offline pattern + code cosmetics --- module/plugins/hoster/ExtabitCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index f68627b561..0678185ed9 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -26,14 +26,14 @@ class ExtabitCom(SimpleHoster): __name__ = "ExtabitCom" __type__ = "hoster" - __pattern__ = r"http://(\w+\.)*extabit\.com/(file|go|fid)/(?P\w+)" - __version__ = "0.4" + __pattern__ = r"http://(?:www\.)?extabit\.com/(file|go|fid)/(?P\w+)" + __version__ = "0.5" __description__ = """Extabit.com""" __author_name__ = ("zoidberg") FILE_NAME_PATTERN = r'File:\s*\s*
' FILE_SIZE_PATTERN = r'Size:\s*(?P[^<]+)' - FILE_OFFLINE_PATTERN = r'

File not found

' + FILE_OFFLINE_PATTERN = r'>File not found<' TEMP_OFFLINE_PATTERN = r">(File is temporary unavailable|No download mirror)<" DOWNLOAD_LINK_PATTERN = r'[\'"](http://guest\d+\.extabit\.com/[a-z0-9]+/.*?)[\'"]' @@ -59,7 +59,7 @@ def handleFree(self): recaptcha = ReCaptcha(self) captcha_key = m.group(1) - for i in range(5): + for _ in xrange(5): get_data = {"type": "recaptcha"} get_data["challenge"], get_data["capture"] = recaptcha.challenge(captcha_key) response = json_loads(self.load("http://extabit.com/file/%s/" % fileID, get=get_data)) From 6deb27fdf190191160eab39c682d3acf472edb97 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 10 Jan 2014 11:10:00 +0100 Subject: [PATCH 0016/3774] New crypter: TnyCz Merged #466 --- module/plugins/crypter/TnyCz.py | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 module/plugins/crypter/TnyCz.py diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py new file mode 100644 index 0000000000..d393507c7f --- /dev/null +++ b/module/plugins/crypter/TnyCz.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . + + @author: Walter Purcaro +""" + +from module.plugins.internal.SimpleCrypter import SimpleCrypter + +import re + + +class TnyCz(SimpleCrypter): + __name__ = "TnyCz" + __type__ = "crypter" + __pattern__ = r"http://(?:www\.)?tny\.cz/\w+" + __version__ = "0.01" + __description__ = """Tny.cz Plugin""" + __author_name__ = ("Walter Purcaro") + __author_mail__ = ("vuolter@gmail.com") + + TITLE_PATTERN = r'(?P<title>.+) - .+' + + def getLinks(self): + m = re.search(r'', self.html) + return re.findall(".+", self.load(m.group(1), decode=True)) if m else None From 119af0fdf45ad12995ddda9a7b7410c1d62db211 Mon Sep 17 00:00:00 2001 From: Stefano Date: Fri, 10 Jan 2014 11:56:33 +0100 Subject: [PATCH 0017/3774] Keep2share: fixed #450 --- module/plugins/hoster/Keep2shareCC.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/module/plugins/hoster/Keep2shareCC.py b/module/plugins/hoster/Keep2shareCC.py index 29e40bc7f9..323ee09caf 100644 --- a/module/plugins/hoster/Keep2shareCC.py +++ b/module/plugins/hoster/Keep2shareCC.py @@ -19,6 +19,7 @@ # http://k2s.cc/file/527111edfb9ba/random.bin import re +from urlparse import urlparse, urljoin from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.plugins.internal.CaptchaService import ReCaptcha @@ -28,7 +29,7 @@ class Keep2shareCC(SimpleHoster): __name__ = "Keep2shareCC" __type__ = "hoster" __pattern__ = r"https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P\w+)" - __version__ = "0.07" + __version__ = "0.08" __description__ = """Keep2share.cc hoster plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") @@ -42,27 +43,27 @@ class Keep2shareCC(SimpleHoster): RECAPTCHA_KEY = '6LcYcN0SAAAAABtMlxKj7X0hRxOY8_2U86kI1vbb' - FILE_URL_REPLACEMENTS = [(__pattern__, r"http://keep2share.cc/file/\g")] - def handleFree(self): + self.sanitize_url() + self.html = self.load(self.pyfile.url) + self.fid = re.search(r'', self.html).group(1) self.html = self.load(self.pyfile.url, post={'yt0': '', 'slow_id': self.fid}) m = re.search(r"function download\(\){.*window\.location\.href = '([^']+)';", self.html, re.DOTALL) if m: # Direct mode - self.startDownload("http://www.keep2share.cc" + m.group(1)) + self.startDownload(m.group(1)) else: self.handleCaptcha() - self.setWait(30) - self.wait() + self.wait(30) self.html = self.load(self.pyfile.url, post={'uniqueId': self.fid, 'free': 1}) m = re.search(self.DIRECT_LINK_PATTERN, self.html) if not m: self.parseError("Unable to detect direct link") - self.startDownload('http://keep2share.cc' + m.group(1)) + self.startDownload(m.group(1)) def handleCaptcha(self): recaptcha = ReCaptcha(self) @@ -88,8 +89,16 @@ def handleCaptcha(self): self.fail("All captcha attempts failed") def startDownload(self, url): - self.logDebug('Direct Link: ' + url) - self.download(url, disposition=True) + d = urljoin(self.base_url, url) + self.logDebug('Direct Link: ' + d) + self.download(d, disposition=True) + + def sanitize_url(self): + header = self.load(self.pyfile.url, just_header=True) + if 'location' in header: + self.pyfile.url = header['location'] + p = urlparse(self.pyfile.url) + self.base_url = "%s://%s" % (p.scheme, p.hostname) getInfo = create_getInfo(Keep2shareCC) From 22fe027409eb639d7a3494dd7d1ab7d4ea4a14e9 Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 11 Jan 2014 14:44:13 +0100 Subject: [PATCH 0018/3774] TurbobitNetFolder: fixed #471 Merged with fixes #472 --- module/plugins/crypter/TurbobitNetFolder.py | 39 +++++++++------------ 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index e172f8037a..bec5a44803 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -15,7 +15,7 @@ # along with this program. If not, see . # ############################################################################ -import math +from math import ceil import re from module.plugins.internal.SimpleCrypter import SimpleCrypter @@ -29,32 +29,27 @@ def format_links(fid): class TurbobitNetFolder(SimpleCrypter): __name__ = "TurbobitNetFolder" __type__ = "crypter" - __pattern__ = r"http://(?:w{3}.)?turbobit\.net/download/folder/(?P\w+)" - __version__ = "0.01" + __pattern__ = r"http://(?:www\.)?turbobit\.net/download/folder/(?P\w+)" + __version__ = "0.02" __description__ = """Turbobit.net Folder Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = ("stickell", "Walter Purcaro") + __author_mail__ = ("l.stickell@yahoo.it", "vuolter@gmail.com") - TITLE_PATTERN = r"(?P.+)</div>" + TITLE_PATTERN = r"src='/js/lib/grid/icon/folder.png'> <span>(?P<title>.+?)</span>" - def getLinks(self): - folder_id = re.search(self.__pattern__, self.pyfile.url).group('id') - grid = self.load('http://turbobit.net/downloadfolder/gridFile', - get={'id_folder': folder_id, 'rows': 200}, decode=True) - grid = json_loads(grid) + def _getLinks(self, id, page=1): + gridFile = self.load('http://turbobit.net/downloadfolder/gridFile', + get={'rootId': id, 'rows': 200, 'page': page}, decode=True) + grid = json_loads(gridFile) - links_count = grid["records"] - pages = int(math.ceil(links_count / 200.0)) + pages = int(ceil(grid["records"] / 200.0)) - ids = list() for i in grid['rows']: - ids.append(i['id']) + yield i['id'] - for p in range(2, pages + 1): - grid = self.load('http://turbobit.net/downloadfolder/gridFile', - get={'id_folder': folder_id, 'rows': 200, 'page': p}, decode=True) - grid = json_loads(grid) - for i in grid['rows']: - ids.append(i['id']) + if page < pages: + self._getLinks(id, page + 1) - return map(format_links, ids) + def getLinks(self): + folder_id = re.match(self.__pattern__, self.pyfile.url).group('ID') + return map(format_links, self._getLinks(folder_id)) From 48deeb026f024dc68f11bd951bf586d5f0ffb0cf Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Wed, 15 Jan 2014 10:57:27 +0100 Subject: [PATCH 0019/3774] New hoster: FileStoreTo Fixes #129 Merges #480 --- module/plugins/hoster/FileStoreTo.py | 48 ++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 module/plugins/hoster/FileStoreTo.py diff --git a/module/plugins/hoster/FileStoreTo.py b/module/plugins/hoster/FileStoreTo.py new file mode 100644 index 0000000000..1a314947ba --- /dev/null +++ b/module/plugins/hoster/FileStoreTo.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. + + @author: Walter Purcaro +""" + +import re + +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class FileStoreTo(SimpleHoster): + __name__ = "FileStoreTo" + __type__ = "hoster" + __pattern__ = r"http://(www\.)?filestore\.to/\?d=(?P<ID>\w+)" + __version__ = "0.01" + __description__ = """FileStore.to download hoster""" + __author_name__ = ("Walter Purcaro", "stickell") + __author_mail__ = ("vuolter@gmail.com", "l.stickell@yahoo.it") + + FILE_INFO_PATTERN = r'File: <span[^>]*>(?P<N>.+)</span><br />Size: (?P<S>[\d,.]+) (?P<U>\w+)' + FILE_OFFLINE_PATTERN = r'>Download-Datei wurde nicht gefunden<' + + def setup(self): + self.resumeDownload = self.multiDL = True + + def handleFree(self): + self.wait(10) + ldc = re.search(r'wert="(\w+)"', self.html).group(1) + link = self.load("http://filestore.to/ajax/download.php", get={"LDC": ldc}) + self.logDebug("Download link = " + link) + self.download(link) + + +getInfo = create_getInfo(FileStoreTo) From 0512d40e3810aa654a5db89e021b2466e7a6c162 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Wed, 15 Jan 2014 11:23:05 +0100 Subject: [PATCH 0020/3774] Filefactory: fixed premium (without direct) mode. --- module/plugins/hoster/FilefactoryCom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index b12f1b9df3..90b844b9f8 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -24,13 +24,13 @@ class FilefactoryCom(SimpleHoster): __name__ = "FilefactoryCom" __type__ = "hoster" __pattern__ = r"https?://(?:www\.)?filefactory\.com/file/(?P<id>[a-zA-Z0-9]+)" - __version__ = "0.45" + __version__ = "0.46" __description__ = """Filefactory.Com File Download Hoster""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") FILE_INFO_PATTERN = r'<div id="file_name"[^>]*>\s*<h2>(?P<N>[^<]+)</h2>\s*<div id="file_info">\s*(?P<S>[\d.]+) (?P<U>\w+) uploaded' - DIRECT_LINK_PATTERN = r'<section id="downloadLink">\s*<p class="textAlignCenter">\s*<a href="([^"]+)">[^<]+</a>\s*</p>\s*</section>' + DIRECT_LINK_PATTERN = r'<a href="(https?://[^"]+)"[^>]*><i[^>]*></i> Download with FileFactory Premium</a>' FILE_OFFLINE_PATTERN = r'<h2>File Removed</h2>' def handleFree(self): @@ -92,6 +92,7 @@ def handlePremium(self): elif 'content-disposition' in header: url = self.pyfile.url else: + self.logInfo('You could enable "Direct Downloads" on http://filefactory.com/account/') html = self.load(self.pyfile.url) found = re.search(self.DIRECT_LINK_PATTERN, html) if found: From 834fffc4baa7379a21ab7d10712d1360f236c7ed Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Wed, 15 Jan 2014 11:30:39 +0100 Subject: [PATCH 0021/3774] YoutubeBatch: Completed rewriting Fixes #458 Merges #479 --- module/plugins/crypter/YoutubeBatch.py | 166 +++++++++++++++---------- 1 file changed, 101 insertions(+), 65 deletions(-) diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py index ee84f05280..696f3927e8 100644 --- a/module/plugins/crypter/YoutubeBatch.py +++ b/module/plugins/crypter/YoutubeBatch.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- """ @@ -18,98 +17,135 @@ @author: Walter Purcaro """ +from urlparse import urljoin import re -import json +from module.common.json_layer import json_loads from module.plugins.Crypter import Crypter -from os.path import join +from module.utils import save_join API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" class YoutubeBatch(Crypter): __name__ = "YoutubeBatch" - __type__ = "container" - __pattern__ = r"https?://(?:[^/]*?)youtube\.com/(?:(view_play_list|playlist|.*?feature=PlayList|user)(?:.*?[?&](?:list|p)=|/))([a-zA-Z0-9-_]+)" - __version__ = "0.94" - __description__ = """Youtube.com Channel Download Plugin""" - __author_name__ = ("RaNaN", "Spoob", "zoidberg", "roland", "Walter Purcaro") - __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "zoidberg@mujmail.cz", "roland@enkore.de", "vuolter@gmail.com") - - def json_response(self, api, req): + __type__ = "crypter" + __pattern__ = r"https?://(?:www\.)?(m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)" + __version__ = "1.00" + __description__ = """Youtube.com channel & playlist decrypter""" + __config__ = [("likes", "bool", "Grab user (channel) liked videos", "False"), + ("favorites", "bool", "Grab user (channel) favorite videos", "False"), + ("uploads", "bool", "Grab channel unplaylisted videos", "True")] + __author_name__ = ("Walter Purcaro") + __author_mail__ = ("vuolter@gmail.com") + + def api_response(self, ref, req): req.update({"key": API_KEY}) - url = "https://www.googleapis.com/youtube/v3/" + api + url = urljoin("https://www.googleapis.com/youtube/v3/", ref) page = self.load(url, get=req) - return json.loads(page) - - def get_playlist_baseinfos(self, playlist_id): - res = self.json_response("playlists", {"part": "snippet", "id": playlist_id}) - - snippet = res["items"][0]["snippet"] - playlist_name = snippet["title"] - channel_title = snippet["channelTitle"] - return playlist_name, channel_title - - def get_channel_id(self, user_name): - res = self.json_response("channels", {"part": "id", "forUsername": user_name}) - return res["items"][0]["id"] - - def get_playlists(self, user_name, token=None): - channel_id = self.get_channel_id(user_name) - req = {"part": "id", "maxResults": "50", "channelId": channel_id} + return json_loads(page) + + def getChannel(self, user): + channels = self.api_response("channels", {"part": "id,snippet,contentDetails", "forUsername": user, "maxResults": "50"}) + if channels["items"]: + channel = channels["items"][0] + return {"id": channel["id"], + "title": channel["snippet"]["title"], + "relatedPlaylists": channel["contentDetails"]["relatedPlaylists"], + "user": user} # One lone channel for user? + + def getPlaylist(self, p_id): + playlists = self.api_response("playlists", {"part": "snippet", "id": p_id}) + if playlists["items"]: + playlist = playlists["items"][0] + return {"id": p_id, + "title": playlist["snippet"]["title"], + "channelId": playlist["snippet"]["channelId"], + "channelTitle": playlist["snippet"]["channelTitle"]} + + def _getPlaylists(self, id, token=None): + req = {"part": "id", "maxResults": "50", "channelId": id} if token: req.update({"pageToken": token}) - res = self.json_response("playlists", req) - for item in res["items"]: - yield item["id"] + playlists = self.api_response("playlists", req) + + for playlist in playlists["items"]: + yield playlist["id"] - if "nextPageToken" in res: - for item in self.get_playlists(user_name, res["nextPageToken"]): + if "nextPageToken" in playlists: + for item in self._getPlaylists(id, playlists["nextPageToken"]): yield item - def get_videos(self, playlist_id, token=None): - req = {"part": "snippet", "maxResults": "50", "playlistId": playlist_id} + def getPlaylists(self, ch_id): + return map(self.getPlaylist, self._getPlaylists(ch_id)) + + def _getVideosId(self, id, token=None): + req = {"part": "contentDetails", "maxResults": "50", "playlistId": id} if token: req.update({"pageToken": token}) - res = self.json_response("playlistItems", req) - for item in res["items"]: - yield "http://youtube.com/watch?v=" + item["snippet"]["resourceId"]["videoId"] + playlist = self.api_response("playlistItems", req) - if "nextPageToken" in res: - for item in self.get_videos(playlist_id, res["nextPageToken"]): + for item in playlist["items"]: + yield item["contentDetails"]["videoId"] + + if "nextPageToken" in playlist: + for item in self._getVideosId(id, playlist["nextPageToken"]): yield item + def getVideosId(self, p_id): + return list(self._getVideosId(p_id)) + def decrypt(self, pyfile): - match_obj = re.match(self.__pattern__, pyfile.url) - match_type, match_result = match_obj.group(1), match_obj.group(2) - playlist_ids = [] - - #: is a channel username or just a playlist id? - if match_type == "user": - ids = self.get_playlists(match_result) - playlist_ids.extend(ids) + match = re.match(self.__pattern__, pyfile.url) + m_id = match.group("ID") + m_type = match.group("TYPE") + + if m_type == "user": + self.logDebug("Url recognized as Channel") + user = m_id + channel = self.getChannel(user) + + if channel: + playlists = self.getPlaylists(channel["id"]) + self.logDebug("%s playlist\s found on channel \"%s\"" % (len(playlists), channel["title"])) + + relatedplaylist = {p_name: self.getPlaylist(p_id) for p_name, p_id in channel["relatedPlaylists"].iteritems()} + self.logDebug("Channel's related playlists found = %s" % relatedplaylist.keys()) + + relatedplaylist["uploads"]["title"] = "Unplaylisted videos" + relatedplaylist["uploads"]["checkDups"] = True #: checkDups flag + + for p_name, p_data in relatedplaylist.iteritems(): + if self.getConfig(p_name): + p_data["title"] += " of " + user + playlists.append(p_data) + else: + playlists = [] else: - playlist_ids.append(match_result) - - self.logDebug("Playlist IDs = %s" % playlist_ids) - - if not playlist_ids: - self.fail("Wrong url") - - for id in playlist_ids: - self.logDebug("Processing playlist id: %s" % id) + self.logDebug("Url recognized as Playlist") + playlists = [self.getPlaylist(m_id)] - playlist_name, channel_title = self.get_playlist_baseinfos(id) - video_links = [x for x in self.get_videos(id)] + if not playlists: + self.fail("No playlist available") - self.logInfo("%s videos found on playlist \"%s\" (channel \"%s\")" % (len(video_links), playlist_name, channel_title)) + addedvideos = [] + urlize = lambda x: "https://www.youtube.com/watch?v=" + x + for p in playlists: + p_name = p["title"] + p_videos = self.getVideosId(p["id"]) + p_folder = save_join(self.config['general']['download_folder'], p["channelTitle"], p_name) + self.logDebug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) - if not video_links: + if not p_videos: continue + elif "checkDups" in p: + p_urls = [urlize(v_id) for v_id in p_videos if v_id not in addedvideos] + self.logDebug("%s video\s available on playlist \"%s\" after duplicates cleanup" % (len(p_urls), p_name)) + else: + p_urls = map(urlize, p_videos) - self.logDebug("Video links = %s" % video_links) + self.packages.append((p_name, p_urls, p_folder)) #: folder is NOT recognized by pyload 0.4.9! - folder = join(self.config['general']['download_folder'], channel_title, playlist_name) - self.packages.append((playlist_name, video_links, folder)) #Note: folder is NOT used actually! + addedvideos.extend(p_videos) From 2f3dd24356c7613c30b38303098b1986bbeb6334 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Wed, 15 Jan 2014 11:39:10 +0100 Subject: [PATCH 0022/3774] New crypter: DailymotionBatch Meges #469 --- module/plugins/crypter/DailymotionBatch.py | 111 +++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 module/plugins/crypter/DailymotionBatch.py diff --git a/module/plugins/crypter/DailymotionBatch.py b/module/plugins/crypter/DailymotionBatch.py new file mode 100644 index 0000000000..1427bdc133 --- /dev/null +++ b/module/plugins/crypter/DailymotionBatch.py @@ -0,0 +1,111 @@ +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. + + @author: Walter Purcaro +""" + +from urlparse import urljoin +import re + +from module.common.json_layer import json_loads +from module.plugins.Crypter import Crypter +from module.utils import save_join + + +class DailymotionBatch(Crypter): + __name__ = "DailymotionBatch" + __type__ = "crypter" + __pattern__ = r"https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)" + __version__ = "0.01" + __description__ = """Dailymotion channel & playlist decrypter""" + __author_name__ = ("Walter Purcaro") + __author_mail__ = ("vuolter@gmail.com") + + def api_response(self, ref, req=None): + url = urljoin("https://api.dailymotion.com/", ref) + page = self.load(url, get=req) + return json_loads(page) + + def getPlaylistInfo(self, id): + ref = "playlist/" + id + req = {"fields": "name,owner.screenname"} + playlist = self.api_response(ref, req) + + if "error" in playlist: + return + + name = playlist["name"] + owner = playlist["owner.screenname"] + return name, owner + + def _getPlaylists(self, user_id, page=1): + ref = "user/%s/playlists" % user_id + req = {"fields": "id", "page": page, "limit": 100} + user = self.api_response(ref, req) + + if "error" in user: + return + + for playlist in user["list"]: + yield playlist["id"] + + if user["has_more"]: + for item in self._getPlaylists(user_id, page + 1): + yield item + + def getPlaylists(self, user_id): + return [(id,) + self.getPlaylistInfo(id) for id in self._getPlaylists(user_id)] + + def _getVideos(self, id, page=1): + ref = "playlist/%s/videos" % id + req = {"fields": "url", "page": page, "limit": 100} + playlist = self.api_response(ref, req) + + if "error" in playlist: + return + + for video in playlist["list"]: + yield video["url"] + + if playlist["has_more"]: + for item in self._getVideos(id, page + 1): + yield item + + def getVideos(self, playlist_id): + return list(self._getVideos(playlist_id))[::-1] + + def decrypt(self, pyfile): + m = re.match(self.__pattern__, pyfile.url) + m_id = m.group("ID") + m_type = m.group("TYPE") + + if m_type == "playlist": + self.logDebug("Url recognized as Playlist") + p_info = self.getPlaylistInfo(m_id) + playlists = [(m_id,) + p_info] if p_info else None + else: + self.logDebug("Url recognized as Channel") + playlists = self.getPlaylists(m_id) + self.logDebug("%s playlist\s found on channel \"%s\"" % (len(playlists), m_id)) + + if not playlists: + self.fail("No playlist available") + + for p_id, p_name, p_owner in playlists: + p_videos = self.getVideos(p_id) + p_folder = save_join(self.config['general']['download_folder'], p_owner, p_name) + self.logDebug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name)) + self.packages.append((p_name, p_videos, p_folder)) #: folder is NOT recognized by pyload 0.4.9! From 089ed7073cd438f9994c990ec640502e6c043cdb Mon Sep 17 00:00:00 2001 From: peekayy <peekayy.dev@gmail.com> Date: Wed, 15 Jan 2014 11:51:37 +0100 Subject: [PATCH 0023/3774] New hoster: SoundcloudCom Merges #478 --- module/plugins/hoster/SoundcloudCom.py | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 module/plugins/hoster/SoundcloudCom.py diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py new file mode 100644 index 0000000000..7e6d162362 --- /dev/null +++ b/module/plugins/hoster/SoundcloudCom.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- + +import re +import pycurl + +from module.plugins.Hoster import Hoster + + +class SoundcloudCom(Hoster): + __name__ = "SoundcloudCom" + __type__ = "hoster" + __pattern__ = r"https?://(?:www\.)?soundcloud\.com/(?P<UID>.*?)/(?P<SID>.*)" + __version__ = "0.1" + __description__ = """SoundCloud.com audio download hoster""" + __author_name__ = ("Peekayy") + __author_mail__ = ("peekayy.dev@gmail.com") + + def process(self, pyfile): + # default UserAgent of HTTPRequest fails for this hoster so we use this one + self.req.http.c.setopt(pycurl.USERAGENT, 'Mozilla/5.0') + page = self.load(pyfile.url) + match = re.search(r'<div class="haudio.*?large.*?" data-sc-track="(?P<ID>[0-9]*)"', page) + songId = clientId = "" + if match: + songId = match.group("ID") + if len(songId) <= 0: + self.logError("Could not find song id") + self.offline() + else: + match = re.search(r'"clientID":"(?P<CID>.*?)"', page) + if match: + clientId = match.group("CID") + + if len(clientId) <= 0: + clientId = "b45b1aa10f1ac2941910a7f0d10f8e28" + + match = re.search(r'<em itemprop="name">\s(?P<TITLE>.*?)\s</em>', page) + if match: + pyfile.name = match.group("TITLE") + ".mp3" + else: + pyfile.name = re.match(self.__pattern__, pyfile.url).group("SID") + ".mp3" + + # url to retrieve the actual song url + page = self.load("https://api.sndcdn.com/i1/tracks/%s/streams" % songId, get={"client_id": clientId}) + # getting streams + # for now we choose the first stream found in all cases + # it could be improved if relevant for this hoster + streams = [ + (result.group("QUALITY"), result.group("URL")) + for result in re.finditer(r'"(?P<QUALITY>.*?)":"(?P<URL>.*?)"', page) + ] + self.logDebug("Found Streams", streams) + self.logDebug("Downloading", streams[0][0], streams[0][1]) + self.download(streams[0][1]) From cd9aebb7ed4e742fe17b09e0886341367662b2c7 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Thu, 16 Jan 2014 13:36:16 +0100 Subject: [PATCH 0024/3774] SimpleHoster: improved PREMIUM_ONLY process Usually premium only pages doesn't show the file information so trying to get them would raise an exception. --- module/plugins/internal/SimpleHoster.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 47fded2601..46d0a95170 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -163,7 +163,7 @@ def __str__(self): class SimpleHoster(Hoster): __name__ = "SimpleHoster" - __version__ = "0.32" + __version__ = "0.33" __pattern__ = None __type__ = "hoster" __description__ = """Base hoster plugin""" @@ -202,14 +202,17 @@ def process(self, pyfile): # Due to a 0.4.9 core bug self.load would keep previous cookies even if overridden by cookies parameter. # Workaround using getURL. Can be reverted in 0.5 as the cookies bug has been fixed. self.html = getURL(pyfile.url, decode=not self.SH_BROKEN_ENCODING, cookies=self.SH_COOKIES) - self.getFileInfo() + premium_only = hasattr(self, 'PREMIUM_ONLY_PATTERN') and re.search(self.PREMIUM_ONLY_PATTERN, self.html) + if not premium_only: # Usually premium only pages doesn't show the file information + self.getFileInfo() + if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()): self.handlePremium() + elif premium_only: + self.fail("This link require a premium account") else: # This line is required due to the getURL workaround. Can be removed in 0.5 self.html = self.load(pyfile.url, decode=not self.SH_BROKEN_ENCODING, cookies=self.SH_COOKIES) - if hasattr(self, 'PREMIUM_ONLY_PATTERN') and re.search(self.PREMIUM_ONLY_PATTERN, self.html): - self.fail("This link require a premium account") self.handleFree() def load(self, url, get={}, post={}, ref=True, cookies=True, just_header=False, decode=False): From 145602cde43f99aa704b8a2e01cb0b1852938565 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Thu, 16 Jan 2014 13:36:54 +0100 Subject: [PATCH 0025/3774] Filefactory: added PREMIUM_ONLY_PATTERN --- module/plugins/hoster/FilefactoryCom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index 90b844b9f8..37987059b2 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -24,7 +24,7 @@ class FilefactoryCom(SimpleHoster): __name__ = "FilefactoryCom" __type__ = "hoster" __pattern__ = r"https?://(?:www\.)?filefactory\.com/file/(?P<id>[a-zA-Z0-9]+)" - __version__ = "0.46" + __version__ = "0.47" __description__ = """Filefactory.Com File Download Hoster""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") @@ -32,6 +32,7 @@ class FilefactoryCom(SimpleHoster): FILE_INFO_PATTERN = r'<div id="file_name"[^>]*>\s*<h2>(?P<N>[^<]+)</h2>\s*<div id="file_info">\s*(?P<S>[\d.]+) (?P<U>\w+) uploaded' DIRECT_LINK_PATTERN = r'<a href="(https?://[^"]+)"[^>]*><i[^>]*></i> Download with FileFactory Premium</a>' FILE_OFFLINE_PATTERN = r'<h2>File Removed</h2>' + PREMIUM_ONLY_PATTERN = r'>Premium Account Required<' def handleFree(self): self.html = self.load(self.pyfile.url, decode=True) From 56d728540dcfa8b7f74622731b34675a4e99e0ee Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Thu, 16 Jan 2014 13:58:32 +0100 Subject: [PATCH 0026/3774] UploadingCom: updated patterns Fixes #462 --- module/plugins/hoster/UploadingCom.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py index 1da5714600..c8ca2169c5 100644 --- a/module/plugins/hoster/UploadingCom.py +++ b/module/plugins/hoster/UploadingCom.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- + """ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ import re from pycurl import HTTPHEADER + from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp from module.common.json_layer import json_loads @@ -27,14 +28,14 @@ class UploadingCom(SimpleHoster): __name__ = "UploadingCom" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>[\w\d]+)" - __version__ = "0.33" + __version__ = "0.34" __description__ = """Uploading.Com File Download Hoster""" __author_name__ = ("jeix", "mkaay", "zoidberg") __author_mail__ = ("jeix@hasnomail.de", "mkaay@mkaay.de", "zoidberg@mujmail.cz") - FILE_NAME_PATTERN = r'<title>Download (?P<N>.*?) for free on uploading.com' - FILE_SIZE_PATTERN = r'File size: (?P.*?)' - FILE_OFFLINE_PATTERN = r'The requested file is not found' + FILE_NAME_PATTERN = r'id="file_title">(?P.+)(?P[\d.]+) (?P\w+)<' + FILE_OFFLINE_PATTERN = r'Page not found!' def process(self, pyfile): # set lang to english From 4c02adf00b8a7d6abcd2467eaff512f5780c4d7d Mon Sep 17 00:00:00 2001 From: igel-kun Date: Thu, 16 Jan 2014 18:20:56 +0100 Subject: [PATCH 0027/3774] Update FilestubeCom.py --- module/plugins/crypter/FilestubeCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 1e5712cb59..ca6333de4c 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -21,7 +21,7 @@ class FilestubeCom(SimpleCrypter): __name__ = "FilestubeCom" __type__ = "crypter" - __pattern__ = r"http://(?:w{3}.)?filestube\.com/\w+" + __pattern__ = r"http://(?:w{3}.)?filestube\.(?:com|to)/\w+" __version__ = "0.01" __description__ = """Filestube.com Plugin""" __author_name__ = ("stickell") From 046bffc70cb2ea66e3d7e24e426e5ea99bff1654 Mon Sep 17 00:00:00 2001 From: Stefano Date: Fri, 17 Jan 2014 13:02:13 +0100 Subject: [PATCH 0028/3774] Filestube: version increase after 4c02adf00b8a7d6abcd2467eaff512f5780c4d7d --- module/plugins/crypter/FilestubeCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index ca6333de4c..24e2ca1378 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -22,7 +22,7 @@ class FilestubeCom(SimpleCrypter): __name__ = "FilestubeCom" __type__ = "crypter" __pattern__ = r"http://(?:w{3}.)?filestube\.(?:com|to)/\w+" - __version__ = "0.01" + __version__ = "0.02" __description__ = """Filestube.com Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") From c297f2749efe9e37ecab0965993cc8c8c11e8e59 Mon Sep 17 00:00:00 2001 From: igel-kun Date: Sat, 18 Jan 2014 15:28:37 +0100 Subject: [PATCH 0029/3774] XFileSharingPro: * Added 2 hosters * Extended OFFLINE_PATTERN Merged pull request #485 --- module/plugins/hooks/XFileSharingPro.py | 4 ++-- module/plugins/hoster/XFileSharingPro.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index fe2df840d9..7186322930 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -7,7 +7,7 @@ class XFileSharingPro(Hook): __name__ = "XFileSharingPro" - __version__ = "0.06" + __version__ = "0.07" __type__ = "hook" __config__ = [("activated", "bool", "Activated", "True"), ("loadDefault", "bool", "Include default (built-in) hoster list", "True"), @@ -30,7 +30,7 @@ def loadPattern(self): "aieshare.com", "asixfiles.com", "banashare.com", "cyberlocker.ch", "eyesfile.co", "eyesfile.com", "fileband.com", "filedwon.com", "filedownloads.org", "hipfile.com", "kingsupload.com", "mlfat4arab.com", "netuploaded.com", "odsiebie.pl", "q4share.com", "ravishare.com", "uptobox.com", "verzend.be", - "xvidstage.com", + "xvidstage.com", "thefile.me", "sharesix.com", #NOT TESTED: "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", "grupload.com", "heftyfile.com", "host4desi.com", "laoupload.com", "linkzhost.com", "movreel.com", diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index 1fb0cf96c6..5b167c3c96 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -36,7 +36,7 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.24" + __version__ = "0.25" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -44,7 +44,7 @@ class XFileSharingPro(SimpleHoster): FILE_NAME_PATTERN = r'[^<]+ \((?P[^<]+)\)' FILE_INFO_PATTERN = r'Filename:(?P[^<]+)\s*.*?\((?P[^<]+)\)' - FILE_OFFLINE_PATTERN = r'<(b|h[1-6])>File Not Found' + FILE_OFFLINE_PATTERN = r'<(b|h[1-6])>File Not Found|This file has been removed' WAIT_PATTERN = r'.*?>(\d+)' LONG_WAIT_PATTERN = r'(?P\d+(?=\s*hour))?.*?(?P\d+(?=\s*minute))?.*?(?P\d+(?=\s*second))?' From aaa01255c938604a1df090edb570a1df1e7800e2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 17 Feb 2014 22:08:40 +0100 Subject: [PATCH 0030/3774] Hoster: RyushareCom: Free dl fix (thx nomad71) --- module/plugins/hoster/RyushareCom.py | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py index 675eaddde6..77efa00810 100644 --- a/module/plugins/hoster/RyushareCom.py +++ b/module/plugins/hoster/RyushareCom.py @@ -12,11 +12,11 @@ class RyushareCom(XFileSharingPro): __name__ = "RyushareCom" __type__ = "hoster" - __pattern__ = r"http://(?:\w*\.)*?ryushare.com/\w{11,}" - __version__ = "0.13" + __pattern__ = r"http://(?:www\.)?ryushare\.com/\w+" + __version__ = "0.14" __description__ = """ryushare.com hoster plugin""" - __author_name__ = ("zoidberg", "stickell","quareevo") - __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it","quareevo@arcor.de") + __author_name__ = ("zoidberg", "stickell", "quareevo") + __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it", "quareevo@arcor.de") HOSTER_NAME = "ryushare.com" @@ -24,13 +24,6 @@ class RyushareCom(XFileSharingPro): DIRECT_LINK_PATTERN = r'(http://([^/]*?ryushare.com|\d+\.\d+\.\d+\.\d+)(:\d+/d/|/files/\w+/\w+/)[^"\'<]+)' SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"' - def setup(self): - self.resumeDownload = self.multiDL = True - if not self.premium: - self.limitDL = 2 - # Up to 3 chunks allowed in free downloads. Unknown for premium - self.chunkLimit = 3 - def getDownloadLink(self): retry = False self.html = self.load(self.pyfile.url) @@ -42,15 +35,15 @@ def getDownloadLink(self): action, inputs = self.parseHtmlForm('F1') self.setWait(65) - # Wait + # Wait 1 hour if 'You have reached the download-limit!!!' in self.html: - self.setWait(3600, True) + self.setWait(1 * 60 * 60, True) retry = True - + match = re.search(self.WAIT_PATTERN, self.html) if match: m = match.groupdict(0) - waittime = int(m["hour"])*60*60 + int(m['min']) * 60 + int(m['sec']) + waittime = int(m["hour"]) * 60 * 60 + int(m['min']) * 60 + int(m['sec']) self.setWait(waittime, True) retry = True @@ -59,7 +52,6 @@ def getDownloadLink(self): self.retry() for i in xrange(5): - m = re.search(self.SOLVEMEDIA_PATTERN, self.html) if not m: self.parseError("Error parsing captcha") @@ -71,14 +63,13 @@ def getDownloadLink(self): inputs["adcopy_challenge"] = challenge inputs["adcopy_response"] = response - self.html = self.load(self.pyfile.url, post = inputs) + self.html = self.load(self.pyfile.url, post=inputs) if "WRONG CAPTCHA" in self.html: self.invalidCaptcha() self.logInfo("Invalid Captcha") else: self.correctCaptcha() break - else: self.fail("You have entered 5 invalid captcha codes") @@ -86,4 +77,5 @@ def getDownloadLink(self): m = re.search(r'Click here to download', self.html) return m.group(1) + getInfo = create_getInfo(RyushareCom) From 81fc21ea133b26a51f597bccd021b7504373a2a2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jan 2014 18:03:45 +0100 Subject: [PATCH 0031/3774] New crypter MultiUpOrg --- module/plugins/crypter/MultiUpOrg.py | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 module/plugins/crypter/MultiUpOrg.py diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py new file mode 100644 index 0000000000..997d608622 --- /dev/null +++ b/module/plugins/crypter/MultiUpOrg.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- + +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +# @author: Walter Purcaro +############################################################################### + +import re +from urlparse import urljoin + +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class MultiUpOrg(SimpleCrypter): + __name__ = "MultiUpOrg" + __type__ = "crypter" + __pattern__ = r"http://(?:www\.)?multiup\.org/(en|fr)/(?Pproject|download|miror)/\w+(/\w+)?" + __version__ = "0.01" + __description__ = """MultiUp.org crypter plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + TITLE_PATTERN = r'.*(Project|Projet|ownload|élécharger) (?P<title>.+?) (\(|- )' + + def getLinks(self): + m_type = re.match(self.__pattern__, self.pyfile.url).group("TYPE") + + if m_type == "project": + pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)' + else: + pattern = r'style="width:97%;text-align:left".*\n.*href="(.*)"' + if m_type == "download": + dl_pattern = r'href="(.*)">.*\n.*<h5>DOWNLOAD</h5>' + miror_page = urljoin("http://www.multiup.org", re.search(dl_pattern, self.html).group(1)) + self.html = self.load(miror_page) + + return re.findall(pattern, self.html) From 58a1b3e5144697526aad5e0f8b7cf23411d69337 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 21 Feb 2014 02:46:17 +0100 Subject: [PATCH 0032/3774] Hoster: CyberlockerCh: Mark dead --- module/plugins/hoster/CyberlockerCh.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/module/plugins/hoster/CyberlockerCh.py b/module/plugins/hoster/CyberlockerCh.py index 19a4473b3a..a08bf85189 100644 --- a/module/plugins/hoster/CyberlockerCh.py +++ b/module/plugins/hoster/CyberlockerCh.py @@ -1,17 +1,16 @@ # -*- coding: utf-8 -*- -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo -class CyberlockerCh(XFileSharingPro): + +class CyberlockerCh(DeadHoster): __name__ = "CyberlockerCh" __type__ = "hoster" - __pattern__ = r"http://(www\.)?cyberlocker\.ch/\w{12}" - __version__ = "0.01" + __pattern__ = r'http://(?:www\.)?cyberlocker\.ch/\w+' + __version__ = "0.02" __description__ = """Cyberlocker.ch hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") - - HOSTER_NAME = "cyberlocker.ch" + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" getInfo = create_getInfo(CyberlockerCh) From 4dcd89c60c0e7658367b259f74346f92e133bf8c Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 21 Feb 2014 17:08:23 +0100 Subject: [PATCH 0033/3774] Hoster: CloudzerNet: Mark dead --- module/plugins/hoster/CloudzerNet.py | 79 ++-------------------------- 1 file changed, 5 insertions(+), 74 deletions(-) diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py index 8253c35b9b..d0a19a9450 100644 --- a/module/plugins/hoster/CloudzerNet.py +++ b/module/plugins/hoster/CloudzerNet.py @@ -1,85 +1,16 @@ # -*- coding: utf-8 -*- -import re -from module.plugins.internal.SimpleHoster import SimpleHoster -from module.common.json_layer import json_loads -from module.plugins.internal.CaptchaService import ReCaptcha -from module.network.RequestFactory import getURL -from module.utils import parseFileSize +from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo -def getInfo(urls): - for url in urls: - header = getURL(url, just_header=True) - if 'Location: http://cloudzer.net/404' in header: - file_info = (url, 0, 1, url) - else: - fid = re.search(CloudzerNet.__pattern__, url).group('ID') - api_data = getURL('http://cloudzer.net/file/%s/status' % fid) - name, size = api_data.splitlines() - size = parseFileSize(size) - file_info = (name, size, 2, url) - yield file_info - - -class CloudzerNet(SimpleHoster): +class CloudzerNet(DeadHoster): __name__ = "CloudzerNet" __type__ = "hoster" - __pattern__ = r"http://(www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)(?P<ID>\w+).*" - __version__ = "0.04" + __pattern__ = r"https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+" + __version__ = "0.05" __description__ = """Cloudzer.net hoster plugin""" __author_name__ = ("gs", "z00nx", "stickell") __author_mail__ = ("I-_-I-_-I@web.de", "z00nx0@gmail.com", "l.stickell@yahoo.it") - WAIT_PATTERN = '<meta name="wait" content="(\d+)">' - CAPTCHA_KEY = '6Lcqz78SAAAAAPgsTYF3UlGf2QFQCNuPMenuyHF3' - - def handleFree(self): - found = re.search(self.WAIT_PATTERN, self.html) - seconds = int(found.group(1)) - self.logDebug("Found wait", seconds) - self.setWait(seconds + 1) - self.wait() - response = self.load('http://cloudzer.net/io/ticket/slot/%s' % self.file_info['ID'], post=' ', cookies=True) - self.logDebug("Download slot request response", response) - response = json_loads(response) - if response["succ"] is not True: - self.fail("Unable to get a download slot") - - recaptcha = ReCaptcha(self) - challenge, response = recaptcha.challenge(self.CAPTCHA_KEY) - post_data = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": response} - response = json_loads(self.load('http://cloudzer.net/io/ticket/captcha/%s' % self.file_info['ID'], - post=post_data, cookies=True)) - self.logDebug("Captcha check response", response) - self.logDebug("First check") - - if "err" in response: - if response["err"] == "captcha": - self.logDebug("Wrong captcha") - self.invalidCaptcha() - self.retry() - elif "Sie haben die max" in response["err"] or "You have reached the max" in response["err"]: - self.logDebug("Download limit reached, waiting an hour") - self.setWait(3600, True) - self.wait() - if "type" in response: - if response["type"] == "download": - url = response["url"] - self.logDebug("Download link", url) - self.download(url, disposition=True) - - def getFileInfo(self): - self.logDebug("URL: %s" % self.pyfile.url) - - header = getURL(self.pyfile.url, just_header=True) - - if 'Location: http://cloudzer.net/404' in header: - self.offline() - else: - self.fid = re.search(self.__pattern__, self.pyfile.url).group('ID') - api_data = getURL('http://cloudzer.net/file/%s/status' % self.fid) - self.pyfile.name, size = api_data.splitlines() - self.pyfile.size = parseFileSize(size) - self.logDebug("FILE NAME: %s FILE SIZE: %s" % (self.pyfile.name, self.pyfile.size)) +getInfo = create_getInfo(CloudzerNet) From 171af764df8cbd54e869f0a5e375e8292fc2cfec Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 7 Mar 2014 15:31:20 +0100 Subject: [PATCH 0034/3774] PutlockerCom (Firedrive now) and SockshareCom updated. Merged #515 Fixed: #501 --- module/plugins/hoster/PutlockerCom.py | 100 +++++++---------------- module/plugins/hoster/SockshareCom.py | 110 ++++++++++++++++++++------ 2 files changed, 116 insertions(+), 94 deletions(-) diff --git a/module/plugins/hoster/PutlockerCom.py b/module/plugins/hoster/PutlockerCom.py index afe084028b..002783bfde 100644 --- a/module/plugins/hoster/PutlockerCom.py +++ b/module/plugins/hoster/PutlockerCom.py @@ -1,96 +1,54 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: jeix -""" +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# @author: Walter Purcaro +############################################################################### import re -from os import rename -from module.plugins.internal.SimpleHoster import SimpleHoster +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class PutlockerCom(SimpleHoster): __name__ = "PutlockerCom" __type__ = "hoster" - __pattern__ = r'http://(?:www\.)?putlocker\.com/(mobile/)?(file|embed)/(?P<ID>[a-zA-Z0-9]+)' - __version__ = "0.32" - __description__ = """Putlocker.Com""" - __author_name__ = ("jeix", "stickell", "Walter Purcaro") - __author_mail__ = ("", "l.stickell@yahoo.it", "vuolter@gmail.com") + __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' + __version__ = "0.33" + __description__ = """Firedrive.com hoster plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" - FILE_OFFLINE_PATTERN = r"This file doesn't exist, or has been removed." - FILE_INFO_PATTERN = r'site-content">\s*<h1>(?P<N>.+)<strong>\( (?P<S>[^)]+) \)</strong></h1>' + FILE_NAME_PATTERN = r'<b>Name:</b> (?P<N>.+) <br>' + FILE_SIZE_PATTERN = r'<b>Size:</b> (?P<S>[\d.]+) (?P<U>[a-zA-Z]+) <br>' + FILE_OFFLINE_PATTERN = r"<div class=\"sad_face_image\">" - FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.putlocker.com/file/\g<ID>')] - HOSTER_NAME = "putlocker.com" + FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.firedrive.com/file/\g<ID>')] def setup(self): self.multiDL = self.resumeDownload = True self.chunkLimit = -1 def handleFree(self): - name = self.pyfile.name link = self._getLink() self.logDebug("Direct link: " + link) self.download(link, disposition=True) - self.processName(name) def _getLink(self): - hash_data = re.search(r'<input type="hidden" value="([a-z0-9]+)" name="hash">', self.html) - if not hash_data: - self.parseError('Unable to detect hash') - - post_data = {"hash": hash_data.group(1), "confirm": "Continue+as+Free+User"} - self.html = self.load(self.pyfile.url, post=post_data) - if (">You have exceeded the daily stream limit for your country\\. You can wait until tomorrow" in self.html or - "(>This content server has been temporarily disabled for upgrades|Try again soon\\. You can still download it below\\.<)" in self.html): - self.retry(wait_time=60 * 60 * 2, reason="Download limit exceeded or server disabled") # 2 hours wait - - patterns = (r'(/get_file\.php\?id=[A-Z0-9]+&key=[a-zA-Z0-9=]+&original=1)', - r'(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+)', - r'(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+&original=1)', - r'<a href="/gopro\.php">Tired of ads and waiting\? Go Pro!</a>[\t\n\rn ]+</div>[\t\n\rn ]+<a href="(/.*?)"') - for pattern in patterns: - link = re.search(pattern, self.html) - if link: - break - else: - link = re.search(r"playlist: '(/get_file\.php\?stream=[a-zA-Z0-9=]+)'", self.html) - if link: - self.html = self.load("http://www.%s%s" % (self.HOSTER_NAME, link.group(1))) - link = re.search(r'media:content url="(http://.*?)"', self.html) - if not link: - pattern = "\"(http://media\\-b\\d+\\.%s\\.%s/download/\\d+/.*?)\"" % self.HOSTER_NAME.rsplit(".") - link = re.search(pattern, self.html) - else: - self.parseError('Unable to detect a download link') + self.html = self.load(self.pyfile.url, post={"confirm": re.search(r'name="confirm" value="(.*)"', self.html).group(1)}) + return re.search(r'<a href="(https?://dl\.firedrive\.com/.*?)"', self.html).group(1) - link = link.group(1).replace("&", "&") - if link.startswith("http://"): - return link - else: - return "http://www.%s%s" % (self.HOSTER_NAME, link) - def processName(self, name_old): - name = self.pyfile.name - if name <= name_old: - return - name_new = re.sub(r'\.[^.]+$', "", name_old) + name[len(name_old):] - filename = self.lastDownload - self.pyfile.name = name_new - rename(filename, filename.rsplit(name)[0] + name_new) - self.logInfo("%(name)s renamed to %(newname)s" % {"name": name, "newname": name_new}) +getInfo = create_getInfo(PutlockerCom) diff --git a/module/plugins/hoster/SockshareCom.py b/module/plugins/hoster/SockshareCom.py index b2635d8bc8..fd0e5aa918 100644 --- a/module/plugins/hoster/SockshareCom.py +++ b/module/plugins/hoster/SockshareCom.py @@ -1,33 +1,97 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# @author: Walter Purcaro +############################################################################### - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. +import re +from os import rename - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo - @author: Walter Purcaro -""" -from module.plugins.hoster.PutlockerCom import PutlockerCom - - -class SockshareCom(PutlockerCom): +class SockshareCom(SimpleHoster): __name__ = "SockshareCom" __type__ = "hoster" - __pattern__ = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>[A-Z0-9]+)' - __version__ = "0.01" - __description__ = """Sockshare.Com""" - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __pattern__ = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' + __version__ = "0.02" + __description__ = """Sockshare.com hoster plugin""" + __author_name__ = ("jeix", "stickell", "Walter Purcaro") + __author_mail__ = ("", "l.stickell@yahoo.it", "vuolter@gmail.com") + + FILE_INFO_PATTERN = r'site-content">\s*<h1>(?P<N>.+)<strong>\( (?P<S>[^)]+) \)</strong></h1>' + FILE_OFFLINE_PATTERN = r'>This file doesn\'t exist, or has been removed.<' FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.sockshare.com/file/\g<ID>')] - HOSTER_NAME = "sockshare.com" + + def setup(self): + self.multiDL = self.resumeDownload = True + self.chunkLimit = -1 + + def handleFree(self): + name = self.pyfile.name + link = self._getLink() + self.logDebug("Direct link: " + link) + self.download(link, disposition=True) + self.processName(name) + + def _getLink(self): + hash_data = re.search(r'<input type="hidden" value="([a-z0-9]+)" name="hash">', self.html) + if not hash_data: + self.parseError("Unable to detect hash") + + post_data = {"hash": hash_data.group(1), "confirm": "Continue+as+Free+User"} + self.html = self.load(self.pyfile.url, post=post_data) + if (">You have exceeded the daily stream limit for your country\\. You can wait until tomorrow" in self.html or + "(>This content server has been temporarily disabled for upgrades|Try again soon\\. You can still download it below\\.<)" in self.html): + self.retry(wait_time=60 * 60 * 2, reason="Download limit exceeded or server disabled") # 2 hours wait + + patterns = (r'(/get_file\.php\?id=[A-Z0-9]+&key=[a-zA-Z0-9=]+&original=1)', + r'(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+)', + r'(/get_file\.php\?download=[A-Z0-9]+&key=[a-z0-9]+&original=1)', + r'<a href="/gopro\.php">Tired of ads and waiting\? Go Pro!</a>[\t\n\rn ]+</div>[\t\n\rn ]+<a href="(/.*?)"') + for pattern in patterns: + link = re.search(pattern, self.html) + if link: + break + else: + link = re.search(r"playlist: '(/get_file\.php\?stream=[a-zA-Z0-9=]+)'", self.html) + if link: + self.html = self.load("http://www.sockshare.com" + link.group(1)) + link = re.search(r'media:content url="(http://.*?)"', self.html) + if not link: + link = re.search(r'\"(http://media\\-b\\d+\\.sockshare\\.com/download/\\d+/.*?)\"', self.html) + else: + self.parseError('Unable to detect a download link') + + link = link.group(1).replace("&", "&") + if link.startswith("http://"): + return link + else: + return "http://www.sockshare.com" + link + + def processName(self, name_old): + name = self.pyfile.name + if name <= name_old: + return + name_new = re.sub(r'\.[^.]+$', "", name_old) + name[len(name_old):] + filename = self.lastDownload + self.pyfile.name = name_new + rename(filename, filename.rsplit(name)[0] + name_new) + self.logInfo("%(name)s renamed to %(newname)s" % {"name": name, "newname": name_new}) + + +getInfo = create_getInfo(SockshareCom) From 46d41e6674954362cbb681b5ec541c8885b1b2c7 Mon Sep 17 00:00:00 2001 From: igel-kun <mathiaswe@gmx.de> Date: Fri, 7 Mar 2014 15:40:59 +0100 Subject: [PATCH 0035/3774] New hoster NosuploadCom New crypter NosvideoCom Merged #496 --- module/plugins/crypter/NosvideoCom.py | 13 +++++++++ module/plugins/hoster/NosuploadCom.py | 38 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 module/plugins/crypter/NosvideoCom.py create mode 100644 module/plugins/hoster/NosuploadCom.py diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py new file mode 100644 index 0000000000..49b932fc0c --- /dev/null +++ b/module/plugins/crypter/NosvideoCom.py @@ -0,0 +1,13 @@ +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class NosvideoCom(SimpleCrypter): + __name__ = "NosvideoCom" + __type__ = "crypter" + __pattern__ = r"http://(?:www\.)?nosvideo\.com/\?v=\w+" + __version__ = "0.01" + __description__ = """Nosvideo.com Plugin""" + __author_name__ = "igel" + + LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload.com/\?d=\w+)"' + TITLE_PATTERN = r"<[tT]itle>Watch (?P<title>.+)</[tT]itle>" diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py new file mode 100644 index 0000000000..5735390bbd --- /dev/null +++ b/module/plugins/hoster/NosuploadCom.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- + +import re + +from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + + +class NosuploadCom(XFileSharingPro): + __name__ = "NosuploadCom" + __type__ = "hoster" + __version__ = "0.1" + __pattern__ = r"http://(?:www\.)?nosupload\.com/\?d=\w{12}" + __description__ = """nosupload.com hoster plugin""" + __author_name__ = "igel" + + HOSTER_NAME = "nosupload.com" + + FILE_SIZE_PATTERN = r'<p><strong>Size:</strong> (?P<S>[0-9\.]+) (?P<U>[kKMG]?B)</p>' + DIRECT_LINK_PATTERN = r'<a class="select" href="(http://.+?)">Download</a>' + WAIT_PATTERN = r'Please wait.*?>(\d+)</span>' + + def getDownloadLink(self): + # stage1: press the "Free Download" button + data = self.getPostParameters() + self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True) + + # stage2: wait some time and press the "Download File" button + data = self.getPostParameters() + wait_time = re.search(self.WAIT_PATTERN, self.html, re.MULTILINE | re.DOTALL).group(1) + self.logDebug("hoster told us to wait %s seconds" % wait_time) + self.wait(wait_time) + self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True) + + # stage3: get the download link + return re.search(self.DIRECT_LINK_PATTERN, self.html, re.S).group(1) + + +getInfo = create_getInfo(NosuploadCom) From c067065bd110d9a8e0d27d806767a3f48ad55d19 Mon Sep 17 00:00:00 2001 From: igel-kun <mathiaswe@gmx.de> Date: Fri, 7 Mar 2014 15:56:41 +0100 Subject: [PATCH 0036/3774] K2S: added two wait patterns. Merged #495 --- module/plugins/hoster/Keep2shareCC.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/Keep2shareCC.py b/module/plugins/hoster/Keep2shareCC.py index 323ee09caf..59308690cb 100644 --- a/module/plugins/hoster/Keep2shareCC.py +++ b/module/plugins/hoster/Keep2shareCC.py @@ -16,7 +16,7 @@ ############################################################################ # Test links (random.bin): -# http://k2s.cc/file/527111edfb9ba/random.bin +# http://k2s.cc/file/55fb73e1c00c5/random.bin import re from urlparse import urlparse, urljoin @@ -29,7 +29,7 @@ class Keep2shareCC(SimpleHoster): __name__ = "Keep2shareCC" __type__ = "hoster" __pattern__ = r"https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)" - __version__ = "0.08" + __version__ = "0.10" __description__ = """Keep2share.cc hoster plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") @@ -40,6 +40,7 @@ class Keep2shareCC(SimpleHoster): DIRECT_LINK_PATTERN = r'To download this file with slow speed, use <a href="([^"]+)">this link</a>' WAIT_PATTERN = r'Please wait ([\d:]+) to download this file' + ALREADY_DOWNLOADING_PATTERN = r'Free account does not allow to download more than one file at the same time' RECAPTCHA_KEY = '6LcYcN0SAAAAABtMlxKj7X0hRxOY8_2U86kI1vbb' @@ -60,6 +61,22 @@ def handleFree(self): self.html = self.load(self.pyfile.url, post={'uniqueId': self.fid, 'free': 1}) + m = re.search(self.WAIT_PATTERN, self.html) + if m: + self.logDebug('Hoster told us to wait for %s' % m.group(1)) + # string to time convert courtesy of https://stackoverflow.com/questions/10663720 + ftr = [3600, 60, 1] + wait_time = sum([a * b for a, b in zip(ftr, map(int, m.group(1).split(':')))]) + self.wait(wait_time, reconnect=True) + self.retry() + + m = re.search(self.ALREADY_DOWNLOADING_PATTERN, self.html) + if m: + # if someone is already downloading on our line, wait 30min and retry + self.logDebug('Already downloading, waiting for 30 minutes') + self.wait(1800, reconnect=True) + self.retry() + m = re.search(self.DIRECT_LINK_PATTERN, self.html) if not m: self.parseError("Unable to detect direct link") From b09b41e252de8eefaa9c2a3efb91b7663c4c244c Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Fri, 7 Mar 2014 16:16:43 +0100 Subject: [PATCH 0037/3774] New crypter: DlProtectCom Merged #492 Resolves: #273 --- module/plugins/crypter/DlProtectCom.py | 75 ++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 module/plugins/crypter/DlProtectCom.py diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py new file mode 100644 index 0000000000..d93455a55f --- /dev/null +++ b/module/plugins/crypter/DlProtectCom.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- + +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# @author: Walter Purcaro +############################################################################### + +import re +from base64 import urlsafe_b64encode +from time import time + +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class DlProtectCom(SimpleCrypter): + __name__ = "DlProtectCom" + __type__ = "crypter" + __pattern__ = r"http://(?:www\.)?dl-protect\.com/((en|fr)/)?(?P<ID>\w+)" + __version__ = "0.01" + __description__ = """dl-protect.com decrypter plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + OFFLINE_PATTERN = ">Unfortunately, the link you are looking for is not found" + + def getLinks(self): + # Direct link with redirect + if not re.match(r"http://(?:www\.)?dl-protect\.com", self.req.http.lastEffectiveURL): + return [self.req.http.lastEffectiveURL] + + #id = re.match(self.__pattern__, self.pyfile.url).group("ID") + key = re.search(r'name="id_key" value="(.+?)"', self.html).group(1) + + post_req = {"id_key": key, "submitform": ""} + + if self.OFFLINE_PATTERN in self.html: + self.offline() + elif ">Please click on continue to see the content" in self.html: + post_req.update({"submitform": "Continue"}) + else: + mstime = int(round(time() * 1000)) + b64time = "_" + urlsafe_b64encode(str(mstime)).replace("=", "%3D") + + post_req.update({"i": b64time, "submitform": "Decrypt+link"}) + + if ">Password :" in self.html: + post_req["pwd"] = self.getPassword() + + if ">Security Code" in self.html: + captcha_id = re.search(r'/captcha\.php\?uid=(.+?)"', self.html).group(1) + captcha_url = "http://www.dl-protect.com/captcha.php?uid=" + captcha_id + captcha_code = self.decryptCaptcha(captcha_url, imgtype="gif") + + post_req["secure"] = captcha_code + + self.html = self.load(self.pyfile.url, post=post_req) + + for errmsg in (">The password is incorrect", ">The security code is incorrect"): + if errmsg in self.html: + self.fail(errmsg[1:]) + + pattern = r'<a href="([^/].+?)" target="_blank">' + return re.findall(pattern, self.html) From b22047eebc3e4b54e7d5f4254718d71cd20349ee Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Sat, 8 Mar 2014 14:22:38 +0100 Subject: [PATCH 0038/3774] Zippyshare: fixed #537 + new test link + cleanup --- module/plugins/hoster/ZippyshareCom.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index e4f2befa01..790dab6c4e 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -1,8 +1,7 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # Test links (random.bin): -# http://www29.zippyshare.com/v/55578602/file.html +# http://www8.zippyshare.com/v/3120421/file.html import re import subprocess @@ -18,7 +17,7 @@ class ZippyshareCom(SimpleHoster): __name__ = "ZippyshareCom" __type__ = "hoster" __pattern__ = r"(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)" - __version__ = "0.42" + __version__ = "0.43" __description__ = """Zippyshare.com Download Hoster""" __author_name__ = ("spoob", "zoidberg", "stickell") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -31,7 +30,7 @@ class ZippyshareCom(SimpleHoster): SH_COOKIES = [('zippyshare.com', 'ziplocale', 'en')] - DOWNLOAD_URL_PATTERN = r"<script type=\"text/javascript\">([^<]*?)(document\.getElementById\('dlbutton'\).href = [^;]+;)" + DOWNLOAD_URL_PATTERN = r"<script type=\"text/javascript\">([^<]*?)(document\.getElementById\('dlbutton'\).href\s*=\s*[^;]+;)" SEED_PATTERN = r'swfobject.embedSWF\("([^"]+)".*?seed: (\d+)' CAPTCHA_KEY_PATTERN = r'Recaptcha.create\("([^"]+)"' CAPTCHA_SHORTENCODE_PATTERN = r"shortencode: '([^']+)'" @@ -66,8 +65,6 @@ def handleFree(self): def get_file_url(self): """ returns the absolute downloadable filepath """ - url = None - found = re.search(self.DOWNLOAD_URL_PATTERN, self.html, re.S) #Method #1: JS eval if found and re.search(r'span id="omg" class="(\d*)"', self.html): @@ -84,7 +81,8 @@ def get_file_url(self): omg = re.search(regex + r" = ([^;]+);", js).group(1) js = re.sub(regex + r" = ([^;]+);", '', js) js = re.sub(regex, omg, js) - js = re.sub(r"document.getElementById\(\\*'dlbutton\\*'\).href = ", '', js) + js = re.sub(r"document.getElementById\(\\*'dlbutton\\*'\).href\s*= ", '', js) + js = re.sub(r"function someFunction\(\) {", '', js) url = self.js.eval(js) elif found and re.search(r"document.getElementById\(\\*'dlbutton\\*'\).href = \"", self.html): js = "\n".join(found.groups()) @@ -210,7 +208,7 @@ def do_recaptcha(self): 'response': code, 'shortencode': shortencode})) self.logDebug("reCaptcha response : %s" % response) - if response == True: + if response: self.correctCaptcha() break else: From 948fa0dfe8bb04766287b626e67826323c92a76a Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Sat, 8 Mar 2014 22:13:44 +0100 Subject: [PATCH 0039/3774] Hoster: UptoboxCom: Fixed --- module/plugins/hoster/UptoboxCom.py | 36 ++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index 420610ee40..4568526cb6 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -1,19 +1,43 @@ # -*- coding: utf-8 -*- + +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# @author: Walter Purcaro +############################################################################### + from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo class UptoboxCom(XFileSharingPro): __name__ = "UptoboxCom" __type__ = "hoster" - __pattern__ = r"http://(?:\w*\.)*?uptobox.com/\w{12}" - __version__ = "0.07" + __pattern__ = r'https?://(?:www\.)?uptobox\.com/\w+' + __version__ = "0.08" __description__ = """Uptobox.com hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" - FILE_INFO_PATTERN = r'<div class="para_title">(?P<N>.+) \((?P<S>[^)]+)\)</div>' - FILE_OFFLINE_PATTERN = r'<center>File Not Found</center>' HOSTER_NAME = "uptobox.com" + FILE_INFO_PATTERN = r'"para_title">(?P<N>.+) \((?P<S>[\d\.]+) (?P<U>\w+)\)' + FILE_OFFLINE_PATTERN = r'>(File not found|Access Denied|404 Not Found)' + TEMP_OFFLINE_PATTERN = r'>This server is in maintenance mode' + + WAIT_PATTERN = r'>(\d+)</span> seconds<' + + DIRECT_LINK_PATTERN = r'"(https?://\w+\.uptobox\.com/d/.*?)"' + getInfo = create_getInfo(UptoboxCom) From dcb1e6799f9eb0f372abf93a253e37678e6658ae Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Wed, 12 Mar 2014 17:06:45 +0100 Subject: [PATCH 0040/3774] LoadTo: fixed #523 --- module/plugins/hoster/LoadTo.py | 99 +++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index 0f99c272a2..d1c1eb0f88 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -1,61 +1,90 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: halfman -""" +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +############################################################################ # Test links (random.bin): -# http://www.load.to/dNsmgXRk4/random.bin -# http://www.load.to/edbNTxcUb/random100.bin +# http://www.load.to/JWydcofUY6/random.bin +# http://www.load.to/oeSmrfkXE/random100.bin import re + from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.CaptchaService import ReCaptcha class LoadTo(SimpleHoster): __name__ = "LoadTo" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?load\.to/\w+" - __version__ = "0.12" + __version__ = "0.13" __description__ = """Load.to hoster plugin""" __author_name__ = ("halfman", "stickell") __author_mail__ = ("Pulpan3@gmail.com", "l.stickell@yahoo.it") - FILE_INFO_PATTERN = r'<a [^>]+>(?P<N>.+)</a></h3>\s*Size: (?P<S>\d+) Bytes' + FILE_INFO_PATTERN = r'<a [^>]+>(?P<N>.+)</a></h3>\s*Size: (?P<S>\d+) (?P<U>[kKmMgG]?i?[bB])' URL_PATTERN = r'<form method="post" action="(.+?)"' - FILE_OFFLINE_PATTERN = r'Can\'t find file. Please check URL.<br />' + FILE_OFFLINE_PATTERN = r'Can\'t find file. Please check URL.' WAIT_PATTERN = r'type="submit" value="Download \((\d+)\)"' + RECAPTCHA_PATTERN = r'http://www.google.com/recaptcha/api/challenge' + RECAPTCHA_KEY = "6Lc34eISAAAAAKNbPVyxBgNriTjPRmF-FA1oxApG" def setup(self): - self.multiDL = False + self.multiDL = True + self.chunkLimit = 1 def process(self, pyfile): - self.html = self.load(pyfile.url, decode=True) - - found = re.search(self.URL_PATTERN, self.html) - if not found: - self.parseError('URL') - download_url = found.group(1) - - timmy = re.search(self.WAIT_PATTERN, self.html) - if timmy: - self.setWait(timmy.group(1)) - self.wait() - - self.download(download_url, disposition=True) + self.getFileInfo() + + # Check if File is online + if re.search(self.FILE_OFFLINE_PATTERN, self.html): + self.offline() + + # Search for Download URL + m = re.search(self.URL_PATTERN, self.html) + if not m: + self.parseError('Unable to detect download URL') + download_url = m.group(1) + + # Set Timer - may be obsolete + m = re.search(self.WAIT_PATTERN, self.html) + if m: + self.wait(m.group(1)) + + # Check if reCaptcha is present + m = re.search(self.RECAPTCHA_PATTERN, self.html) + if not m: # No captcha found + self.download(download_url) + else: + recaptcha = ReCaptcha(self) + for _ in xrange(5): + challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY) + if not response == '0': + break + else: + self.fail("No valid captcha solution received") + + self.download(download_url, + post={'recaptcha_challenge_field': challenge, 'recaptcha_response_field': response}) + + # Verifiy reCaptcha by checking content of file for html 404-error + check = self.checkDownload({"404": re.compile("\A<h1>404 Not Found</h1>")}) + if check == "404": + self.logWarning("The captcha you entered was incorrect. Please try again.") + self.invalidCaptcha() + self.retry() getInfo = create_getInfo(LoadTo) From 815a940789f3d689fbc00f5a82fe7712ecd33b02 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Wed, 12 Mar 2014 17:15:53 +0100 Subject: [PATCH 0041/3774] XFileSharingPro: ability to use FILE_URL_REPLACEMENTS + improved FILE_OFFLINE_PATTERN + trivial fixes --- module/plugins/hoster/XFileSharingPro.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index 5b167c3c96..6dec8e02a7 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -21,7 +21,7 @@ from urllib import unquote from urlparse import urlparse from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError, replace_patterns from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia from module.utils import html_unescape from module.network.RequestFactory import getURL @@ -36,7 +36,7 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.25" + __version__ = "0.26" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -44,10 +44,10 @@ class XFileSharingPro(SimpleHoster): FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>[^"]+)"' FILE_SIZE_PATTERN = r'You have requested <font color="red">[^<]+</font> \((?P<S>[^<]+)\)</font>' FILE_INFO_PATTERN = r'<tr><td align=right><b>Filename:</b></td><td nowrap>(?P<N>[^<]+)</td></tr>\s*.*?<small>\((?P<S>[^<]+)\)</small>' - FILE_OFFLINE_PATTERN = r'<(b|h[1-6])>File Not Found</(b|h[1-6])>|This file has been removed' + FILE_OFFLINE_PATTERN = r'>\w+ (Not Found|file (was|has been) removed)' WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>' - LONG_WAIT_PATTERN = r'(?P<H>\d+(?=\s*hour))?.*?(?P<M>\d+(?=\s*minute))?.*?(?P<S>\d+(?=\s*second))?' + #LONG_WAIT_PATTERN = r'(?P<H>\d+(?=\s*hour))?.*?(?P<M>\d+(?=\s*minute))?.*?(?P<S>\d+(?=\s*second))?' OVR_DOWNLOAD_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)' OVR_KILL_LINK_PATTERN = r'<h2>Delete Link</h2>\s*<textarea[^>]*>([^<]+)' CAPTCHA_URL_PATTERN = r'(http://[^"\']+?/captchas?/[^"\']+)' @@ -68,7 +68,9 @@ def setup(self): def process(self, pyfile): self.prepare() - if not re.match(self.__pattern__, self.pyfile.url): + pyfile.url = replace_patterns(pyfile.url, self.FILE_URL_REPLACEMENTS) + + if not re.match(self.__pattern__, pyfile.url): if self.premium: self.handleOverriden() else: @@ -128,7 +130,7 @@ def handleFree(self): self.startDownload(url) def getDownloadLink(self): - for i in range(5): + for i in xrange(5): self.logDebug("Getting download link: #%d" % i) data = self.getPostParameters() @@ -238,7 +240,7 @@ def checkErrors(self): return self.errmsg def getPostParameters(self): - for _ in range(3): + for _ in xrange(3): if not self.errmsg: self.checkErrors() From 0cfb0bd904b83f79c69883ccec280230f6e955e0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Wed, 12 Mar 2014 17:20:46 +0100 Subject: [PATCH 0042/3774] New hoster: FileomCom Merged #539 Fixes #532 --- module/plugins/hoster/FileomCom.py | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 module/plugins/hoster/FileomCom.py diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py new file mode 100644 index 0000000000..3cf9bb4c1b --- /dev/null +++ b/module/plugins/hoster/FileomCom.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- + +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# @author: Walter Purcaro +############################################################################### + +# Test links (random.bin): +# http://fileom.com/gycaytyzdw3g/random.bin.html + +from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + + +class FileomCom(XFileSharingPro): + __name__ = "FileomCom" + __type__ = "hoster" + __pattern__ = r'https?://(?:www\.)?fileom\.com/\w+' + __version__ = "0.01" + __description__ = """Fileom.com hoster plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + HOSTER_NAME = "fileom.com" + + FILE_URL_REPLACEMENTS = [(r'/$', "")] + SH_COOKIES = [(".fileom.com", "lang", "english")] + + FILE_NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<' + FILE_SIZE_PATTERN = r'File Size: <span class="size">(?P<S>[\d\.]+) (?P<U>\w+)' + + ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'|</)' + + DIRECT_LINK_PATTERN = r"var url2 = '(.+?)';" + + def setup(self): + self.resumeDownload = self.premium + self.multiDL = True + self.chunkLimit = 1 + + +getInfo = create_getInfo(FileomCom) From 853e79074ea21cf31f46c23e4cef45609b19483f Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Wed, 12 Mar 2014 17:29:24 +0100 Subject: [PATCH 0043/3774] FastshareCz: Fixed #521 Merged #529 --- module/plugins/hoster/FastshareCz.py | 95 ++++++++++++++++------------ 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index fba7041232..93fbad6be9 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -1,55 +1,63 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: zoidberg -""" +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# @author: zoidberg +############################################################################### # Test links (random.bin): # http://www.fastshare.cz/2141189/random.bin import re +from urlparse import urljoin + from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FastshareCz(SimpleHoster): __name__ = "FastshareCz" __type__ = "hoster" - __pattern__ = r"http://(?:\w*\.)?fastshare.cz/\d+/.+" - __version__ = "0.21" - __description__ = """FastShare.cz""" - __author_name__ = ("zoidberg", "stickell") + __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' + __version__ = "0.22" + __description__ = """FastShare.cz hoster plugin""" + __author_name__ = ("zoidberg", "stickell", "Walter Purcaro") + __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it", "vuolter@gmail.com") + + FILE_INFO_PATTERN = r'<h1 class="dwp">(?P<N>[^<]+)</h1>\s*<div class="fileinfo">\s*Size\s*: (?P<S>\d+) (?P<U>\w+),' + FILE_OFFLINE_PATTERN = '>(The file has been deleted|Requested page not found)' - FILE_INFO_PATTERN = r'<h1 class="dwp">(?P<N>[^<]+)</h1>\s*<div class="fileinfo">\s*(?:Velikost|Size)\s*: (?P<S>[^,]+),' - FILE_OFFLINE_PATTERN = '(?:The file ?has been deleted|Requested page not found)' - FILE_URL_REPLACEMENTS = [('#.*', '')] - SH_COOKIES = [('fastshare.cz', 'lang', 'en')] + FILE_URL_REPLACEMENTS = [("#.*", "")] + SH_COOKIES = [(".fastshare.cz", "lang", "en")] FREE_URL_PATTERN = r'action=(/free/.*?)>\s*<img src="([^"]*)"><br' - PREMIUM_URL_PATTERN = r'(http://data\d+\.fastshare\.cz/download\.php\?id=\d+\&[^\s\"\'<>]+)' - NOT_ENOUGH_CREDIC_PATTERN = "Nem.te dostate.n. kredit pro sta.en. tohoto souboru" + PREMIUM_URL_PATTERN = r'(http://data\d+\.fastshare\.cz/download\.php\?id=\d+&)' + CREDIT_PATTERN = " credit for " def handleFree(self): - if '100% of FREE slots are full' in self.html: + if "> 100% of FREE slots are full" in self.html: self.retry(120, 60, "No free slots") found = re.search(self.FREE_URL_PATTERN, self.html) - if not found: + if found: + action, captcha_src = found.groups() + else: self.parseError("Free URL") - action, captcha_src = found.groups() - captcha = self.decryptCaptcha("http://www.fastshare.cz" + captcha_src) - self.download("http://www.fastshare.cz" + action, post={"code": captcha, "btn.x": 77, "btn.y": 18}) + + baseurl = "http://www.fastshare.cz" + captcha = self.decryptCaptcha(urljoin(baseurl, captcha_src)) + self.download(urljoin(baseurl, action), post={"code": captcha, "btn.x": 77, "btn.y": 18}) check = self.checkDownload({ "paralell_dl": @@ -64,24 +72,27 @@ def handleFree(self): def handlePremium(self): header = self.load(self.pyfile.url, just_header=True) - if 'location' in header: - url = header['location'] + if "location" in header: + url = header["location"] else: self.html = self.load(self.pyfile.url) - self.getFileInfo() - if self.NOT_ENOUGH_CREDIC_PATTERN in self.html: - self.logWarning('Not enough traffic left') - self.resetAccount() - found = re.search(self.PREMIUM_URL_PATTERN, self.html) - if not found: - self.parseError("Premium URL") - url = found.group(1) + self.getFileInfo() # - self.logDebug("PREMIUM URL: %s" % url) + if self.CREDIT_PATTERN in self.html: + self.logWarning("Not enough traffic left") + self.resetAccount() + else: + found = re.search(self.PREMIUM_URL_PATTERN, self.html) + if found: + url = found.group(1) + else: + self.parseError("Premium URL") + + self.logDebug("PREMIUM URL: " + url) self.download(url, disposition=True) - check = self.checkDownload({"credit": re.compile(self.NOT_ENOUGH_CREDIC_PATTERN)}) + check = self.checkDownload({"credit": re.compile(self.CREDIT_PATTERN)}) if check == "credit": self.resetAccount() From c694583c40dc95799d79035ba19a7bac15702f7a Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Wed, 12 Mar 2014 18:13:42 +0100 Subject: [PATCH 0044/3774] New crypter: TusfilesNetFolder Merges #520 --- module/plugins/crypter/TusfilesNetFolder.py | 54 +++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 module/plugins/crypter/TusfilesNetFolder.py diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py new file mode 100644 index 0000000000..f364aabe73 --- /dev/null +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- + +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# @author: Walter Purcaro +############################################################################### + +import math +import re +from urlparse import urljoin + +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class TusfilesNetFolder(SimpleCrypter): + __name__ = "TusfilesNetFolder" + __type__ = "crypter" + __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)/?' + __version__ = "0.01" + __description__ = """Tusfiles.net folder decrypter plugin""" + __author_name__ = ("Walter Purcaro", "stickell") + __author_mail__ = ("vuolter@gmail.com", "l.stickell@yahoo.it") + + LINK_PATTERN = r'<TD align=left><a href="(.*?)">' + TITLE_PATTERN = r'<Title>.*?\: (?P<title>.+) folder' + PAGES_PATTERN = r'>\((?P\d+) \w+\)<' + + FILE_URL_REPLACEMENTS = [(__pattern__, r'https://www.tusfiles.net/go/\g/')] + + def loadPage(self, page_n): + return self.load(urljoin(self.pyfile.url, str(page_n)), decode=True) + + def handleMultiPages(self): + pages = re.search(self.PAGES_PATTERN, self.html) + if pages: + pages = int(math.ceil(int(pages.group('pages')) / 25.0)) + else: + return + + for p in xrange(2, pages + 1): + self.html = self.loadPage(p) + self.package_links += self.getLinks() From 472c2e44ecfabafb77609bab5613f6757baa52cb Mon Sep 17 00:00:00 2001 From: Stefano Date: Fri, 14 Mar 2014 11:21:41 +0100 Subject: [PATCH 0045/3774] Zippyshare: fixed #542 Thanks @gaberad --- module/plugins/hoster/ZippyshareCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 790dab6c4e..2df59c58f7 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -17,7 +17,7 @@ class ZippyshareCom(SimpleHoster): __name__ = "ZippyshareCom" __type__ = "hoster" __pattern__ = r"(?Phttp://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P\d+)" - __version__ = "0.43" + __version__ = "0.44" __description__ = """Zippyshare.com Download Hoster""" __author_name__ = ("spoob", "zoidberg", "stickell") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -82,7 +82,7 @@ def get_file_url(self): js = re.sub(regex + r" = ([^;]+);", '', js) js = re.sub(regex, omg, js) js = re.sub(r"document.getElementById\(\\*'dlbutton\\*'\).href\s*= ", '', js) - js = re.sub(r"function someFunction\(\) {", '', js) + js = re.sub(r"function som(e|d)Function\(\) {", '', js) url = self.js.eval(js) elif found and re.search(r"document.getElementById\(\\*'dlbutton\\*'\).href = \"", self.html): js = "\n".join(found.groups()) From 94d3ffda1f90327f41b8f77bb15d099e95410b6a Mon Sep 17 00:00:00 2001 From: CrazYoshi Date: Tue, 18 Mar 2014 13:49:55 +0100 Subject: [PATCH 0046/3774] Easybytez registered user seen as premium account Now registered users are not seen as premium anymore. validuntil date and trafficleft criteria changed. --- module/plugins/accounts/EasybytezCom.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 72f37b6992..93a221615b 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -18,7 +18,7 @@ """ import re -from time import mktime, strptime +from time import mktime, strptime, gmtime from module.plugins.Account import Account from module.plugins.internal.SimpleHoster import parseHtmlForm @@ -27,7 +27,7 @@ class EasybytezCom(Account): __name__ = "EasybytezCom" - __version__ = "0.03" + __version__ = "0.04" __type__ = "account" __description__ = """EasyBytez.com account plugin""" __author_name__ = ("zoidberg") @@ -44,19 +44,19 @@ def loadAccountInfo(self, user, req): found = re.search(self.VALID_UNTIL_PATTERN, html) if found: - premium = True - trafficleft = -1 try: self.logDebug("Expire date: " + found.group(1)) validuntil = mktime(strptime(found.group(1), "%d %B %Y")) except Exception, e: self.logError(e) + if validuntil>mktime(gmtime()): + premium = True + trafficleft = -1 else: found = re.search(self.TRAFFIC_LEFT_PATTERN, html) if found: trafficleft = found.group(1) if "Unlimited" in trafficleft: - premium = True trafficleft = -1 else: trafficleft = parseFileSize(trafficleft) / 1024 From 229046d95d5ee4021a4b470347d43669a5efc70f Mon Sep 17 00:00:00 2001 From: CrazYoshi Date: Wed, 19 Mar 2014 11:49:42 +0100 Subject: [PATCH 0047/3774] Add space between args on operator > Add space between args on operator > --- module/plugins/accounts/EasybytezCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index 93a221615b..ffd132ba36 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -49,7 +49,7 @@ def loadAccountInfo(self, user, req): validuntil = mktime(strptime(found.group(1), "%d %B %Y")) except Exception, e: self.logError(e) - if validuntil>mktime(gmtime()): + if validuntil > mktime(gmtime()): premium = True trafficleft = -1 else: From 900994bdb2062f547baa7be7c5dc5f93e1927111 Mon Sep 17 00:00:00 2001 From: Stefano Date: Wed, 19 Mar 2014 14:45:22 +0100 Subject: [PATCH 0048/3774] Zippyshare: Fixed #545 Thanks @gaberad --- module/plugins/hoster/ZippyshareCom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 2df59c58f7..221db71048 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -17,7 +17,7 @@ class ZippyshareCom(SimpleHoster): __name__ = "ZippyshareCom" __type__ = "hoster" __pattern__ = r"(?Phttp://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P\d+)" - __version__ = "0.44" + __version__ = "0.45" __description__ = """Zippyshare.com Download Hoster""" __author_name__ = ("spoob", "zoidberg", "stickell") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -82,7 +82,8 @@ def get_file_url(self): js = re.sub(regex + r" = ([^;]+);", '', js) js = re.sub(regex, omg, js) js = re.sub(r"document.getElementById\(\\*'dlbutton\\*'\).href\s*= ", '', js) - js = re.sub(r"function som(e|d)Function\(\) {", '', js) + js = re.sub(r"(function som(e|d)Function\(\) {)|(var som(e|d)function = function\(\) {)", + '', js, flags=re.I) url = self.js.eval(js) elif found and re.search(r"document.getElementById\(\\*'dlbutton\\*'\).href = \"", self.html): js = "\n".join(found.groups()) From 2450d9c687193d64bbe028640b77af9ae011d64e Mon Sep 17 00:00:00 2001 From: Thierry Merle Date: Wed, 19 Mar 2014 14:57:02 +0100 Subject: [PATCH 0049/3774] OneFichier: Fixed #536 Merges #541 --- module/plugins/hoster/OneFichierCom.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 54bf1d1fa6..9fa0a4b906 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- +# Test links (random.bin): +# http://5pnm24ltcw.1fichier.com/ + import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo @@ -8,17 +11,17 @@ class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" __pattern__ = r"(http://(\w+)\.((1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl.fr))" - __version__ = "0.48" + __version__ = "0.49" __description__ = """1fichier.com download hoster""" __author_name__ = ("fragonib", "the-razer", "zoidberg", "imclem") __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "daniel_ AT gmx DOT net", "zoidberg@mujmail.cz", "imclem on github") - FILE_NAME_PATTERN = r'">File name :\s*(?P[^<]+)' - FILE_SIZE_PATTERN = r'File size :\s*(?P[^<]+)' + FILE_NAME_PATTERN = r'">Filename :\s*(?P[^<]+)' + FILE_SIZE_PATTERN = r'Size :\s*(?P[^<]+)' FILE_OFFLINE_PATTERN = r'The (requested)? file (could not be found|has been deleted)' FILE_URL_REPLACEMENTS = [(r'(http://[^/]*).*', r'\1/en/')] - DOWNLOAD_LINK_PATTERN = r'
 
 
 \s+http://.*?)'""" PASSWORD_PROTECTED_TOKEN = "protected by password" WAITING_PATTERN = "Warning ! Without premium status, you can download only one file at a time and you must wait up to (\d+) minutes between each downloads." @@ -26,7 +29,7 @@ def process(self, pyfile): found = re.search(self.__pattern__, pyfile.url) file_id = found.group(2) url = "http://%s.%s/en/" % (found.group(2), found.group(3)) - self.html = self.load(url, decode=True) + self.html = self.load(url, post="submit", decode=True) found = re.search(self.WAITING_PATTERN, self.html) if found: @@ -42,7 +45,13 @@ def process(self, pyfile): if "pass" in inputs: inputs['pass'] = self.getPassword() - self.download(url, post=inputs) + self.html = self.load(url, post=inputs) + m = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) + if not m: + self.parseError("Unable to detect download link") + download_url = m.group(1) + + self.download(download_url) # Check download self.checkDownloadedFile() From b893d603e3fbefa6f27825b4758b49a1475906e1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 19 Mar 2014 15:00:38 +0100 Subject: [PATCH 0050/3774] Rapidgator: Pattern updated Fixed #513 Merges #514 --- module/plugins/hoster/RapidgatorNet.py | 154 +++++++++++++------------ 1 file changed, 80 insertions(+), 74 deletions(-) diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 611d2ba5dd..4229b2aa12 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -1,52 +1,58 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . - - @author: zoidberg -""" +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +# @author: zoidberg +############################################################################### import re from pycurl import HTTPHEADER -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia, AdsCaptcha from module.common.json_layer import json_loads from module.network.HTTPRequest import BadHeader +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia, AdsCaptcha class RapidgatorNet(SimpleHoster): __name__ = "RapidgatorNet" __type__ = "hoster" - __pattern__ = r"http://(?:www\.)?(rapidgator.net)/file/(\w+)" - __version__ = "0.19" - __description__ = """rapidgator.net""" - __author_name__ = ("zoidberg", "chrox", "stickell") + __pattern__ = r"http://(?:www\.)?rapidgator\.net/file/\w+" + __version__ = "0.20" + __description__ = """Rapidgator.net hoster plugin""" + __author_name__ = ("zoidberg", "chrox", "stickell", "Walter Purcaro") + __author_mail__ = ("zoidberg@mujmail.cz", "", "l.stickell@yahoo.it", "vuolter@gmail.com") API_URL = 'http://rapidgator.net/api/file' - FILE_NAME_PATTERN = r'Downloading:(?:\s*<[^>]*>)*\s*(?P.*?)(?:\s*<[^>]*>)' - FILE_SIZE_PATTERN = r'File size:\s*(?P.*?)' - FILE_OFFLINE_PATTERN = r'File not found' + FILE_NAME_PATTERN = r'Download file (?P<N>.*)' + FILE_SIZE_PATTERN = r'File size:\s*(?P[\d\.]+) (?P\w+)' + FILE_OFFLINE_PATTERN = r'>(File not found|Error 404)' JSVARS_PATTERN = r"\s+var\s*(startTimerUrl|getDownloadUrl|captchaUrl|fid|secs)\s*=\s*'?(.*?)'?;" - DOWNLOAD_LINK_PATTERN = r"return '(http[^']+)';\s*}\s*}\s*}?\);" - RECAPTCHA_KEY_PATTERN = r'"http://api.recaptcha.net/challenge?k=(.*?)"' - ADSCAPTCHA_SRC_PATTERN = r'(http://api.adscaptcha.com/Get.aspx[^"\']*)' - SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"' + PREMIUM_ONLY_ERROR_PATTERN = r'You can download files up to|This file can be downloaded by premium only<' + DOWNLOAD_LIMIT_ERROR_PATTERN = r'You have reached your (daily|hourly) downloads limit' + WAIT_PATTERN = r'(?:Delay between downloads must be not less than|Try again in)\s*(\d+)\s*(hour|min)' + DOWNLOAD_LINK_PATTERN = r"return '(http://\w+.rapidgator.net/.*)';" + + RECAPTCHA_KEY_PATTERN = r'"http://api\.recaptcha\.net/challenge\?k=(.*?)"' + ADSCAPTCHA_SRC_PATTERN = r'(http://api\.adscaptcha\.com/Get\.aspx[^"\']*)' + SOLVEMEDIA_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.script\?k=(.*?)"' def setup(self): - self.resumeDownload = self.multiDL = False + self.resumeDownload = self.multiDL = self.premium self.sid = None self.chunkLimit = 1 self.req.setOption("timeout", 120) @@ -60,7 +66,7 @@ def process(self, pyfile): else: self.handleFree() - def getAPIResponse(self, cmd): + def api_response(self, cmd): try: json = self.load('%s/%s' % (self.API_URL, cmd), get={'sid': self.sid, @@ -85,23 +91,17 @@ def getAPIResponse(self, cmd): def handlePremium(self): #self.logDebug("ACCOUNT_DATA", self.account.getAccountData(self.user)) - self.api_data = self.getAPIResponse('info') + self.api_data = self.api_response('info') self.api_data['md5'] = self.api_data['hash'] self.pyfile.name = self.api_data['filename'] self.pyfile.size = self.api_data['size'] - url = self.getAPIResponse('download')['url'] - self.multiDL = True + url = self.api_response('download')['url'] self.download(url) def handleFree(self): self.html = self.load(self.pyfile.url, decode=True) - self.getFileInfo() - if ("You can download files up to 500 MB in free mode" in self.html or - "This file can be downloaded by premium only" in self.html): - self.fail("Premium account needed for download") - - self.checkWait() + self.checkFree() jsvars = dict(re.findall(self.JSVARS_PATTERN, self.html)) self.logDebug(jsvars) @@ -113,8 +113,7 @@ def handleFree(self): jsvars.get('startTimerUrl', '/download/AjaxStartTimer'), jsvars["fid"]) jsvars.update(self.getJsonResponse(url)) - self.setWait(int(jsvars.get('secs', 30)) + 1, False) - self.wait() + self.wait(int(jsvars.get('secs', 45)) + 1, False) url = "http://rapidgator.net%s?sid=%s" % ( jsvars.get('getDownloadUrl', '/download/AjaxGetDownload'), jsvars["sid"]) @@ -125,6 +124,32 @@ def handleFree(self): url = "http://rapidgator.net%s" % jsvars.get('captchaUrl', '/download/captcha') self.html = self.load(url) + + for _ in xrange(5): + found = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) + if found: + link = found.group(1) + self.logDebug(link) + self.download(link, disposition=True) + break + else: + captcha, captcha_key = self.getCaptcha() + captcha_challenge, captcha_response = captcha.challenge(captcha_key) + + self.html = self.load(url, post={ + "DownloadCaptchaForm[captcha]": "", + "adcopy_challenge": captcha_challenge, + "adcopy_response": captcha_response + }) + + if "The verification code is incorrect" in self.html: + self.invalidCaptcha() + else: + self.correctCaptcha() + else: + self.parseError("Download link") + + def getCaptcha(self): found = re.search(self.ADSCAPTCHA_SRC_PATTERN, self.html) if found: captcha_key = found.group(1) @@ -134,7 +159,6 @@ def handleFree(self): if found: captcha_key = found.group(1) captcha = ReCaptcha(self) - else: found = re.search(self.SOLVEMEDIA_PATTERN, self.html) if found: @@ -143,47 +167,29 @@ def handleFree(self): else: self.parseError("Captcha") - for i in range(5): - self.checkWait() - captcha_challenge, captcha_response = captcha.challenge(captcha_key) - - self.html = self.load(url, post={ - "DownloadCaptchaForm[captcha]": "", - "adcopy_challenge": captcha_challenge, - "adcopy_response": captcha_response - }) + return captcha, captcha_key - if 'The verification code is incorrect' in self.html: - self.invalidCaptcha() - else: - self.correctCaptcha() - break + def checkFree(self): + found = re.search(self.PREMIUM_ONLY_ERROR_PATTERN, self.html) + if found: + self.fail("Premium account needed for download") else: - self.fail("No valid captcha solution received") - - found = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) - if not found: - self.parseError("download link") - download_url = found.group(1) - self.logDebug(download_url) - self.download(download_url) - - def checkWait(self): - found = re.search(r"(?:Delay between downloads must be not less than|Try again in)\s*(\d+)\s*(hour|min)", - self.html) + found = re.search(self.WAIT_PATTERN, self.html) + if found: wait_time = int(found.group(1)) * {"hour": 60, "min": 1}[found.group(2)] else: - found = re.search(r"You have reached your (daily|hourly) downloads limit", self.html) - if found: + found = re.search(self.DOWNLOAD_LIMIT_ERROR_PATTERN, self.html) + if not found: + return + elif found.group(1) == "daily": wait_time = 60 else: - return + wait_time = 24 * 60 self.logDebug("Waiting %d minutes" % wait_time) - self.setWait(wait_time * 60, True) - self.wait() - self.retry(max_tries=24) + self.wait(wait_time * 60, True) + self.retry() def getJsonResponse(self, url): response = self.load(url, decode=True) From d1a4bc65f6d560b1a851c3359f6511a1e96025e3 Mon Sep 17 00:00:00 2001 From: m42e Date: Wed, 19 Mar 2014 15:04:39 +0100 Subject: [PATCH 0051/3774] ZDF: ignore series id, use progressive only, not hbbtv Merges #544 --- module/plugins/hoster/ZDF.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 9940fd078e..e45717186e 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -10,7 +10,7 @@ class ZDF(Hoster): # Based on zdfm by Roland Beermann # http://github.com/enkore/zdfm/ __name__ = "ZDF Mediathek" - __version__ = "0.7" + __version__ = "0.8" __pattern__ = r"http://www\.zdf\.de/ZDFmediathek/[^0-9]*([0-9]+)[^0-9]*" __config__ = [] @@ -23,11 +23,12 @@ def video_key(video): @staticmethod def video_valid(video): - return video.findtext("url").startswith("http") and video.findtext("url").endswith(".mp4") + return video.findtext("url").startswith("http") and video.findtext("url").endswith(".mp4") and \ + video.findtext("facets/facet").startswith("progressive") @staticmethod def get_id(url): - return int(re.search(r"[^0-9]*([0-9]+)[^0-9]*", url).group(1)) + return int(re.search(r"[^0-9]*([0-9]{4,})[^0-9]*", url).group(1)) def process(self, pyfile): xml = fromstring(self.load(XML_API % self.get_id(pyfile.url))) From 7c272fffe59683ed232be7f93648b5904cc58139 Mon Sep 17 00:00:00 2001 From: Stefano Date: Wed, 19 Mar 2014 15:30:43 +0100 Subject: [PATCH 0052/3774] Filestube: patterns updated Resolves #543 and #497 --- module/plugins/crypter/FilestubeCom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index 24e2ca1378..bb90e63b8a 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -22,10 +22,10 @@ class FilestubeCom(SimpleCrypter): __name__ = "FilestubeCom" __type__ = "crypter" __pattern__ = r"http://(?:w{3}.)?filestube\.(?:com|to)/\w+" - __version__ = "0.02" + __version__ = "0.03" __description__ = """Filestube.com Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") - LINK_PATTERN = r"link_download'\]\); renderGo\('(http://[^)]+)'\);" - TITLE_PATTERN = r"(?P<title>.+) download" + LINK_PATTERN = r"<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)" + TITLE_PATTERN = r"<h1\s*> (?P<title>.+) download\s*</h1>" From e4da4c592779642a2ce1e2c361dd6d0fb7b62c1c Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Wed, 19 Mar 2014 15:40:24 +0100 Subject: [PATCH 0053/3774] Zippyshare: using (?i) instead of re.I to make it work even on Python < 2.7 --- module/plugins/hoster/ZippyshareCom.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 221db71048..5983627d5d 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -17,7 +17,7 @@ class ZippyshareCom(SimpleHoster): __name__ = "ZippyshareCom" __type__ = "hoster" __pattern__ = r"(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)" - __version__ = "0.45" + __version__ = "0.46" __description__ = """Zippyshare.com Download Hoster""" __author_name__ = ("spoob", "zoidberg", "stickell") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -82,8 +82,7 @@ def get_file_url(self): js = re.sub(regex + r" = ([^;]+);", '', js) js = re.sub(regex, omg, js) js = re.sub(r"document.getElementById\(\\*'dlbutton\\*'\).href\s*= ", '', js) - js = re.sub(r"(function som(e|d)Function\(\) {)|(var som(e|d)function = function\(\) {)", - '', js, flags=re.I) + js = re.sub(r"(?i)(function som(e|d)Function\(\) {)|(var som(e|d)function = function\(\) {)", '', js) url = self.js.eval(js) elif found and re.search(r"document.getElementById\(\\*'dlbutton\\*'\).href = \"", self.html): js = "\n".join(found.groups()) From cece2a8ad7d1d10491e07c5494c897427e319017 Mon Sep 17 00:00:00 2001 From: flubshi <flubshi@web.de> Date: Thu, 20 Mar 2014 13:30:47 +0100 Subject: [PATCH 0054/3774] Add multihost plugin for free-way.me --- module/plugins/accounts/FreeWayMe.py | 67 ++++++++++++++++++++++++++++ module/plugins/hooks/FreeWayMe.py | 41 +++++++++++++++++ module/plugins/hoster/FreeWayMe.py | 48 ++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 module/plugins/accounts/FreeWayMe.py create mode 100644 module/plugins/hooks/FreeWayMe.py create mode 100644 module/plugins/hoster/FreeWayMe.py diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py new file mode 100644 index 0000000000..ca895c4566 --- /dev/null +++ b/module/plugins/accounts/FreeWayMe.py @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. + + @author: Nicolas Giese +""" + +from module.plugins.Account import Account +from module.common.json_layer import json_loads + + +class FreeWayMe(Account): + __name__ = "FreeWayMe" + __version__ = "0.11" + __type__ = "account" + __description__ = """FreeWayMe account plugin""" + __author_name__ = ("Nicolas Giese") + __author_mail__ = ("james@free-way.me") + + def loadAccountInfo(self, user, req): + status = self.getAccountStatus(user, req) + if status is False: + return False + self.logDebug(status) + + account_info = {"validuntil": -1, "premium": False} + if status["premium"] == "Free": + account_info["trafficleft"] = int(status["guthaben"])*1024 + elif status["premium"] == "Spender": + account_info["trafficleft"] = -1 + elif status["premium"] == "Flatrate": + account_info = {"validuntil": int(status["Flatrate"]), + "trafficleft": -1, + "premium": True} + + return account_info + + def getpw(self, user): + return self.accounts[user]["password"] + + def login(self, user, data, req): + status = self.getAccountStatus(user, req) + + # Check if user and password are valid + if status is False: + self.wrongPassword() + + def getAccountStatus(self, user, req): + answer = req.load("https://www.free-way.me/ajax/jd.php", + get={"id": 4, "user": user, "pass": self.accounts[user]["password"]}) + self.logDebug("login: %s" % answer) + if answer == "Invalid login": + self.wrongPassword() + return False + return json_loads(answer) diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMe.py new file mode 100644 index 0000000000..57de50d330 --- /dev/null +++ b/module/plugins/hooks/FreeWayMe.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. + + @author: Nicolas Giese +""" + +from module.network.RequestFactory import getURL, getRequest +from module.plugins.internal.MultiHoster import MultiHoster + +class FreeWayMe(MultiHoster): + __name__ = "FreeWayMe" + __version__ = "0.11" + __type__ = "hook" + __description__ = """FreeWayMe hook plugin""" + __config__ = [("activated", "bool", "Activated", "False"), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), + ("interval", "int", "Reload interval in hours (0 to disable)", "24")] + __author_name__ = ("Nicolas Giese") + __author_mail__ = ("james@free-way.me") + + def getHoster(self): + req = getRequest() + hostis = req.load("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip() + req.close() + self.logDebug("hosters: %s" % hostis) + return [x.strip() for x in hostis.split(",") if x.strip()] diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py new file mode 100644 index 0000000000..5439c10c13 --- /dev/null +++ b/module/plugins/hoster/FreeWayMe.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. + + @author: Nicolas Giese +""" + +from module.plugins.Hoster import Hoster + +class FreeWayMe(Hoster): + __name__ = "FreeWayMe" + __version__ = "0.11" + __type__ = "hoster" + __pattern__ = r"https://free-way.me/.*" + __description__ = """FreeWayMe hoster plugin""" + __author_name__ = ("Nicolas Giese") + __author_mail__ = ("james@free-way.me") + + def setup(self): + self.resumeDownload = False + self.chunkLimit = 1 + self.multiDL = self.premium + + def process(self, pyfile): + if not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "FreeWayMe") + self.fail("No FreeWay account provided") + + self.logDebug("Old URL: %s" % pyfile.url) + + (user, data) = self.account.selectAccount() + + self.download( + "https://www.free-way.me/load.php", + get={"multiget": 7, "url": pyfile.url, "user": user, "pw": self.account.getpw(user), "json": ""}, + disposition=True) From 3a8d1ab28eb9d9cd1cd8fadf7e88289e323e66dc Mon Sep 17 00:00:00 2001 From: flubshi <flubshi@web.de> Date: Thu, 20 Mar 2014 14:30:46 +0100 Subject: [PATCH 0055/3774] Improve free-way plugin (thanks stickell for your comments!) --- module/plugins/accounts/FreeWayMe.py | 4 ++-- module/plugins/hooks/FreeWayMe.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index ca895c4566..087b380d9e 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -31,7 +31,7 @@ class FreeWayMe(Account): def loadAccountInfo(self, user, req): status = self.getAccountStatus(user, req) - if status is False: + if not status: return False self.logDebug(status) @@ -54,7 +54,7 @@ def login(self, user, data, req): status = self.getAccountStatus(user, req) # Check if user and password are valid - if status is False: + if not status: self.wrongPassword() def getAccountStatus(self, user, req): diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMe.py index 57de50d330..30d76cb8ed 100644 --- a/module/plugins/hooks/FreeWayMe.py +++ b/module/plugins/hooks/FreeWayMe.py @@ -17,7 +17,7 @@ @author: Nicolas Giese """ -from module.network.RequestFactory import getURL, getRequest +from module.network.RequestFactory import getURL from module.plugins.internal.MultiHoster import MultiHoster class FreeWayMe(MultiHoster): @@ -34,8 +34,6 @@ class FreeWayMe(MultiHoster): __author_mail__ = ("james@free-way.me") def getHoster(self): - req = getRequest() - hostis = req.load("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip() - req.close() + hostis = getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip() self.logDebug("hosters: %s" % hostis) return [x.strip() for x in hostis.split(",") if x.strip()] From c7b8e5b668dafe6fa1eb474b35cf313361482eac Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Thu, 20 Mar 2014 17:14:07 +0100 Subject: [PATCH 0056/3774] Removed ARD from the repository --- module/plugins/hoster/ARD.py | 83 ------------------------------------ 1 file changed, 83 deletions(-) delete mode 100644 module/plugins/hoster/ARD.py diff --git a/module/plugins/hoster/ARD.py b/module/plugins/hoster/ARD.py deleted file mode 100644 index 12cb6c95a8..0000000000 --- a/module/plugins/hoster/ARD.py +++ /dev/null @@ -1,83 +0,0 @@ -import subprocess -import re -import os.path -import os - -from module.utils import save_join, save_path -from module.plugins.Hoster import Hoster - -# Requires rtmpdump -# by Roland Beermann - - -class RTMP: - # TODO: Port to some RTMP-library like rtmpy or similar - # TODO?: Integrate properly into the API of pyLoad - - command = "rtmpdump" - - @classmethod - def download_rtmp_stream(cls, url, output_file, playpath=None): - opts = [ - "-r", url, - "-o", output_file, - ] - if playpath: - opts.append("--playpath") - opts.append(playpath) - - cls._invoke_rtmpdump(opts) - - @classmethod - def _invoke_rtmpdump(cls, opts): - args = [ - cls.command - ] - args.extend(opts) - - return subprocess.check_call(args) - - -class ARD(Hoster): - __name__ = "ARD Mediathek" - __version__ = "0.12" - __pattern__ = r"http://www\.ardmediathek\.de/.*" - __config__ = [] - - def process(self, pyfile): - site = self.load(pyfile.url) - - avail_videos = re.findall( - r'mediaCollection.addMediaStream\(0, ([0-9]*), "([^\"]*)", "([^\"]*)", "[^\"]*"\);', site) - avail_videos.sort(key=lambda videodesc: int(videodesc[0]), - reverse=True) # The higher the number, the better the quality - - quality, url, playpath = avail_videos[0] - - pyfile.name = re.search(r"<h1>([^<]*)</h1>", site).group(1) - - if url.startswith("http"): - # Best quality is available over HTTP. Very rare. - self.download(url) - else: - pyfile.setStatus("downloading") - - download_folder = self.config['general']['download_folder'] - - location = save_join(download_folder, pyfile.package().folder) - - if not os.path.exists(location): - os.makedirs(location, int(self.config["permission"]["folder"], 8)) - - if self.config["permission"]["change_dl"] and os.name != "nt": - try: - uid = getpwnam(self.config["permission"]["user"])[2] - gid = getgrnam(self.config["permission"]["group"])[2] - - chown(location, uid, gid) - except Exception, e: - self.logWarning(_("Setting User and Group failed: %s") % str(e)) - - output_file = save_join(location, save_path(pyfile.name)) + os.path.splitext(playpath)[1] - - RTMP.download_rtmp_stream(url, playpath=playpath, output_file=output_file) From 6050e7443891c8433e906298838ffeb55d922fd6 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Fri, 21 Mar 2014 15:14:06 +0100 Subject: [PATCH 0057/3774] FreeWayMe: cosmetics --- module/plugins/accounts/FreeWayMe.py | 134 +++++++++++++-------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index 087b380d9e..0222ad65ff 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -1,67 +1,67 @@ -# -*- coding: utf-8 -*- - -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: Nicolas Giese -""" - -from module.plugins.Account import Account -from module.common.json_layer import json_loads - - -class FreeWayMe(Account): - __name__ = "FreeWayMe" - __version__ = "0.11" - __type__ = "account" - __description__ = """FreeWayMe account plugin""" - __author_name__ = ("Nicolas Giese") - __author_mail__ = ("james@free-way.me") - - def loadAccountInfo(self, user, req): - status = self.getAccountStatus(user, req) - if not status: - return False - self.logDebug(status) - - account_info = {"validuntil": -1, "premium": False} - if status["premium"] == "Free": - account_info["trafficleft"] = int(status["guthaben"])*1024 - elif status["premium"] == "Spender": - account_info["trafficleft"] = -1 - elif status["premium"] == "Flatrate": - account_info = {"validuntil": int(status["Flatrate"]), - "trafficleft": -1, - "premium": True} - - return account_info - - def getpw(self, user): - return self.accounts[user]["password"] - - def login(self, user, data, req): - status = self.getAccountStatus(user, req) - - # Check if user and password are valid - if not status: - self.wrongPassword() - - def getAccountStatus(self, user, req): - answer = req.load("https://www.free-way.me/ajax/jd.php", - get={"id": 4, "user": user, "pass": self.accounts[user]["password"]}) - self.logDebug("login: %s" % answer) - if answer == "Invalid login": - self.wrongPassword() - return False - return json_loads(answer) +# -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. + + @author: Nicolas Giese +""" + +from module.plugins.Account import Account +from module.common.json_layer import json_loads + + +class FreeWayMe(Account): + __name__ = "FreeWayMe" + __version__ = "0.11" + __type__ = "account" + __description__ = """FreeWayMe account plugin""" + __author_name__ = ("Nicolas Giese") + __author_mail__ = ("james@free-way.me") + + def loadAccountInfo(self, user, req): + status = self.getAccountStatus(user, req) + if not status: + return False + self.logDebug(status) + + account_info = {"validuntil": -1, "premium": False} + if status["premium"] == "Free": + account_info["trafficleft"] = int(status["guthaben"]) * 1024 + elif status["premium"] == "Spender": + account_info["trafficleft"] = -1 + elif status["premium"] == "Flatrate": + account_info = {"validuntil": int(status["Flatrate"]), + "trafficleft": -1, + "premium": True} + + return account_info + + def getpw(self, user): + return self.accounts[user]["password"] + + def login(self, user, data, req): + status = self.getAccountStatus(user, req) + + # Check if user and password are valid + if not status: + self.wrongPassword() + + def getAccountStatus(self, user, req): + answer = req.load("https://www.free-way.me/ajax/jd.php", + get={"id": 4, "user": user, "pass": self.accounts[user]["password"]}) + self.logDebug("login: %s" % answer) + if answer == "Invalid login": + self.wrongPassword() + return False + return json_loads(answer) From 287fcd6cb8db1c2fd7875d8eb1c8a54c315e8a80 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Fri, 21 Mar 2014 15:35:03 +0100 Subject: [PATCH 0058/3774] Added .gitignore --- .hgignore => .gitignore | 40 +++++++++++++++++++++++++++++++++++++--- pavement.py | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) rename .hgignore => .gitignore (57%) diff --git a/.hgignore b/.gitignore similarity index 57% rename from .hgignore rename to .gitignore index 1215b241de..f6ad32bca5 100644 --- a/.hgignore +++ b/.gitignore @@ -1,6 +1,41 @@ +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib/* +lib64 +__pycache__ + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# PyCharm +.idea + # ignoreing unneeded files, using glob syntax -syntax: glob -*.pyc *~ *.pidaproject .svn @@ -25,7 +60,6 @@ cert.pem module/web/pyload.db *.svg *.prefs -*.po *.orig *.rej pyload/* diff --git a/pavement.py b/pavement.py index ac9a6fa1a8..e46374ca88 100644 --- a/pavement.py +++ b/pavement.py @@ -136,7 +136,7 @@ def get_source(options): file.chmod(0755) (pyload / ".hgtags").remove() - (pyload / ".hgignore").remove() + (pyload / ".gitignore").remove() #(pyload / "docs").rmtree() f = open(pyload / "__init__.py", "wb") From e546187e6b9c653091cc5847db902ac4f784a333 Mon Sep 17 00:00:00 2001 From: Stefano <l.stickell@yahoo.it> Date: Fri, 21 Mar 2014 15:43:10 +0100 Subject: [PATCH 0059/3774] Revert "Added .gitignore" This reverts commit 287fcd6cb8db1c2fd7875d8eb1c8a54c315e8a80. --- .gitignore => .hgignore | 40 +++------------------------------------- pavement.py | 2 +- 2 files changed, 4 insertions(+), 38 deletions(-) rename .gitignore => .hgignore (57%) diff --git a/.gitignore b/.hgignore similarity index 57% rename from .gitignore rename to .hgignore index f6ad32bca5..1215b241de 100644 --- a/.gitignore +++ b/.hgignore @@ -1,41 +1,6 @@ -*.py[cod] - -# C extensions -*.so - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg -lib/* -lib64 -__pycache__ - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox -nosetests.xml - -# Mr Developer -.mr.developer.cfg -.project -.pydevproject - -# PyCharm -.idea - # ignoreing unneeded files, using glob syntax +syntax: glob +*.pyc *~ *.pidaproject .svn @@ -60,6 +25,7 @@ cert.pem module/web/pyload.db *.svg *.prefs +*.po *.orig *.rej pyload/* diff --git a/pavement.py b/pavement.py index e46374ca88..ac9a6fa1a8 100644 --- a/pavement.py +++ b/pavement.py @@ -136,7 +136,7 @@ def get_source(options): file.chmod(0755) (pyload / ".hgtags").remove() - (pyload / ".gitignore").remove() + (pyload / ".hgignore").remove() #(pyload / "docs").rmtree() f = open(pyload / "__init__.py", "wb") From 3f101407b75e35c2460f725fc68777ac75451302 Mon Sep 17 00:00:00 2001 From: Thierry Merle <thierry.merle@free.fr> Date: Sun, 23 Mar 2014 17:57:08 +0100 Subject: [PATCH 0060/3774] 1fichier: fixed #553 Merges #556 --- module/plugins/hoster/OneFichierCom.py | 35 +++++++++++++++----------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index 9fa0a4b906..4142eaece6 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -11,7 +11,7 @@ class OneFichierCom(SimpleHoster): __name__ = "OneFichierCom" __type__ = "hoster" __pattern__ = r"(http://(\w+)\.((1fichier|d(es)?fichiers|pjointe)\.(com|fr|net|org)|(cjoint|mesfichiers|piecejointe|oi)\.(org|net)|tenvoi\.(com|org|net)|dl4free\.com|alterupload\.com|megadl.fr))" - __version__ = "0.49" + __version__ = "0.50" __description__ = """1fichier.com download hoster""" __author_name__ = ("fragonib", "the-razer", "zoidberg", "imclem") __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "daniel_ AT gmx DOT net", "zoidberg@mujmail.cz", "imclem on github") @@ -23,35 +23,42 @@ class OneFichierCom(SimpleHoster): DOWNLOAD_LINK_PATTERN = r"""location\s*.\s*'(?P<N>http://.*?)'""" PASSWORD_PROTECTED_TOKEN = "protected by password" - WAITING_PATTERN = "Warning ! Without premium status, you can download only one file at a time and you must wait up to (\d+) minutes between each downloads." + WAITING_PATTERN = "Warning ! Without premium status, you must wait up to (\d+) minutes between each downloads" + LAST_DOWNLOAD_DELAY = "Your last download finished (\d+) minutes ago" + NOT_PARALLEL = r"Warning ! Without premium status, you can download only one file at a time" + RETRY_TIME = 15*60 #Default retry time in seconds (if detected parallel download) def process(self, pyfile): found = re.search(self.__pattern__, pyfile.url) file_id = found.group(2) url = "http://%s.%s/en/" % (found.group(2), found.group(3)) - self.html = self.load(url, post="submit", decode=True) + self.html = self.load(url, decode=True) + + self.getFileInfo() found = re.search(self.WAITING_PATTERN, self.html) if found: - self.waitAndRetry(int(found.group(1)) * 60) - - self.getFileInfo() + last_delay=0 + # retrieve the delay from the last download to substract from required delay + found_delay = re.search(self.LAST_DOWNLOAD_DELAY, self.html) + if found_delay: + last_delay=int(found_delay.group(1)) + self.waitAndRetry((int(found.group(1)) - last_delay) * 60) + else: #detect parallel download + found = re.search(self.NOT_PARALLEL, self.html) + if found: + self.waitAndRetry(self.RETRY_TIME) url, inputs = self.parseHtmlForm('action="http://%s' % file_id) - if not url or not inputs: + if not url: self.parseError("Download link not found") # Check for protection if "pass" in inputs: inputs['pass'] = self.getPassword() + inputs['submit'] = "Download" - self.html = self.load(url, post=inputs) - m = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) - if not m: - self.parseError("Unable to detect download link") - download_url = m.group(1) - - self.download(download_url) + self.download(url, post=inputs) # Check download self.checkDownloadedFile() From d97e8b26cc111527cec0acda4f67b0c0eff7d946 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Mon, 24 Mar 2014 22:31:48 +0100 Subject: [PATCH 0061/3774] Hoster: RapidgatorNet: __pattern__ updated (thx Gromit) --- module/plugins/hoster/RapidgatorNet.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 4229b2aa12..7cb4cd2293 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################### # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -29,8 +28,8 @@ class RapidgatorNet(SimpleHoster): __name__ = "RapidgatorNet" __type__ = "hoster" - __pattern__ = r"http://(?:www\.)?rapidgator\.net/file/\w+" - __version__ = "0.20" + __pattern__ = r"http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+" + __version__ = "0.21" __description__ = """Rapidgator.net hoster plugin""" __author_name__ = ("zoidberg", "chrox", "stickell", "Walter Purcaro") __author_mail__ = ("zoidberg@mujmail.cz", "", "l.stickell@yahoo.it", "vuolter@gmail.com") From 73dafe48e3d347a160509154bc6b8a9ae2c33d13 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Mon, 24 Mar 2014 22:49:04 +0100 Subject: [PATCH 0062/3774] Hoster: XFileSharingPro: Fixed expired session detection --- module/plugins/hoster/UptoboxCom.py | 1 - module/plugins/hoster/XFileSharingPro.py | 38 ++++++++++++------------ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index 4568526cb6..b4b35ab208 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################### # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index 6dec8e02a7..c4c05f6045 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: zoidberg -""" +############################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, +# or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/>. +# +# @author: zoidberg +############################################################################### import re from random import random @@ -36,7 +36,7 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.26" + __version__ = "0.27" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -225,8 +225,8 @@ def checkErrors(self): self.setWait(3600, True) self.wait() self.retry(25) - elif 'countdown' in self.errmsg or 'Expired session' in self.errmsg: - self.retry(3) + elif 'countdown' in self.errmsg or 'Expired' in self.errmsg: + self.retry() elif 'maintenance' in self.errmsg: self.tempOffline() elif 'download files up to' in self.errmsg: From 24973fe7c4c6269597907fdf77b51827521cb376 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Tue, 25 Mar 2014 11:58:53 +0100 Subject: [PATCH 0063/3774] Hoster: ShareFilesCo: Mark dead --- module/plugins/accounts/ShareFilesCo.py | 13 ------------- module/plugins/hoster/ShareFilesCo.py | 24 ++++++------------------ 2 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 module/plugins/accounts/ShareFilesCo.py diff --git a/module/plugins/accounts/ShareFilesCo.py b/module/plugins/accounts/ShareFilesCo.py deleted file mode 100644 index cff52d570c..0000000000 --- a/module/plugins/accounts/ShareFilesCo.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from module.plugins.internal.XFSPAccount import XFSPAccount - - -class ShareFilesCo(XFSPAccount): - __name__ = "ShareFilesCo" - __version__ = "0.01" - __type__ = "account" - __description__ = """ShareFilesCo account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") - - MAIN_PAGE = "http://sharefiles.co/" diff --git a/module/plugins/hoster/ShareFilesCo.py b/module/plugins/hoster/ShareFilesCo.py index 245e20ea6a..35f21916c4 100644 --- a/module/plugins/hoster/ShareFilesCo.py +++ b/module/plugins/hoster/ShareFilesCo.py @@ -1,28 +1,16 @@ # -*- coding: utf-8 -*- -import re -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo -class ShareFilesCo(XFileSharingPro): +class ShareFilesCo(DeadHoster): __name__ = "ShareFilesCo" __type__ = "hoster" - __pattern__ = r"http://(www\.)?sharefiles\.co/\w{12}" - __version__ = "0.01" + __pattern__ = r'http://(?:www\.)?sharefiles\.co/\w{12}' + __version__ = "0.02" __description__ = """Sharefiles.co hoster plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") - - HOSTER_NAME = "sharefiles.co" - - def startDownload(self, link): - link = link.strip() - if link.startswith('http://adf.ly'): - link = re.sub('http://adf.ly/\d+/', '', link) - if self.captcha: - self.correctCaptcha() - self.logDebug('DIRECT LINK: %s' % link) - self.download(link) + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" getInfo = create_getInfo(ShareFilesCo) From ff3e4562923d8b23491fdee6aa231d3b97ff7226 Mon Sep 17 00:00:00 2001 From: marley2013 <marley@over-load.me> Date: Tue, 25 Mar 2014 12:12:34 +0100 Subject: [PATCH 0064/3774] New multihoster: OverLoadMe Merges #549, #550 and #551 --- module/plugins/accounts/OverLoadMe.py | 31 +++++++++++ module/plugins/hooks/OverLoadMe.py | 28 ++++++++++ module/plugins/hoster/OverLoadMe.py | 78 +++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 module/plugins/accounts/OverLoadMe.py create mode 100644 module/plugins/hooks/OverLoadMe.py create mode 100644 module/plugins/hoster/OverLoadMe.py diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py new file mode 100644 index 0000000000..e288181ebf --- /dev/null +++ b/module/plugins/accounts/OverLoadMe.py @@ -0,0 +1,31 @@ +from module.plugins.Account import Account +from module.common.json_layer import json_loads + + +class OverLoadMe(Account): + __name__ = "OverLoadMe" + __version__ = "0.01" + __type__ = "account" + __description__ = """Over-Load.me account plugin""" + __author_name__ = ("marley") + __author_mail__ = ("marley@over-load.me") + + def loadAccountInfo(self, user, req): + data = self.getAccountData(user) + page = req.load("https://api.over-load.me/account.php", get={"user": user, "auth": data["password"]}).strip() + data = json_loads(page) + + # Check for premium + if data["membership"] == "Free": + return {"premium": False} + + account_info = {"validuntil": data["expirationunix"], "trafficleft": -1} + return account_info + + def login(self, user, data, req): + jsondata = req.load("https://api.over-load.me/account.php", + get={"user": user, "auth": data["password"]}).strip() + data = json_loads(jsondata) + + if data["err"] == 1: + self.wrongPassword() diff --git a/module/plugins/hooks/OverLoadMe.py b/module/plugins/hooks/OverLoadMe.py new file mode 100644 index 0000000000..bc8f9f5cb2 --- /dev/null +++ b/module/plugins/hooks/OverLoadMe.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- + +from module.network.RequestFactory import getURL +from module.plugins.internal.MultiHoster import MultiHoster + + +class OverLoadMe(MultiHoster): + __name__ = "OverLoadMe" + __version__ = "0.01" + __type__ = "hook" + __config__ = [("activated", "bool", "Activated", "False"), + ("https", "bool", "Enable HTTPS", "True"), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), + ("interval", "int", "Reload interval in hours (0 to disable)", "12")] + __description__ = """Over-Load.me hook plugin""" + __author_name__ = ("marley") + __author_email__ = ("marley@over-load.me") + + def getHoster(self): + https = "https" if self.getConfig("https") else "http" + page = getURL(https + "://api.over-load.me/hoster.php", + get={"auth": "0001-cb1f24dadb3aa487bda5afd3b76298935329be7700cd7-5329be77-00cf-1ca0135f"} + ).replace("\"", "").strip() + self.logDebug("Hosterlist: %s" % page) + + return [x.strip() for x in page.split(",") if x.strip()] diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py new file mode 100644 index 0000000000..658b3940fe --- /dev/null +++ b/module/plugins/hoster/OverLoadMe.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- + +import re +from urllib import unquote +from random import randrange + +from module.plugins.Hoster import Hoster +from module.common.json_layer import json_loads +from module.utils import parseFileSize + + +class OverLoadMe(Hoster): + __name__ = "OverLoadMe" + __version__ = "0.01" + __type__ = "hoster" + __pattern__ = r"https?://.*overload\.me.*" + __description__ = """Over-Load.me hoster plugin""" + __author_name__ = ("marley") + __author_mail__ = ("marley@over-load.me") + + def getFilename(self, url): + try: + name = unquote(url.rsplit("/", 1)[1]) + except IndexError: + name = "Unknown_Filename..." + if name.endswith("..."): # incomplete filename, append random stuff + name += "%s.tmp" % randrange(100, 999) + return name + + def setup(self): + self.chunkLimit = 5 + self.resumeDownload = True + + def process(self, pyfile): + if re.match(self.__pattern__, pyfile.url): + new_url = pyfile.url + elif not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "Over-Load") + self.fail("No Over-Load account provided") + else: + self.logDebug("Old URL: %s" % pyfile.url) + data = self.account.getAccountData(self.user) + + page = self.load("https://api.over-load.me/getdownload.php", + get={"auth": data["password"], "link": pyfile.url}) + data = json_loads(page) + + self.logDebug("Returned Data: %s" % data) + + if data["err"] == 1: + self.logWarning(data["msg"]) + self.tempOffline() + else: + if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data["filename"]: + self.pyfile.name = data["filename"] + self.pyfile.size = parseFileSize(data["filesize"]) + new_url = data["downloadlink"] + + if self.getConfig("https"): + new_url = new_url.replace("http://", "https://") + else: + new_url = new_url.replace("https://", "http://") + + if new_url != pyfile.url: + self.logDebug("New URL: %s" % new_url) + + if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'): + # only use when name wasn't already set + pyfile.name = self.getFilename(new_url) + + self.download(new_url, disposition=True) + + check = self.checkDownload( + {"error": "<title>An error occured while processing your request"}) + + if check == "error": + # usual this download can safely be retried + self.retry(reason="An error occured while generating link.", wait_time=60) From a80bf6d4edc8ba13d1383d9502e994be10a9d375 Mon Sep 17 00:00:00 2001 From: radek-senfeld Date: Sat, 29 Mar 2014 22:37:01 +0100 Subject: [PATCH 0065/3774] Fixed UlozTo hoster and account Merged #554 --- module/plugins/accounts/UlozTo.py | 8 ++++---- module/plugins/hoster/UlozTo.py | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index 8a281389e5..429a32db31 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -7,13 +7,13 @@ class UlozTo(Account): __name__ = "UlozTo" - __version__ = "0.05" + __version__ = "0.06" __type__ = "account" __description__ = """uloz.to account plugin""" __author_name__ = ("zoidberg", "pulpe") __author_mail__ = ("zoidberg@mujmail.cz") - TRAFFIC_LEFT_PATTERN = r'
  • \w+/[^/?]*)" - __version__ = "0.95" + __version__ = "0.96" __description__ = """uloz.to""" __author_name__ = ("zoidberg") @@ -40,10 +40,12 @@ class UlozTo(SimpleHoster): FILE_SIZE_REPLACEMENTS = [('([0-9.]+)\s([kMG])B', convertDecimalPrefix)] FILE_URL_REPLACEMENTS = [(r"(?<=http://)([^/]+)", "www.ulozto.net")] + ADULT_PATTERN = r'
    ' PASSWD_PATTERN = r'
    ' VIPLINK_PATTERN = r'' FREE_URL_PATTERN = r'
    ' def setup(self): self.multiDL = self.premium @@ -53,6 +55,17 @@ def process(self, pyfile): pyfile.url = re.sub(r"(?<=http://)([^/]+)", "www.ulozto.net", pyfile.url) self.html = self.load(pyfile.url, decode=True, cookies=True) + if re.search(self.ADULT_PATTERN, self.html): + self.logInfo("Adult content confirmation needed. Proceeding..") + + found = re.search(self.TOKEN_PATTERN, self.html) + if not found: + self.parseError('TOKEN') + token = found.group(1) + + self.html = self.load(pyfile.url, get={"do": "askAgeForm-submit"}, + post={"agree": "Confirm", "_token_": token}, cookies=True) + passwords = self.getPassword().splitlines() while self.PASSWD_PATTERN in self.html: if passwords: From 145508f9795e8fcec79b95b8a3af6e3e24d669b7 Mon Sep 17 00:00:00 2001 From: Stefano Date: Sat, 29 Mar 2014 22:42:15 +0100 Subject: [PATCH 0066/3774] Youtube: fixed #498 --- module/plugins/hoster/YoutubeCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index 319eb36e61..20c8c8227e 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -36,7 +36,7 @@ class YoutubeCom(Hoster): __name__ = "YoutubeCom" __type__ = "hoster" __pattern__ = r"https?://(?:[^/]*?)youtube\.com/watch.*?[?&]v=.*" - __version__ = "0.38" + __version__ = "0.39" __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting", "hd"), ("fmt", "int", "FMT/ITAG Number (5-102, 0 for auto)", 0), (".mp4", "bool", "Allow .mp4", True), @@ -102,7 +102,7 @@ def process(self, pyfile): streams = re.search(r'"url_encoded_fmt_stream_map": "(.*?)",', html).group(1) streams = [x.split('\u0026') for x in streams.split(',')] streams = [dict((y.split('=', 1)) for y in x) for x in streams] - streams = [(int(x['itag']), "%s&signature=%s" % (unquote(x['url']), x['sig'])) for x in streams] + streams = [(int(x['itag']), unquote(x['url'])) for x in streams] #self.logDebug("Found links: %s" % streams) self.logDebug("AVAILABLE STREAMS: %s" % [x[0] for x in streams]) From c768ad07f53c4109d5cb894f3e9194bfd4c37857 Mon Sep 17 00:00:00 2001 From: Ben White Date: Sat, 29 Mar 2014 22:44:45 +0100 Subject: [PATCH 0067/3774] Unrar 5.x Support Merged #567 --- module/plugins/internal/UnRar.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index ec430c5bc9..74523d35a3 100644 --- a/module/plugins/internal/UnRar.py +++ b/module/plugins/internal/UnRar.py @@ -30,12 +30,14 @@ class UnRar(AbtractExtractor): __name__ = "UnRar" - __version__ = "0.14" + __version__ = "0.15" # there are some more uncovered rar formats + re_version = re.compile(r"(UNRAR 5[\.\d]+ freeware)") re_splitfile = re.compile(r"(.*)\.part(\d+)\.rar$", re.I) re_partfiles = re.compile(r".*\.(rar|r[0-9]+)", re.I) re_filelist = re.compile(r"(.+)\s+(\d+)\s+(\d+)\s+") + re_filelist5 = re.compile(r"(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)") re_wrongpwd = re.compile("(Corrupt file or wrong password|password incorrect)", re.I) CMD = "unrar" @@ -91,10 +93,16 @@ def checkArchive(self): return True # output only used to check if passworded files are present - for name, size, packed in self.re_filelist.findall(out): - if name.startswith("*"): - self.passwordProtected = True - return True + if self.re_version.search(out): + for attr, size, name in self.re_filelist5.findall(out): + if attr.startswith("*"): + self.passwordProtected = True + return True + else: + for name, size, packed in self.re_filelist.findall(out): + if name.startswith("*"): + self.passwordProtected = True + return True self.listContent() if not self.files: From bb22924d2863c4100da3ddde4297f5da94484d8d Mon Sep 17 00:00:00 2001 From: EvolutionClip Date: Mon, 31 Mar 2014 14:28:48 +0200 Subject: [PATCH 0068/3774] New multihoster: SimplyPremiumCom Merges #531 --- module/plugins/accounts/SimplyPremiumCom.py | 58 +++++++++++ module/plugins/hooks/SimplyPremiumCom.py | 42 ++++++++ module/plugins/hoster/SimplyPremiumCom.py | 103 ++++++++++++++++++++ 3 files changed, 203 insertions(+) create mode 100644 module/plugins/accounts/SimplyPremiumCom.py create mode 100644 module/plugins/hooks/SimplyPremiumCom.py create mode 100644 module/plugins/hoster/SimplyPremiumCom.py diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py new file mode 100644 index 0000000000..1e6d668060 --- /dev/null +++ b/module/plugins/accounts/SimplyPremiumCom.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- + +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +############################################################################ + +from module.plugins.Account import Account +from module.common.json_layer import json_loads + + +class SimplyPremiumCom(Account): + __name__ = "SimplyPremiumCom" + __version__ = "0.01" + __type__ = "account" + __description__ = """Simply-Premium.Com account plugin""" + __author_name__ = ("EvolutionClip") + __author_mail__ = ("evolutionclip@live.de") + + def loadAccountInfo(self, user, req): + json_data = req.load('http://www.simply-premium.com/api/user.php?format=json') + self.logDebug("JSON data: " + json_data) + json_data = json_loads(json_data) + + if 'vip' in json_data['result'] and json_data['result']['vip'] == 0: + return {"premium": False} + + #Time package + validuntil = float(json_data['result']['timeend']) + #Traffic package + # {"trafficleft": int(traffic) / 1024, "validuntil": -1} + #trafficleft = int(json_data['result']['traffic'] / 1024) + + #return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft} + return {"premium": True, "validuntil": validuntil} + + def login(self, user, data, req): + req.cj.setCookie("simply-premium.com", "lang", "EN") + + if data['password'] == '' or data['password'] == '0': + post_data = {"key": user} + else: + post_data = {"login_name": user, "login_pass": data["password"]} + + self.html = req.load("http://www.simply-premium.com/login.php", post=post_data) + + if 'logout' not in self.html: + self.wrongPassword() diff --git a/module/plugins/hooks/SimplyPremiumCom.py b/module/plugins/hooks/SimplyPremiumCom.py new file mode 100644 index 0000000000..ca1122e459 --- /dev/null +++ b/module/plugins/hooks/SimplyPremiumCom.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- + +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +############################################################################ + +from module.plugins.internal.MultiHoster import MultiHoster +from module.network.RequestFactory import getURL +from module.common.json_layer import json_loads + + +class SimplyPremiumCom(MultiHoster): + __name__ = "SimplyPremiumCom" + __version__ = "0.01" + __type__ = "hook" + __config__ = [("activated", "bool", "Activated", "False"), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), + ("interval", "int", "Reload interval in hours (0 to disable)", "24")] + __description__ = """Simply-Premium.Com hook plugin""" + __author_name__ = ("EvolutionClip") + __author_mail__ = ("evolutionclip@live.de") + + def getHoster(self): + json_data = getURL('http://www.simply-premium.com/api/hosts.php?format=json&online=1') + json_data = json_loads(json_data) + + host_list = [element['host'] for element in json_data['result']] + + return host_list diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py new file mode 100644 index 0000000000..c9fbf2ff10 --- /dev/null +++ b/module/plugins/hoster/SimplyPremiumCom.py @@ -0,0 +1,103 @@ +# -*- coding: utf-8 -*- + +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +############################################################################ + +import re +from datetime import datetime, timedelta + +from module.plugins.Hoster import Hoster + + +def secondsToMidnight(): + # Seconds until 00:10 GMT+2 + now = datetime.utcnow() + timedelta(hours=2) + if now.hour is 0 and now.minute < 10: + midnight = now + else: + midnight = now + timedelta(days=1) + midnight = midnight.replace(hour=0, minute=10, second=0, microsecond=0) + return int((midnight - now).total_seconds()) + + +class SimplyPremiumCom(Hoster): + __name__ = "SimplyPremiumCom" + __version__ = "0.01" + __type__ = "hoster" + __pattern__ = r"https?://.*(simply-premium)\.com" + __description__ = """Simply-Premium.Com hoster plugin""" + __author_name__ = ("EvolutionClip") + __author_mail__ = ("evolutionclip@live.de") + + def setup(self): + self.chunkLimit = 16 + self.resumeDownload = False + + def process(self, pyfile): + if re.match(self.__pattern__, pyfile.url): + new_url = pyfile.url + elif not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "Simply-Premium.com") + self.fail("No Simply-Premium.com account provided") + else: + self.logDebug("Old URL: %s" % pyfile.url) + for i in xrange(5): + page = self.load('http://www.simply-premium.com/premium.php?info&link=' + pyfile.url) + self.logDebug("JSON data: " + page) + if page != '': + break + else: + self.logInfo("Unable to get API data, waiting 1 minute and retry") + self.retry(5, 60, "Unable to get API data") + + if '0' in page or ( + "You are not allowed to download from this host" in page and self.premium): + self.account.relogin(self.user) + self.retry() + elif "NOTFOUND" in page: + self.offline() + elif "downloadlimit" in page: + self.logInfo("Reached maximum connctions") + self.retry(5, 60, "Reached maximum connctions") + elif "trafficlimit" in page: + self.logInfo("Reached daily limit for this host. Waiting until 00:10 GMT+2") + self.retry(5, secondsToMidnight(), "Daily limit for this host reached") + elif "hostererror" in page: + self.logInfo("Hoster temporarily unavailable, waiting 1 minute and retry") + self.retry(5, 60, "Hoster is temporarily unavailable") + #page = json_loads(page) + #new_url = page.keys()[0] + #self.api_data = page[new_url] + + try: + start = page.index('') + len('') + end = page.index('', start) + self.pyfile.name = page[start:end] + except ValueError: + self.pyfile.name = "" + + try: + start = page.index('') + len('') + end = page.index('', start) + self.pyfile.size = int(float(page[start:end])) + except ValueError: + self.pyfile.size = 0 + + new_url = 'http://www.simply-premium.com/premium.php?link=' + pyfile.url + + if new_url != pyfile.url: + self.logDebug("New URL: " + new_url) + + self.download(new_url, disposition=True) From 53083cc537ea36f1820078946dbd1df2c671acb5 Mon Sep 17 00:00:00 2001 From: igel-kun Date: Mon, 31 Mar 2014 14:30:54 +0200 Subject: [PATCH 0069/3774] XFileSharingPro additions Merged #569 --- module/plugins/hooks/XFileSharingPro.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index 7186322930..7144c5e636 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -7,7 +7,7 @@ class XFileSharingPro(Hook): __name__ = "XFileSharingPro" - __version__ = "0.07" + __version__ = "0.08" __type__ = "hook" __config__ = [("activated", "bool", "Activated", "True"), ("loadDefault", "bool", "Include default (built-in) hoster list", "True"), @@ -40,7 +40,8 @@ def loadPattern(self): "uploadville.com", "vidbull.com", "zalaa.com", "zomgupload.com", "kupload.org", "movbay.org", "multishare.org", "omegave.org", "toucansharing.org", "uflinq.org", "banicrazy.info", "flowhot.info", "upbrasil.info", "shareyourfilez.biz", "bzlink.us", "cloudcache.cc", "fileserver.cc", "farshare.to", - "filemaze.ws", "filehost.ws", "filestock.ru", "moidisk.ru", "4up.im", "100shared.com", + "filemaze.ws", "filehost.ws", "filestock.ru", "moidisk.ru", "4up.im", "100shared.com", "sharesix.com", + "thefile.me", "filenuke.com", "sharerepo.com", "mightyupload.com", #WRONG FILE NAME: "sendmyway.com", "upchi.co.il", #NOT WORKING: From e06897ae1df960fe98ecc78c999a6ebbb019020e Mon Sep 17 00:00:00 2001 From: igel-kun Date: Mon, 31 Mar 2014 14:36:43 +0200 Subject: [PATCH 0070/3774] New hoster: PromptfileCom Merges #570 --- module/plugins/hoster/PromptfileCom.py | 56 ++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 module/plugins/hoster/PromptfileCom.py diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py new file mode 100644 index 0000000000..3580a95094 --- /dev/null +++ b/module/plugins/hoster/PromptfileCom.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- + +############################################################################ +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +############################################################################ + +import re + +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class PromptfileCom(SimpleHoster): + __name__ = "PromptfileCom" + __type__ = "hoster" + __pattern__ = r"https?://(?:www\.)?promptfile\.com/" + __version__ = "0.1" + __description__ = """Promptfile.Com File Download Hoster""" + __author_name__ = ("igel") + + FILE_INFO_PATTERN = r'(?P.*?) \((?P[\d.]+) (?P\w+)\)' + FILE_OFFLINE_PATTERN = r'File Not Found' + + CHASH_PATTERN = r'' + DIRECT_LINK_PATTERN = r"clip: {\s*url: '(https?://(?:www\.)promptfile[^']*)'," + + def handleFree(self): + # STAGE 1: get link to continue + m = re.search(self.CHASH_PATTERN, self.html) + if not m: + self.parseError("Unable to detect chash") + chash = m.group(1) + self.logDebug("read chash %s" % chash) + # continue to stage2 + self.html = self.load(self.pyfile.url, decode=True, post={'chash': chash}) + + # STAGE 2: get the direct link + m = re.search(self.DIRECT_LINK_PATTERN, self.html, re.MULTILINE | re.DOTALL) + if not m: + self.parseError("Unable to detect direct link") + direct = m.group(1) + self.logDebug('found direct link: ' + direct) + self.download(direct, disposition=True) + + +getInfo = create_getInfo(PromptfileCom) From 2799efc16b331375fae528f3f3b5f7e334c1767a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 2 Apr 2014 17:10:16 +0200 Subject: [PATCH 0071/3774] New hoster: VeohCom Merges #572 --- module/plugins/hoster/VeohCom.py | 56 ++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 module/plugins/hoster/VeohCom.py diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py new file mode 100644 index 0000000000..c1ebffb810 --- /dev/null +++ b/module/plugins/hoster/VeohCom.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +############################################################################ +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +############################################################################ + +import re + +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + +class VeohCom(SimpleHoster): + __name__ = "VeohCom" + __type__ = "hoster" + __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?Pv\w+)' + __version__ = "0.1" + __config__ = [("quality", "Low;High", "Quality", "High")] + __description__ = """Veoh.com hoster plugin""" + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" + + FILE_NAME_PATTERN = r'Sorry, we couldn\'t find the video you were looking for' + + FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.veoh.com/watch/\g')] + + SH_COOKIES = [(".veoh.com", "lassieLocale", "en")] + + def setup(self): + self.resumeDownload = self.multiDL = True + self.chunkLimit = -1 + + def handleFree(self): + q = self.getConfig("quality") + pattern = r'"fullPreviewHash%sPath":"(.+?)"' % q + found = re.search(pattern, self.html) + if found: + self.pyfile.name += ".mp4" + link = found.group(1).replace("\\", "") + self.logDebug("Download link: " + link) + self.download(link) + else: + self.fail("No %s quality video found" % q.lower()) + + +getInfo = create_getInfo(VeohCom) From 972a5f08174c527ccfaa8e3881c7d7eab5947640 Mon Sep 17 00:00:00 2001 From: Stefano Date: Wed, 2 Apr 2014 17:26:02 +0200 Subject: [PATCH 0072/3774] New hoster: PotloadCom See also #573 --- module/plugins/hoster/PotloadCom.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 module/plugins/hoster/PotloadCom.py diff --git a/module/plugins/hoster/PotloadCom.py b/module/plugins/hoster/PotloadCom.py new file mode 100644 index 0000000000..ffcfad1a54 --- /dev/null +++ b/module/plugins/hoster/PotloadCom.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + + +class PotloadCom(XFileSharingPro): + __name__ = "PotloadCom" + __type__ = "hoster" + __pattern__ = r"http://(?:www\.)?potload\.com/\w{12}" + __version__ = "0.01" + __description__ = """billionuploads.com hoster plugin""" + __author_name__ = ("stickell") + __author_mail__ = ("l.stickell@yahoo.it") + + FILE_INFO_PATTERN = r'(?P.+) \((?P\d+) (?P\w+)\) Date: Sat, 5 Apr 2014 18:50:56 +0200 Subject: [PATCH 0073/3774] XFS: host added Merged #579 --- module/plugins/hooks/XFileSharingPro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index 7144c5e636..24d51ed60e 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -7,7 +7,7 @@ class XFileSharingPro(Hook): __name__ = "XFileSharingPro" - __version__ = "0.08" + __version__ = "0.09" __type__ = "hook" __config__ = [("activated", "bool", "Activated", "True"), ("loadDefault", "bool", "Include default (built-in) hoster list", "True"), @@ -30,7 +30,7 @@ def loadPattern(self): "aieshare.com", "asixfiles.com", "banashare.com", "cyberlocker.ch", "eyesfile.co", "eyesfile.com", "fileband.com", "filedwon.com", "filedownloads.org", "hipfile.com", "kingsupload.com", "mlfat4arab.com", "netuploaded.com", "odsiebie.pl", "q4share.com", "ravishare.com", "uptobox.com", "verzend.be", - "xvidstage.com", "thefile.me", "sharesix.com", + "xvidstage.com", "thefile.me", "sharesix.com", "hostingbulk.com", #NOT TESTED: "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", "grupload.com", "heftyfile.com", "host4desi.com", "laoupload.com", "linkzhost.com", "movreel.com", From 987949595e6072b1f102db490c08817274d2a8cb Mon Sep 17 00:00:00 2001 From: igel-kun Date: Sat, 5 Apr 2014 20:54:36 +0200 Subject: [PATCH 0074/3774] XFS: Improved CAPTCHA_DIV_PATTERN + cosmetics Merges #578 --- module/plugins/hoster/XFileSharingPro.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index c4c05f6045..ab3dde18d8 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -36,7 +36,7 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.27" + __version__ = "0.28" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -52,7 +52,7 @@ class XFileSharingPro(SimpleHoster): OVR_KILL_LINK_PATTERN = r'

    Delete Link

    \s*]*>([^<]+)' CAPTCHA_URL_PATTERN = r'(http://[^"\']+?/captchas?/[^"\']+)' RECAPTCHA_URL_PATTERN = r'http://[^"\']+?recaptcha[^"\']+?\?k=([^"\']+)"' - CAPTCHA_DIV_PATTERN = r'Enter code.*?(.*?)
    ' + CAPTCHA_DIV_PATTERN = r'>Enter code.*?(.*?)
    ' SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"' ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?) Date: Thu, 10 Apr 2014 13:52:22 +0200 Subject: [PATCH 0075/3774] New hoster: UpstoreNet Merges #581 --- module/plugins/hoster/UpstoreNet.py | 74 +++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 module/plugins/hoster/UpstoreNet.py diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py new file mode 100644 index 0000000000..d2b3e05295 --- /dev/null +++ b/module/plugins/hoster/UpstoreNet.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +import re + +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.CaptchaService import ReCaptcha + + +class UpstoreNet(SimpleHoster): + __name__ = "UpstoreNet" + __type__ = "hoster" + __pattern__ = r"https?://(?:www\.)?upstore\.net/" + __version__ = "0.01" + __description__ = """Upstore.Net File Download Hoster""" + __author_name__ = ("igel") + + FILE_INFO_PATTERN = r'
    .*?
    \s*\n

    (?P.*?)

    \s*\n
    \s*\n\s*(?P[\d.]+) (?P\w+)' + FILE_OFFLINE_PATTERN = r'File not found' + + WAIT_PATTERN = r"var sec = (\d+)" + RECAPTCHA_PATTERN = r"Recaptcha.create.*?'(.*?)'" + CHASH_PATTERN = r'' + DIRECT_LINK_PATTERN = r'' + + def handleFree(self): + # STAGE 1: get link to continue + m = re.search(self.CHASH_PATTERN, self.html) + if not m: + self.parseError("could not detect hash") + chash = m.group(1) + self.logDebug("read hash " + chash) + # continue to stage2 + post_data = {'hash': chash, 'free': 'Slow download'} + self.html = self.load(self.pyfile.url, post=post_data, decode=True) + + # try the captcha 5 times + for i in xrange(5): + # STAGE 2: solv captcha and wait + # first get the infos we need: recaptcha key and wait time + m = re.search(self.RECAPTCHA_PATTERN, self.html) + if not m: + self.parseError("could not find recaptcha pattern") + recaptcha_key = m.group(1) + self.logDebug("using captcha key " + recaptcha_key) + recaptcha = ReCaptcha(self) + + m = re.search(self.WAIT_PATTERN, self.html) + if not m: + self.parseError("could not find wait pattern") + wait_time = m.group(1) + + # then, handle the captcha + challenge, code = recaptcha.challenge(recaptcha_key) + post_data['recaptcha_challenge_field'] = challenge + post_data['recaptcha_response_field'] = code + + # then, do the waiting + self.wait(wait_time) + + self.html = self.load(self.pyfile.url, post=post_data, decode=True) + + # STAGE 3: get direct link + m = re.search(self.DIRECT_LINK_PATTERN, self.html, re.DOTALL) + if m: + break + + if not m: + self.parseError("could not detect direct link") + + direct = m.group(1) + self.logDebug('found direct link: ' + direct) + self.download(direct, disposition=True) + + +getInfo = create_getInfo(UpstoreNet) From 806fca3ffbe17b9b23b962c484e95c0955d48fd9 Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 10 Apr 2014 14:56:25 +0200 Subject: [PATCH 0076/3774] Improved ReCaptcha class: Ability to detect public key and use it for challenge requests. + cosmetics --- module/plugins/internal/CaptchaService.py | 35 +++++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py index 4aa3f7dadf..05ccc98fee 100644 --- a/module/plugins/internal/CaptchaService.py +++ b/module/plugins/internal/CaptchaService.py @@ -21,18 +21,38 @@ class CaptchaService(): - __version__ = "0.02" + __version__ = "0.03" def __init__(self, plugin): self.plugin = plugin class ReCaptcha(): + RECAPTCHA_KEY_PATTERN = r"https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P\w+)" + RECAPTCHA_KEY_AJAX_PATTERN = r"Recaptcha\.create\s*\(\s*[\"'](?P\w+)[\"']\s*," + + recaptcha_key = None + def __init__(self, plugin): self.plugin = plugin - def challenge(self, id): - js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={"k": id}, cookies=True) + def detect_key(self, html): + m = re.search(self.RECAPTCHA_KEY_PATTERN, html) + if not m: + m = re.search(self.RECAPTCHA_KEY_AJAX_PATTERN, html) + if m: + self.recaptcha_key = m.group('key') + return self.recaptcha_key + else: + return None + + def challenge(self, key=None): + if not key and self.recaptcha_key: + key = self.recaptcha_key + elif not (key or self.recaptcha_key): + raise TypeError("ReCaptcha key not found") + + js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={"k": key}, cookies=True) try: challenge = re.search("challenge : '(.*?)',", js).group(1) @@ -44,7 +64,8 @@ def challenge(self, id): return challenge, result def result(self, server, challenge): - return self.plugin.decryptCaptcha("%simage" % server, get={"c": challenge}, cookies=True, forceUser=True, imgtype="jpg") + return self.plugin.decryptCaptcha("%simage" % server, get={"c": challenge}, + cookies=True, forceUser=True, imgtype="jpg") class AdsCaptcha(CaptchaService): @@ -61,7 +82,8 @@ def challenge(self, src): return challenge, result def result(self, server, challenge): - return self.plugin.decryptCaptcha("%sChallenge.aspx" % server, get={"cid": challenge, "dummy": random()}, cookies=True, imgtype="jpg") + return self.plugin.decryptCaptcha("%sChallenge.aspx" % server, get={"cid": challenge, "dummy": random()}, + cookies=True, imgtype="jpg") class SolveMedia(CaptchaService): @@ -71,7 +93,8 @@ def __init__(self, plugin): def challenge(self, src): html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript?k=%s" % src, cookies=True) try: - challenge = re.search(r'', html).group(1) + challenge = re.search(r'', + html).group(1) except: self.plugin.fail("solvmedia error") result = self.result(challenge) From 5c8ab19be496ad3cda7e3fed5a5dc678a9272cd6 Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 10 Apr 2014 14:57:46 +0200 Subject: [PATCH 0077/3774] Upstore: using the improved ReCaptcha class --- module/plugins/hoster/UpstoreNet.py | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py index d2b3e05295..9d1c4b3ddb 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -9,7 +9,7 @@ class UpstoreNet(SimpleHoster): __name__ = "UpstoreNet" __type__ = "hoster" __pattern__ = r"https?://(?:www\.)?upstore\.net/" - __version__ = "0.01" + __version__ = "0.02" __description__ = """Upstore.Net File Download Hoster""" __author_name__ = ("igel") @@ -17,7 +17,6 @@ class UpstoreNet(SimpleHoster): FILE_OFFLINE_PATTERN = r'File not found' WAIT_PATTERN = r"var sec = (\d+)" - RECAPTCHA_PATTERN = r"Recaptcha.create.*?'(.*?)'" CHASH_PATTERN = r'' DIRECT_LINK_PATTERN = r'' @@ -32,30 +31,27 @@ def handleFree(self): post_data = {'hash': chash, 'free': 'Slow download'} self.html = self.load(self.pyfile.url, post=post_data, decode=True) + # STAGE 2: solv captcha and wait + # first get the infos we need: recaptcha key and wait time + recaptcha = ReCaptcha(self) + if not recaptcha.detect_key(self.html): + self.parseError("could not find recaptcha pattern") + self.logDebug("using captcha key " + recaptcha.recaptcha_key) # try the captcha 5 times for i in xrange(5): - # STAGE 2: solv captcha and wait - # first get the infos we need: recaptcha key and wait time - m = re.search(self.RECAPTCHA_PATTERN, self.html) - if not m: - self.parseError("could not find recaptcha pattern") - recaptcha_key = m.group(1) - self.logDebug("using captcha key " + recaptcha_key) - recaptcha = ReCaptcha(self) - m = re.search(self.WAIT_PATTERN, self.html) if not m: self.parseError("could not find wait pattern") wait_time = m.group(1) + # then, do the waiting + self.wait(wait_time) + # then, handle the captcha - challenge, code = recaptcha.challenge(recaptcha_key) + challenge, code = recaptcha.challenge() post_data['recaptcha_challenge_field'] = challenge post_data['recaptcha_response_field'] = code - # then, do the waiting - self.wait(wait_time) - self.html = self.load(self.pyfile.url, post=post_data, decode=True) # STAGE 3: get direct link From b75cd8a3f83a970f67fcdfaa5bed7ecdb006b45b Mon Sep 17 00:00:00 2001 From: Ivo Buff Date: Thu, 10 Apr 2014 15:33:43 +0200 Subject: [PATCH 0078/3774] New multihoster: Vipleech4u Merges #524 --- module/plugins/accounts/Vipleech4uCom.py | 41 ++++++++++++ module/plugins/hooks/Vipleech4uCom.py | 80 ++++++++++++++++++++++ module/plugins/hoster/Vipleech4uCom.py | 84 ++++++++++++++++++++++++ 3 files changed, 205 insertions(+) create mode 100644 module/plugins/accounts/Vipleech4uCom.py create mode 100644 module/plugins/hooks/Vipleech4uCom.py create mode 100644 module/plugins/hoster/Vipleech4uCom.py diff --git a/module/plugins/accounts/Vipleech4uCom.py b/module/plugins/accounts/Vipleech4uCom.py new file mode 100644 index 0000000000..1e84634563 --- /dev/null +++ b/module/plugins/accounts/Vipleech4uCom.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +import re +from time import mktime, strptime + +from module.plugins.Account import Account + + +class Vipleech4uCom(Account): + __name__ = "Vipleech4uCom" + __version__ = "0.1" + __type__ = "account" + __description__ = """Vipleech4u.com account plugin""" + __author_name__ = ("Kagenoshin") + __author_mail__ = ("kagenoshin@gmx.ch") + + STATUS_PATTERN = re.compile(r'status.*?<\s*?strong\s*?>[^<]*?vip[^<]*?<', re.I) + VALIDUNTIL_PATTERN = re.compile(r'valid\s*?until.*?<\s*?strong\s*?>([^<]*?)<', re.I) + + def loadAccountInfo(self, user, req): + response = req.load("http://vipleech4u.com", decode=True) + status = self.STATUS_PATTERN.search(response) + + validuntil = self.VALIDUNTIL_PATTERN.search(response) + if validuntil: + validuntil = validuntil.group(1) + + if status and validuntil: + print status + print validuntil + return {"trafficleft": -1, "validuntil": mktime(strptime("%s 23:59" % validuntil, "%d-%m-%Y %H:%M"))} + else: + return {"premium": False} + + def login(self, user, data, req): + self.loginname = user + self.password = data["password"] + post_data = {'action': 'login', 'user': self.loginname, 'pass': self.password} + req.load("http://vipleech4u.com/login.php") + response = req.load("http://vipleech4u.com/login.php", post=post_data, decode=True) + if 'Username or Password are incorrect' in response: + self.wrongPassword() diff --git a/module/plugins/hooks/Vipleech4uCom.py b/module/plugins/hooks/Vipleech4uCom.py new file mode 100644 index 0000000000..b2156b0170 --- /dev/null +++ b/module/plugins/hooks/Vipleech4uCom.py @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- +import re + +from module.network.RequestFactory import getURL +from module.plugins.internal.MultiHoster import MultiHoster + + +class Vipleech4uCom(MultiHoster): + __name__ = "Vipleech4uCom" + __version__ = "0.01" + __type__ = "hook" + __config__ = [("activated", "bool", "Activated", "False"), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", "")] + __description__ = """Vipleech4u.com hook plugin""" + __author_name__ = ("Kagenoshin") + __author_mail__ = ("kagenoshin@gmx.ch") + + HOSTER_PATTERN = re.compile(r'align\s*?=\s*?["\']*?left.*?<\s*?strong\s*?>([^<]*?)<', re.I) + + def getHoster(self): + hosters = { + 'depositfiles': ['depositfiles.com', 'dfiles.eu'], + 'uploaded': ['uploaded.to', 'uploaded.net', 'ul.to'], + 'rapidggator': ['rapidgator.net'], # they have a typo it's called rapidgator + 'freakshare': ['freakshare.net', 'freakshare.com'], + 'filefactory': ['filefactory.com'], + 'bitshare': ['bitshare.com'], + 'share-online': ['share-online.biz', 'egoshare.com'], + 'youtube': ['youtube.com'], + 'turbobit': ['turbobit.net', 'unextfiles.com'], + 'firedrive': ['firedrive.com', 'putlocker.com'], + 'filepost': ['filepost.com', 'fp.io'], + 'netload': ['netload.in'], + 'uploadhero': ['uploadhero.com'], + 'ryushare': ['ryushare.com'], + } + + #check if the list is still valid + self.check_for_new_or_removed_hosters(hosters) + + #build list + hoster_list = [] + + for item in hosters.itervalues(): + hoster_list.extend(item) + + return hoster_list + + def check_for_new_or_removed_hosters(self, hosters): + #get the old hosters + old_hosters = hosters.keys() + + #load the current hosters from vipleech4u.com + page = getURL('http://vipleech4u.com/hosts.php') + current_hosters = self.HOSTER_PATTERN.findall(page) + current_hosters = [x.lower() for x in current_hosters] + + #let's look for new hosters + new_hosters = [] + + for hoster in current_hosters: + if not hoster in old_hosters: + new_hosters.append(hoster) + + #let's look for removed hosters + removed_hosters = [] + + for hoster in old_hosters: + if not hoster in current_hosters: + removed_hosters.append(hoster) + + if new_hosters: + self.logDebug('The following new hosters were found on vipleech4u.com: %s' % str(new_hosters)) + + if removed_hosters: + self.logDebug('The following hosters were removed from vipleech4u.com: %s' % str(removed_hosters)) + + if not (new_hosters and removed_hosters): + self.logDebug('The hoster list is still valid.') diff --git a/module/plugins/hoster/Vipleech4uCom.py b/module/plugins/hoster/Vipleech4uCom.py new file mode 100644 index 0000000000..53768a4307 --- /dev/null +++ b/module/plugins/hoster/Vipleech4uCom.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- + +import re + +from module.plugins.Hoster import Hoster + + +class Vipleech4uCom(Hoster): + __name__ = "Vipleech4uCom" + __version__ = "0.1" + __type__ = "hoster" + __pattern__ = r"http://vipleech4u.com/manager.php" + __description__ = """Vipleech4u.com hoster plugin""" + __author_name__ = ("Kagenoshin") + __author_mail__ = ("kagenoshin@gmx.ch") + + FILENAME_PATTERN = re.compile(r'name\s*?=\s*?["\']filename["\'][^>]*?value\s*?=\s*?["\'](.*?)["\']', re.I) + HOST_PATTERN = re.compile(r'name\s*?=\s*?["\']host["\'][^>]*?value\s*?=\s*?["\'](.*?)["\']', re.I) + PATH_PATTERN = re.compile(r'name\s*?=\s*?["\']path["\'][^>]*?value\s*?=\s*?["\'](.*?)["\']', re.I) + REFERER_PATTERN = re.compile(r'name\s*?=\s*?["\']referer["\'][^>]*?value\s*?=\s*?["\'](.*?)["\']', re.I) + LINK_PATTERN = re.compile(r'name\s*?=\s*?["\']link["\'][^>]*?value\s*?=\s*?["\'](.*?)["\']', re.I) + COOKIE_PATTERN = re.compile(r'name\s*?=\s*?["\']cookie["\'][^>]*?value\s*?=\s*?["\'](.*?)["\']', re.I) + + def setup(self): + self.resumeDownload = self.multiDL = True + self.chunkLimit = 1 + + def process(self, pyfile): + if not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "vipleech4u.com") + self.fail("No vipleech4u.com account provided") + + self.logDebug("Old URL: %s" % pyfile.url) + + new_url = pyfile.url + + if re.match(self.__pattern__, new_url): + self.fail("Can't handle vipleech4u links.") + + #upload the link which has to be loaded + page = self.load('http://vipleech4u.com/generator.php', post={'links': new_url, 'ddl': 'no'}) + + #switch to the manager and see what's happening + page = self.load('http://vipleech4u.com/unrestrict.php', get={'link': new_url, 'premium_acc': 'on'}) + + if re.search(r'You have generated maximum links available to you today', page, re.I): + self.fail('Daily limit reached.') + + filename = self.FILENAME_PATTERN.search(page) + host = self.HOST_PATTERN.search(page) + path = self.PATH_PATTERN.search(page) + referer = self.REFERER_PATTERN.search(page) + link = self.LINK_PATTERN.search(page) + cookie = self.COOKIE_PATTERN.search(page) + + #build the post-dictionary + post_dict = {} + + if filename: + post_dict.update({'filename': filename.group(1)}) + if host: + post_dict.update({'host': host.group(1)}) + if path: + post_dict.update({'path': path.group(1)}) + if referer: + post_dict.update({'referer': referer.group(1)}) + if link: + post_dict.update({'link': link.group(1)}) + if cookie: + post_dict.update({'cookie': cookie.group(1)}) + + if not post_dict: + self.logDebug('Get an empty post_dict. Strange.') + + self.setWait(5) + self.wait() + self.logDebug("Unrestricted URL: " + str(post_dict)) + + self.download('http://vipleech4u.com/unrestrict.php', post=post_dict, disposition=True) + + check = self.checkDownload({"bad": " Date: Fri, 11 Apr 2014 11:31:07 +0200 Subject: [PATCH 0079/3774] Hoster: TusfilesNet: Updated Merges vuolter/pyload@9b480fb --- module/plugins/hoster/TusfilesNet.py | 41 ++++++++++++++++++---------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py index 4db551ee42..c31b88f20c 100644 --- a/module/plugins/hoster/TusfilesNet.py +++ b/module/plugins/hoster/TusfilesNet.py @@ -1,29 +1,42 @@ # -*- coding: utf-8 -*- +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +############################################################################### + from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo class TusfilesNet(XFileSharingPro): __name__ = "TusfilesNet" __type__ = "hoster" - __pattern__ = r"http://(?:www\.)?tusfiles\.net/(?P[a-zA-Z0-9]{12})" - __version__ = "0.02" + __pattern__ = r'https?://(?:www\.)?tusfiles\.net/(?P\w+)' + __version__ = "0.03" __description__ = """Tusfiles.net hoster plugin""" - __author_name__ = ("stickell", "Walter Purcaro") - __author_mail__ = ("l.stickell@yahoo.it", "vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" - FILE_INFO_PATTERN = r'
  • (?P[^<]+)
    • \s+
  • Size: (?P[\d.]+) (?P\w+)
    • ' - FILE_OFFLINE_PATTERN = r'The file you were looking for could not be found' HOSTER_NAME = "tusfiles.net" + FILE_INFO_PATTERN = r'\](?P.+) - (?P[\d.]+) (?P\w+)\[' + FILE_OFFLINE_PATTERN = r'>File Not Found|TusFiles - Fast Sharing Files!' + + SH_COOKIES = [(".tusfiles.net", "lang", "english")] + def setup(self): - self.chunkLimit = 1 - self.resumeDownload = self.multiDL = True - if self.premium: - self.limitDL = 5 - elif self.account: - self.limitDL = 3 - else: - self.limitDL = 2 + self.multiDL = False + self.chunkLimit = -1 + self.resumeDownload = True getInfo = create_getInfo(TusfilesNet) From 1a51954bb099159169831eec7918042d178b1b0f Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 11 Apr 2014 11:33:15 +0200 Subject: [PATCH 0080/3774] Crypter: TurbobitNetFolder: Improved _getLinks recursion Merges vuolter/pyload@0497f62 --- module/plugins/crypter/TurbobitNetFolder.py | 60 ++++++++++----------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index bec5a44803..52a661f169 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -1,36 +1,31 @@ # -*- coding: utf-8 -*- -############################################################################ -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU Affero General Public License for more details. # -# # -# You should have received a copy of the GNU Affero General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -############################################################################ - -from math import ceil +############################################################################### +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +############################################################################### + import re from module.plugins.internal.SimpleCrypter import SimpleCrypter from module.common.json_layer import json_loads -def format_links(fid): - return 'http://turbobit.net/%s.html' % fid - - class TurbobitNetFolder(SimpleCrypter): __name__ = "TurbobitNetFolder" __type__ = "crypter" __pattern__ = r"http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)" - __version__ = "0.02" + __version__ = "0.03" __description__ = """Turbobit.net Folder Plugin""" __author_name__ = ("stickell", "Walter Purcaro") __author_mail__ = ("l.stickell@yahoo.it", "vuolter@gmail.com") @@ -38,18 +33,19 @@ class TurbobitNetFolder(SimpleCrypter): TITLE_PATTERN = r"src='/js/lib/grid/icon/folder.png'> <span>(?P<title>.+?)</span>" def _getLinks(self, id, page=1): - gridFile = self.load('http://turbobit.net/downloadfolder/gridFile', - get={'rootId': id, 'rows': 200, 'page': page}, decode=True) + gridFile = self.load("http://turbobit.net/downloadfolder/gridFile", + get={"rootId": id, "rows": 200, "page": page}, decode=True) grid = json_loads(gridFile) - pages = int(ceil(grid["records"] / 200.0)) - - for i in grid['rows']: - yield i['id'] - - if page < pages: - self._getLinks(id, page + 1) + if grid["rows"]: + for i in grid["rows"]: + yield i["id"] + for id in self._getLinks(id, page + 1): + yield id + else: + return def getLinks(self): - folder_id = re.match(self.__pattern__, self.pyfile.url).group('ID') - return map(format_links, self._getLinks(folder_id)) + id = re.match(self.__pattern__, self.pyfile.url).group("ID") + fixurl = lambda id: "http://turbobit.net/%s.html" % id + return map(fixurl, self._getLinks(id)) From 427be7ed6407ffc542fd9c0f8356a03a2dc5cc28 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 11 Apr 2014 11:34:47 +0200 Subject: [PATCH 0081/3774] Hook: RestartFailed: Old version rewritten Merges vuolter/pyload@47e3ffe --- module/plugins/hooks/RestartFailed.py | 63 +++++++++++++++++++-------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py index 3bf6fe3650..64853194a7 100644 --- a/module/plugins/hooks/RestartFailed.py +++ b/module/plugins/hooks/RestartFailed.py @@ -1,32 +1,57 @@ # -*- coding: utf-8 -*- +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. + + @author: Walter Purcaro +""" + from module.plugins.Hook import Hook class RestartFailed(Hook): __name__ = "RestartFailed" - __version__ = "1.52" - __description__ = "restartedFailed Packages after defined time" + __version__ = "1.53" + __description__ = "Periodically restart all failed downloads in queue" __config__ = [("activated", "bool", "Activated", "False"), - ("interval", "int", "Interval in Minutes", "15")] - - __author_name__ = ("bambie") - __author_mail__ = ("bambie@gulli.com") + ("interval", "int", "Interval in minutes", "90")] + __author_name__ = ("Walter Purcaro") + __author_mail__ = ("vuolter@gmail.com") - interval = 300 + event_list = ["pluginConfigChanged"] - def setup(self): - self.info = {"running": False} - - def coreReady(self): - self.info["running"] = True - self.logInfo("loaded") - self.interval = self.getConfig("interval") * 60 - self.logDebug("interval is set to %s" % self.interval) + MIN_INTERVAL = 15 * 60 #seconds def periodical(self): - self.logDebug("periodical called") - if self.getConfig("interval") * 60 != self.interval: - self.interval = self.getConfig("interval") * 60 - self.logDebug("interval is set to %s" % self.interval) + self.logDebug("Restart all failed downloads now") self.core.api.restartFailed() + + def restartPeriodical(self, interval): + self.logDebug("Set periodical interval to %s seconds" % interval) + if self.cb: + self.core.scheduler.removeJob(self.cb) + self.interval = interval + self.cb = self.core.scheduler.addJob(interval, self._periodical, threaded=False) + + def pluginConfigChanged(self, plugin, name, value): + value *= 60 + if name == "interval": + if self.interval != value > self.MIN_INTERVAL: + self.restartPeriodical(value) + else: + self.logWarning("Cannot change interval: given value is equal to the current or \ + smaller than %s seconds" % self.MIN_INTERVAL) + + def coreReady(self): + self.pluginConfigChanged(plugin="RestartFailed", name="interval", value=self.getConfig("interval")) From 7d33159339bc3fa8ea45acd112510fc617f211c5 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 11 Apr 2014 11:46:14 +0200 Subject: [PATCH 0082/3774] XFileSharingPro: FILE_SIZE_PATTERN updated Merges vuolter/pyload@791ea1f --- module/plugins/hoster/XFileSharingPro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index ab3dde18d8..321c06bb7b 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -36,13 +36,13 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.28" + __version__ = "0.29" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>[^"]+)"' - FILE_SIZE_PATTERN = r'You have requested <font color="red">[^<]+</font> \((?P<S>[^<]+)\)</font>' + FILE_SIZE_PATTERN = r'You have requested .*\((?P<S>[\d\.\,]+) ?(?P<U>\w+)?\)</font>' FILE_INFO_PATTERN = r'<tr><td align=right><b>Filename:</b></td><td nowrap>(?P<N>[^<]+)</td></tr>\s*.*?<small>\((?P<S>[^<]+)\)</small>' FILE_OFFLINE_PATTERN = r'>\w+ (Not Found|file (was|has been) removed)' From 6bb9e9c76a588cad73a7f8b10d000f356e3a18d4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 11 Apr 2014 11:48:43 +0200 Subject: [PATCH 0083/3774] RyushareCom: FILE_SIZE_PATTERN fixed Merges vuolter/pyload@6bb3f6e --- module/plugins/hoster/RyushareCom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py index 77efa00810..cb85f6f4a3 100644 --- a/module/plugins/hoster/RyushareCom.py +++ b/module/plugins/hoster/RyushareCom.py @@ -13,13 +13,15 @@ class RyushareCom(XFileSharingPro): __name__ = "RyushareCom" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?ryushare\.com/\w+" - __version__ = "0.14" + __version__ = "0.15" __description__ = """ryushare.com hoster plugin""" __author_name__ = ("zoidberg", "stickell", "quareevo") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it", "quareevo@arcor.de") HOSTER_NAME = "ryushare.com" + FILE_SIZE_PATTERN = r'You have requested <font color="red">[^<]+</font> \((?P<S>[\d\.]+) (?P<U>\w+)' + WAIT_PATTERN = r'You have to wait ((?P<hour>\d+) hour[s]?, )?((?P<min>\d+) minute[s], )?(?P<sec>\d+) second[s]' DIRECT_LINK_PATTERN = r'(http://([^/]*?ryushare.com|\d+\.\d+\.\d+\.\d+)(:\d+/d/|/files/\w+/\w+/)[^"\'<]+)' SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"' From 0b568b843442ff454ec336bd227b39220209aa9e Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 11 Apr 2014 11:49:51 +0200 Subject: [PATCH 0084/3774] RyushareCom: Code cosmetics Merges vuolter/pyload@f18c34b --- module/plugins/hoster/RyushareCom.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py index cb85f6f4a3..92844b360c 100644 --- a/module/plugins/hoster/RyushareCom.py +++ b/module/plugins/hoster/RyushareCom.py @@ -12,9 +12,9 @@ class RyushareCom(XFileSharingPro): __name__ = "RyushareCom" __type__ = "hoster" - __pattern__ = r"http://(?:www\.)?ryushare\.com/\w+" + __pattern__ = r'http://(?:www\.)?ryushare\.com/\w+' __version__ = "0.15" - __description__ = """ryushare.com hoster plugin""" + __description__ = """Ryushare.com hoster plugin""" __author_name__ = ("zoidberg", "stickell", "quareevo") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it", "quareevo@arcor.de") @@ -30,22 +30,22 @@ def getDownloadLink(self): retry = False self.html = self.load(self.pyfile.url) action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")}) - if 'method_premium' in inputs: - del inputs['method_premium'] + if "method_premium" in inputs: + del inputs["method_premium"] self.html = self.load(self.pyfile.url, post=inputs) action, inputs = self.parseHtmlForm('F1') self.setWait(65) # Wait 1 hour - if 'You have reached the download-limit!!!' in self.html: + if "You have reached the download-limit" in self.html: self.setWait(1 * 60 * 60, True) retry = True match = re.search(self.WAIT_PATTERN, self.html) if match: m = match.groupdict(0) - waittime = int(m["hour"]) * 60 * 60 + int(m['min']) * 60 + int(m['sec']) + waittime = int(m["hour"]) * 60 * 60 + int(m["min"]) * 60 + int(m["sec"]) self.setWait(waittime, True) retry = True @@ -75,7 +75,7 @@ def getDownloadLink(self): else: self.fail("You have entered 5 invalid captcha codes") - if 'Click here to download' in self.html: + if "Click here to download" in self.html: m = re.search(r'<a href="([^"]+)">Click here to download</a>', self.html) return m.group(1) From ce955b6c04f6ddaab1696c6cabf5e0aa83cbf846 Mon Sep 17 00:00:00 2001 From: Walter Purcaro <vuolter@gmail.com> Date: Fri, 11 Apr 2014 11:50:52 +0200 Subject: [PATCH 0085/3774] Fix __author_name__ and __author_mail__ Merges vuolter/pyload@6c57a37 --- module/plugins/Account.py | 4 ++-- module/plugins/Container.py | 4 ++-- module/plugins/Crypter.py | 4 ++-- module/plugins/Hoster.py | 4 ++-- module/plugins/accounts/AlldebridCom.py | 4 ++-- module/plugins/accounts/BayfilesCom.py | 4 ++-- module/plugins/accounts/BitshareCom.py | 3 ++- module/plugins/accounts/CramitIn.py | 4 ++-- module/plugins/accounts/CyberlockerCh.py | 4 ++-- module/plugins/accounts/DdlstorageCom.py | 4 ++-- module/plugins/accounts/DebridItaliaCom.py | 4 ++-- module/plugins/accounts/EasybytezCom.py | 4 ++-- module/plugins/accounts/EgoFilesCom.py | 4 ++-- module/plugins/accounts/EuroshareEu.py | 4 ++-- module/plugins/accounts/FastixRu.py | 4 ++-- module/plugins/accounts/FilejungleCom.py | 4 ++-- module/plugins/accounts/FilerNet.py | 4 ++-- module/plugins/accounts/FilerioCom.py | 4 ++-- module/plugins/accounts/FilesMailRu.py | 4 ++-- module/plugins/accounts/FileserveCom.py | 4 ++-- module/plugins/accounts/FourSharedCom.py | 4 ++-- module/plugins/accounts/FreakshareCom.py | 4 ++-- module/plugins/accounts/FreeWayMe.py | 4 ++-- module/plugins/accounts/Ftp.py | 4 ++-- module/plugins/accounts/HellshareCz.py | 4 ++-- module/plugins/accounts/Http.py | 4 ++-- module/plugins/accounts/LetitbitNet.py | 4 ++-- module/plugins/accounts/MegasharesCom.py | 4 ++-- module/plugins/accounts/MultiDebridCom.py | 4 ++-- module/plugins/accounts/MultishareCz.py | 4 ++-- module/plugins/accounts/OverLoadMe.py | 4 ++-- module/plugins/accounts/PremiumizeMe.py | 4 ++-- module/plugins/accounts/QuickshareCz.py | 4 ++-- module/plugins/accounts/RPNetBiz.py | 4 ++-- module/plugins/accounts/RapidgatorNet.py | 4 ++-- module/plugins/accounts/RapidshareCom.py | 4 ++-- module/plugins/accounts/RarefileNet.py | 4 ++-- module/plugins/accounts/RealdebridCom.py | 4 ++-- module/plugins/accounts/RehostTo.py | 4 ++-- module/plugins/accounts/ReloadCc.py | 4 ++-- module/plugins/accounts/ShareRapidCom.py | 1 + module/plugins/accounts/SimplydebridCom.py | 4 ++-- module/plugins/accounts/StahnuTo.py | 4 ++-- module/plugins/accounts/TurbobitNet.py | 4 ++-- module/plugins/accounts/UlozTo.py | 2 +- module/plugins/accounts/UnrestrictLi.py | 4 ++-- module/plugins/accounts/UploadedTo.py | 4 ++-- module/plugins/accounts/UploadheroCom.py | 4 ++-- module/plugins/accounts/UploadingCom.py | 4 ++-- module/plugins/accounts/UptoboxCom.py | 4 ++-- module/plugins/accounts/WarserverCz.py | 4 ++-- module/plugins/accounts/YibaishiwuCom.py | 4 ++-- module/plugins/accounts/ZeveraCom.py | 4 ++-- module/plugins/container/CCF.py | 4 ++-- module/plugins/crypter/BitshareComFolder.py | 4 ++-- module/plugins/crypter/C1neonCom.py | 4 ++-- module/plugins/crypter/CrockoComFolder.py | 4 ++-- module/plugins/crypter/CryptItCom.py | 4 ++-- module/plugins/crypter/CzshareComFolder.py | 4 ++-- module/plugins/crypter/DDLMusicOrg.py | 4 ++-- module/plugins/crypter/DailymotionBatch.py | 4 ++-- module/plugins/crypter/DataHuFolder.py | 2 +- module/plugins/crypter/DepositfilesComFolder.py | 4 ++-- module/plugins/crypter/Dereferer.py | 4 ++-- module/plugins/crypter/DontKnowMe.py | 4 ++-- module/plugins/crypter/DownloadVimeoCom.py | 5 +++-- module/plugins/crypter/DuckCryptInfo.py | 4 ++-- module/plugins/crypter/DuploadOrgFolder.py | 4 ++-- module/plugins/crypter/EasybytezComFolder.py | 4 ++-- module/plugins/crypter/EmbeduploadCom.py | 4 ++-- module/plugins/crypter/FilebeerInfoFolder.py | 4 ++-- module/plugins/crypter/FilefactoryComFolder.py | 4 ++-- module/plugins/crypter/FileserveComFolder.py | 4 ++-- module/plugins/crypter/FilestubeCom.py | 4 ++-- module/plugins/crypter/FreakhareComFolder.py | 4 ++-- module/plugins/crypter/FreetexthostCom.py | 4 ++-- module/plugins/crypter/FshareVnFolder.py | 4 ++-- module/plugins/crypter/GooGl.py | 4 ++-- module/plugins/crypter/HotfileFolderCom.py | 4 ++-- module/plugins/crypter/ILoadTo.py | 4 ++-- module/plugins/crypter/LinkSaveIn.py | 4 ++-- module/plugins/crypter/LinkdecrypterCom.py | 1 + module/plugins/crypter/LixIn.py | 4 ++-- module/plugins/crypter/LofCc.py | 4 ++-- module/plugins/crypter/MediafireComFolder.py | 4 ++-- module/plugins/crypter/Movie2kTo.py | 4 ++-- module/plugins/crypter/MultiloadCz.py | 4 ++-- module/plugins/crypter/MultiuploadCom.py | 4 ++-- module/plugins/crypter/NosvideoCom.py | 1 + module/plugins/crypter/OneKhDe.py | 4 ++-- module/plugins/crypter/OronComFolder.py | 4 ++-- module/plugins/crypter/PastebinCom.py | 4 ++-- module/plugins/crypter/QuickshareCzFolder.py | 4 ++-- module/plugins/crypter/RSLayerCom.py | 4 ++-- module/plugins/crypter/RelinkUs.py | 4 ++-- module/plugins/crypter/SafelinkingNet.py | 4 ++-- module/plugins/crypter/SecuredIn.py | 4 ++-- module/plugins/crypter/ShareLinksBiz.py | 4 ++-- module/plugins/crypter/ShareRapidComFolder.py | 4 ++-- module/plugins/crypter/SpeedLoadOrgFolder.py | 4 ++-- module/plugins/crypter/StealthTo.py | 4 ++-- module/plugins/crypter/TnyCz.py | 4 ++-- module/plugins/crypter/TrailerzoneInfo.py | 4 ++-- module/plugins/crypter/UlozToFolder.py | 4 ++-- module/plugins/crypter/UploadedToFolder.py | 4 ++-- module/plugins/crypter/WiiReloadedOrg.py | 4 ++-- module/plugins/crypter/XupPl.py | 4 ++-- module/plugins/crypter/YoutubeBatch.py | 4 ++-- module/plugins/hooks/AlldebridCom.py | 4 ++-- module/plugins/hooks/Captcha9kw.py | 4 ++-- module/plugins/hooks/CaptchaTrader.py | 4 ++-- module/plugins/hooks/DebridItaliaCom.py | 4 ++-- module/plugins/hooks/EasybytezCom.py | 4 ++-- module/plugins/hooks/Ev0InFetcher.py | 4 ++-- module/plugins/hooks/FastixRu.py | 4 ++-- module/plugins/hooks/FreeWayMe.py | 4 ++-- module/plugins/hooks/HotFolder.py | 4 ++-- module/plugins/hooks/IRCInterface.py | 4 ++-- module/plugins/hooks/LinkdecrypterCom.py | 3 ++- module/plugins/hooks/MergeFiles.py | 4 ++-- module/plugins/hooks/MultiDebridCom.py | 4 ++-- module/plugins/hooks/MultiHome.py | 4 ++-- module/plugins/hooks/MultishareCz.py | 4 ++-- module/plugins/hooks/OverLoadMe.py | 4 ++-- module/plugins/hooks/PremiumizeMe.py | 4 ++-- module/plugins/hooks/RPNetBiz.py | 4 ++-- module/plugins/hooks/RealdebridCom.py | 4 ++-- module/plugins/hooks/RehostTo.py | 4 ++-- module/plugins/hooks/ReloadCc.py | 4 ++-- module/plugins/hooks/RestartFailed.py | 4 ++-- module/plugins/hooks/SimplydebridCom.py | 4 ++-- module/plugins/hooks/UnSkipOnFail.py | 4 ++-- module/plugins/hooks/UnrestrictLi.py | 4 ++-- module/plugins/hooks/UpdateManager.py | 4 ++-- module/plugins/hooks/WindowsPhoneToastNotify.py | 4 ++-- module/plugins/hooks/XFileSharingPro.py | 4 ++-- module/plugins/hooks/XMPPInterface.py | 4 ++-- module/plugins/hooks/ZeveraCom.py | 4 ++-- module/plugins/hoster/AlldebridCom.py | 4 ++-- module/plugins/hoster/BasePlugin.py | 4 ++-- module/plugins/hoster/BezvadataCz.py | 4 ++-- module/plugins/hoster/BillionuploadsCom.py | 4 ++-- module/plugins/hoster/BitshareCom.py | 4 ++-- module/plugins/hoster/BoltsharingCom.py | 4 ++-- module/plugins/hoster/CatShareNet.py | 4 ++-- module/plugins/hoster/ChipDe.py | 4 ++-- module/plugins/hoster/CramitIn.py | 4 ++-- module/plugins/hoster/CrockoCom.py | 4 ++-- module/plugins/hoster/CzshareCom.py | 3 ++- module/plugins/hoster/DailymotionCom.py | 4 ++-- module/plugins/hoster/DataHu.py | 2 +- module/plugins/hoster/DataportCz.py | 3 ++- module/plugins/hoster/DateiTo.py | 4 ++-- module/plugins/hoster/DebridItaliaCom.py | 4 ++-- module/plugins/hoster/DuploadOrg.py | 4 ++-- module/plugins/hoster/EdiskCz.py | 3 ++- module/plugins/hoster/EgoFilesCom.py | 4 ++-- module/plugins/hoster/EuroshareEu.py | 3 ++- module/plugins/hoster/ExtabitCom.py | 3 ++- module/plugins/hoster/FastixRu.py | 4 ++-- module/plugins/hoster/FileApeCom.py | 3 ++- module/plugins/hoster/FilebeerInfo.py | 4 ++-- module/plugins/hoster/FilecloudIo.py | 1 + module/plugins/hoster/FilefactoryCom.py | 4 ++-- module/plugins/hoster/FilejungleCom.py | 4 ++-- module/plugins/hoster/FilepostCom.py | 4 ++-- module/plugins/hoster/FilerNet.py | 4 ++-- module/plugins/hoster/FilerioCom.py | 4 ++-- module/plugins/hoster/FilesMailRu.py | 4 ++-- module/plugins/hoster/FileserveCom.py | 2 +- module/plugins/hoster/FileshareInUa.py | 4 ++-- module/plugins/hoster/FreeWayMe.py | 4 ++-- module/plugins/hoster/FreevideoCz.py | 3 ++- module/plugins/hoster/FshareVn.py | 4 ++-- module/plugins/hoster/GamefrontCom.py | 4 ++-- module/plugins/hoster/GigapetaCom.py | 4 ++-- module/plugins/hoster/GooIm.py | 4 ++-- module/plugins/hoster/HellshareCz.py | 3 ++- module/plugins/hoster/HellspyCz.py | 4 ++-- module/plugins/hoster/HugefilesNet.py | 4 ++-- module/plugins/hoster/HundredEightyUploadCom.py | 4 ++-- module/plugins/hoster/IFileWs.py | 4 ++-- module/plugins/hoster/IcyFilesCom.py | 4 ++-- module/plugins/hoster/IfileIt.py | 3 ++- module/plugins/hoster/IfolderRu.py | 4 ++-- module/plugins/hoster/JumbofilesCom.py | 4 ++-- module/plugins/hoster/Keep2shareCC.py | 4 ++-- module/plugins/hoster/LuckyShareNet.py | 4 ++-- module/plugins/hoster/MegasharesCom.py | 4 ++-- module/plugins/hoster/MovReelCom.py | 4 ++-- module/plugins/hoster/MultiDebridCom.py | 4 ++-- module/plugins/hoster/MultishareCz.py | 3 ++- module/plugins/hoster/MyvideoDe.py | 4 ++-- module/plugins/hoster/NarodRu.py | 3 ++- module/plugins/hoster/NosuploadCom.py | 1 + module/plugins/hoster/NowDownloadEu.py | 2 +- module/plugins/hoster/OverLoadMe.py | 4 ++-- module/plugins/hoster/PornhostCom.py | 4 ++-- module/plugins/hoster/PornhubCom.py | 4 ++-- module/plugins/hoster/PremiumizeMe.py | 4 ++-- module/plugins/hoster/QuickshareCz.py | 3 ++- module/plugins/hoster/RPNetBiz.py | 4 ++-- module/plugins/hoster/RarefileNet.py | 4 ++-- module/plugins/hoster/RealdebridCom.py | 4 ++-- module/plugins/hoster/RedtubeCom.py | 4 ++-- module/plugins/hoster/RehostTo.py | 4 ++-- module/plugins/hoster/ReloadCc.py | 4 ++-- module/plugins/hoster/RgHostNet.py | 4 ++-- module/plugins/hoster/SecureUploadEu.py | 4 ++-- module/plugins/hoster/SendmywayCom.py | 4 ++-- module/plugins/hoster/SendspaceCom.py | 3 ++- module/plugins/hoster/Share4webCom.py | 3 ++- module/plugins/hoster/Share76Com.py | 3 ++- module/plugins/hoster/ShareRapidCom.py | 2 +- module/plugins/hoster/SharebeesCom.py | 4 ++-- module/plugins/hoster/ShareplaceCom.py | 4 ++-- module/plugins/hoster/SimplydebridCom.py | 4 ++-- module/plugins/hoster/SockshareCom.py | 2 +- module/plugins/hoster/SoundcloudCom.py | 4 ++-- module/plugins/hoster/SpeedLoadOrg.py | 4 ++-- module/plugins/hoster/SpeedfileCz.py | 3 ++- module/plugins/hoster/StreamCz.py | 3 ++- module/plugins/hoster/StreamcloudEu.py | 4 ++-- module/plugins/hoster/TurbobitNet.py | 4 ++-- module/plugins/hoster/TurbouploadCom.py | 4 ++-- module/plugins/hoster/TwoSharedCom.py | 4 ++-- module/plugins/hoster/UlozTo.py | 3 ++- module/plugins/hoster/UloziskoSk.py | 3 ++- module/plugins/hoster/UnibytesCom.py | 3 ++- module/plugins/hoster/UnrestrictLi.py | 4 ++-- module/plugins/hoster/VeehdCom.py | 4 ++-- module/plugins/hoster/WarserverCz.py | 3 ++- module/plugins/hoster/WebshareCz.py | 4 ++-- module/plugins/hoster/WrzucTo.py | 4 ++-- module/plugins/hoster/WuploadCom.py | 2 +- module/plugins/hoster/X7To.py | 4 ++-- module/plugins/hoster/Xdcc.py | 4 ++-- module/plugins/hoster/YibaishiwuCom.py | 3 ++- module/plugins/hoster/YoupornCom.py | 4 ++-- module/plugins/hoster/ZeveraCom.py | 4 ++-- module/plugins/internal/DeadCrypter.py | 4 ++-- module/plugins/internal/DeadHoster.py | 4 ++-- module/plugins/internal/XFSPAccount.py | 4 ++-- 243 files changed, 474 insertions(+), 444 deletions(-) diff --git a/module/plugins/Account.py b/module/plugins/Account.py index c147404e09..af286c3931 100644 --- a/module/plugins/Account.py +++ b/module/plugins/Account.py @@ -39,8 +39,8 @@ class Account(Base): __version__ = "0.2" __type__ = "account" __description__ = """Account Plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" #: after that time [in minutes] pyload will relogin the account login_timeout = 600 diff --git a/module/plugins/Container.py b/module/plugins/Container.py index c233d37103..0a2e372173 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -29,8 +29,8 @@ class Container(Crypter): __pattern__ = None __type__ = "container" __description__ = """Base container plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def preprocessing(self, thread): diff --git a/module/plugins/Crypter.py b/module/plugins/Crypter.py index d1549fe809..79860a3f43 100644 --- a/module/plugins/Crypter.py +++ b/module/plugins/Crypter.py @@ -25,8 +25,8 @@ class Crypter(Plugin): __pattern__ = None __type__ = "container" __description__ = """Base crypter plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def __init__(self, pyfile): Plugin.__init__(self, pyfile) diff --git a/module/plugins/Hoster.py b/module/plugins/Hoster.py index 814a709492..0489c3d09c 100644 --- a/module/plugins/Hoster.py +++ b/module/plugins/Hoster.py @@ -29,5 +29,5 @@ class Hoster(Plugin): __pattern__ = None __type__ = "hoster" __description__ = """Base hoster plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index 6156605a70..5d5c48c206 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -12,8 +12,8 @@ class AlldebridCom(Account): __version__ = "0.22" __type__ = "account" __description__ = """AllDebrid.com account plugin""" - __author_name__ = ("Andy, Voigt") - __author_mail__ = ("spamsales@online.de") + __author_name__ = "Andy Voigt" + __author_mail__ = "spamsales@online.de" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py index bf5cc54afb..a749527240 100644 --- a/module/plugins/accounts/BayfilesCom.py +++ b/module/plugins/accounts/BayfilesCom.py @@ -28,8 +28,8 @@ class BayfilesCom(Account): __version__ = "0.02" __type__ = "account" __description__ = """bayfiles.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): for i in range(2): diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index de1e19f514..4fe01aa5bf 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -25,7 +25,8 @@ class BitshareCom(Account): __version__ = "0.12" __type__ = "account" __description__ = """Bitshare account plugin""" - __author_name__ = ("Paul King") + __author_name__ = "Paul King" + __author_mail__ = "" def loadAccountInfo(self, user, req): page = req.load("http://bitshare.com/mysettings.html") diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py index b0334b191c..be7baff9d3 100644 --- a/module/plugins/accounts/CramitIn.py +++ b/module/plugins/accounts/CramitIn.py @@ -7,7 +7,7 @@ class CramitIn(XFSPAccount): __version__ = "0.01" __type__ = "account" __description__ = """cramit.in account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://cramit.in/" diff --git a/module/plugins/accounts/CyberlockerCh.py b/module/plugins/accounts/CyberlockerCh.py index 0eaa262ebf..1deac27308 100644 --- a/module/plugins/accounts/CyberlockerCh.py +++ b/module/plugins/accounts/CyberlockerCh.py @@ -8,8 +8,8 @@ class CyberlockerCh(XFSPAccount): __version__ = "0.01" __type__ = "account" __description__ = """CyberlockerCh account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" MAIN_PAGE = "http://cyberlocker.ch/" diff --git a/module/plugins/accounts/DdlstorageCom.py b/module/plugins/accounts/DdlstorageCom.py index 7404348a43..08ff537da7 100644 --- a/module/plugins/accounts/DdlstorageCom.py +++ b/module/plugins/accounts/DdlstorageCom.py @@ -15,8 +15,8 @@ class DdlstorageCom(XFSPAccount): __version__ = "1.00" __type__ = "account" __description__ = """DDLStorage.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" MAIN_PAGE = "http://ddlstorage.com/" diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index 82acd8f8ed..fb1c9ef5cb 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -26,8 +26,8 @@ class DebridItaliaCom(Account): __version__ = "0.1" __type__ = "account" __description__ = """debriditalia.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" WALID_UNTIL_PATTERN = r"Premium valid till: (?P<D>[^|]+) \|" diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index ffd132ba36..b14031779f 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -30,8 +30,8 @@ class EasybytezCom(Account): __version__ = "0.04" __type__ = "account" __description__ = """EasyBytez.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" VALID_UNTIL_PATTERN = r'Premium account expire:</TD><TD><b>([^<]+)</b>' TRAFFIC_LEFT_PATTERN = r'<TR><TD>Traffic available today:</TD><TD><b>(?P<S>[^<]+)</b>' diff --git a/module/plugins/accounts/EgoFilesCom.py b/module/plugins/accounts/EgoFilesCom.py index 9c2b918c32..67a4a1acaf 100644 --- a/module/plugins/accounts/EgoFilesCom.py +++ b/module/plugins/accounts/EgoFilesCom.py @@ -12,8 +12,8 @@ class EgoFilesCom(Account): __version__ = "0.2" __type__ = "account" __description__ = """egofiles.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" PREMIUM_ACCOUNT_PATTERN = '<br/>\s*Premium: (?P<P>[^/]*) / Traffic left: (?P<T>[\d.]*) (?P<U>\w*)\s*\\n\s*<br/>' diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index 830c1db3f5..e0c8a9e4aa 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -28,8 +28,8 @@ class EuroshareEu(Account): __version__ = "0.01" __type__ = "account" __description__ = """euroshare.eu account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): self.relogin(user) diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py index 3e1896e440..14ac6ef70e 100644 --- a/module/plugins/accounts/FastixRu.py +++ b/module/plugins/accounts/FastixRu.py @@ -7,8 +7,8 @@ class FastixRu(Account): __version__ = "0.02" __type__ = "account" __description__ = """Fastix account plugin""" - __author_name__ = ("Massimo, Rosamilia") - __author_mail__ = ("max@spiritix.eu") + __author_name__ = "Massimo Rosamilia" + __author_mail__ = "max@spiritix.eu" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index 2f2a6012d3..fb56693d9f 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -28,8 +28,8 @@ class FilejungleCom(Account): __version__ = "0.11" __type__ = "account" __description__ = """filejungle.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" login_timeout = 60 diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index 45ce5ab379..66988c3386 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -27,8 +27,8 @@ class FilerNet(Account): __version__ = "0.01" __type__ = "account" __description__ = """Filer.net account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />' WALID_UNTIL_PATTERN = r"Der Premium-Zugang ist gültig bis (.+)\.\s*</td>" diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py index 8b0b5f54fc..61626c317b 100644 --- a/module/plugins/accounts/FilerioCom.py +++ b/module/plugins/accounts/FilerioCom.py @@ -7,7 +7,7 @@ class FilerioCom(XFSPAccount): __version__ = "0.01" __type__ = "account" __description__ = """FileRio.in account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://filerio.in/" diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py index ea976bd447..c316ebf42e 100644 --- a/module/plugins/accounts/FilesMailRu.py +++ b/module/plugins/accounts/FilesMailRu.py @@ -25,8 +25,8 @@ class FilesMailRu(Account): __version__ = "0.1" __type__ = "account" __description__ = """filesmail.ru account plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def loadAccountInfo(self, user, req): return {"validuntil": None, "trafficleft": None} diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index d4056891a3..d6f286cfd8 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -28,8 +28,8 @@ class FileserveCom(Account): __version__ = "0.2" __type__ = "account" __description__ = """fileserve.com account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py index 69a465671a..ba692d2dbc 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -26,8 +26,8 @@ class FourSharedCom(Account): __version__ = "0.01" __type__ = "account" __description__ = """FourSharedCom account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): #fixme diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index cdf45114aa..dd666f6532 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -27,8 +27,8 @@ class FreakshareCom(Account): __version__ = "0.1" __type__ = "account" __description__ = """freakshare.com account plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def loadAccountInfo(self, user, req): page = req.load("http://freakshare.com/") diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py index 0222ad65ff..955cc3c7f1 100644 --- a/module/plugins/accounts/FreeWayMe.py +++ b/module/plugins/accounts/FreeWayMe.py @@ -26,8 +26,8 @@ class FreeWayMe(Account): __version__ = "0.11" __type__ = "account" __description__ = """FreeWayMe account plugin""" - __author_name__ = ("Nicolas Giese") - __author_mail__ = ("james@free-way.me") + __author_name__ = "Nicolas Giese" + __author_mail__ = "james@free-way.me" def loadAccountInfo(self, user, req): status = self.getAccountStatus(user, req) diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py index 681d14cea9..b454cba7a1 100644 --- a/module/plugins/accounts/Ftp.py +++ b/module/plugins/accounts/Ftp.py @@ -8,7 +8,7 @@ class Ftp(Account): __version__ = "0.01" __type__ = "account" __description__ = """Ftp dummy account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" login_timeout = info_threshold = 1000000 diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index 4718ade996..0759912e68 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -28,8 +28,8 @@ class HellshareCz(Account): __version__ = "0.14" __type__ = "account" __description__ = """hellshare.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>' diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py index 5701d1f039..e2f236e412 100644 --- a/module/plugins/accounts/Http.py +++ b/module/plugins/accounts/Http.py @@ -8,7 +8,7 @@ class Http(Account): __version__ = "0.01" __type__ = "account" __description__ = """Http dummy account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" login_timeout = info_threshold = 1000000 diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py index bcc004b91d..9e2f570b3e 100644 --- a/module/plugins/accounts/LetitbitNet.py +++ b/module/plugins/accounts/LetitbitNet.py @@ -24,8 +24,8 @@ class LetitbitNet(Account): __version__ = "0.01" __type__ = "account" __description__ = """Letitbit.net account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def loadAccountInfo(self, user, req): ## DISABLED BECAUSE IT GET 'key exausted' EVEN IF VALID ## diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py index e7d5f9ca91..4c44ddfadb 100644 --- a/module/plugins/accounts/MegasharesCom.py +++ b/module/plugins/accounts/MegasharesCom.py @@ -11,8 +11,8 @@ class MegasharesCom(Account): __version__ = "0.02" __type__ = "account" __description__ = """megashares.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>' diff --git a/module/plugins/accounts/MultiDebridCom.py b/module/plugins/accounts/MultiDebridCom.py index 904be5ee76..987c7f6f24 100644 --- a/module/plugins/accounts/MultiDebridCom.py +++ b/module/plugins/accounts/MultiDebridCom.py @@ -26,8 +26,8 @@ class MultiDebridCom(Account): __version__ = "0.01" __type__ = "account" __description__ = """Multi-debrid.com account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def loadAccountInfo(self, user, req): if 'days_left' in self.json_data: diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py index 273936615b..8d3a12d503 100644 --- a/module/plugins/accounts/MultishareCz.py +++ b/module/plugins/accounts/MultishareCz.py @@ -29,8 +29,8 @@ class MultishareCz(Account): __version__ = "0.02" __type__ = "account" __description__ = """multishare.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[0-9,]+) (?P<U>\w+)</strong>' ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">' diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py index e288181ebf..23ec10f7d9 100644 --- a/module/plugins/accounts/OverLoadMe.py +++ b/module/plugins/accounts/OverLoadMe.py @@ -7,8 +7,8 @@ class OverLoadMe(Account): __version__ = "0.01" __type__ = "account" __description__ = """Over-Load.me account plugin""" - __author_name__ = ("marley") - __author_mail__ = ("marley@over-load.me") + __author_name__ = "marley" + __author_mail__ = "marley@over-load.me" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py index c5c712c52f..fe12601a20 100644 --- a/module/plugins/accounts/PremiumizeMe.py +++ b/module/plugins/accounts/PremiumizeMe.py @@ -8,8 +8,8 @@ class PremiumizeMe(Account): __version__ = "0.11" __type__ = "account" __description__ = """Premiumize.Me account plugin""" - __author_name__ = ("Florian Franzen") - __author_mail__ = ("FlorianFranzen@gmail.com") + __author_name__ = "Florian Franzen" + __author_mail__ = "FlorianFranzen@gmail.com" def loadAccountInfo(self, user, req): # Get user data from premiumize.me diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index 1af7cbffd7..514db235ff 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -27,8 +27,8 @@ class QuickshareCz(Account): __version__ = "0.01" __type__ = "account" __description__ = """quickshare.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): html = req.load("http://www.quickshare.cz/premium", decode=True) diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py index ceb5e6bbb3..6c5b766539 100644 --- a/module/plugins/accounts/RPNetBiz.py +++ b/module/plugins/accounts/RPNetBiz.py @@ -7,8 +7,8 @@ class RPNetBiz(Account): __version__ = "0.1" __type__ = "account" __description__ = """RPNet.biz account plugin""" - __author_name__ = ("Dman") - __author_mail__ = ("dmanugm@gmail.com") + __author_name__ = "Dman" + __author_mail__ = "dmanugm@gmail.com" def loadAccountInfo(self, user, req): # Get account information from rpnet.biz diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py index 8a02b712c9..5fae5ea7e0 100644 --- a/module/plugins/accounts/RapidgatorNet.py +++ b/module/plugins/accounts/RapidgatorNet.py @@ -26,8 +26,8 @@ class RapidgatorNet(Account): __version__ = "0.04" __type__ = "account" __description__ = """rapidgator.net account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" API_URL = 'http://rapidgator.net/api/user' diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py index b2066cd1ec..bc41ac5e1c 100644 --- a/module/plugins/accounts/RapidshareCom.py +++ b/module/plugins/accounts/RapidshareCom.py @@ -25,8 +25,8 @@ class RapidshareCom(Account): __version__ = "0.22" __type__ = "account" __description__ = """Rapidshare.com account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py index f4ae4a79a3..c79bc2cc5f 100644 --- a/module/plugins/accounts/RarefileNet.py +++ b/module/plugins/accounts/RarefileNet.py @@ -7,7 +7,7 @@ class RarefileNet(XFSPAccount): __version__ = "0.02" __type__ = "account" __description__ = """RareFile.net account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://rarefile.net/" diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py index a9980b088e..334334a78f 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -8,8 +8,8 @@ class RealdebridCom(Account): __version__ = "0.43" __type__ = "account" __description__ = """Real-Debrid.com account plugin""" - __author_name__ = ("Devirex, Hazzard") - __author_mail__ = ("naibaf_11@yahoo.de") + __author_name__ = "Devirex Hazzard" + __author_mail__ = "naibaf_11@yahoo.de" def loadAccountInfo(self, user, req): if self.pin_code: diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index 58c91801b3..f040ddbb14 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -6,8 +6,8 @@ class RehostTo(Account): __version__ = "0.1" __type__ = "account" __description__ = """Rehost.to account plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def loadAccountInfo(self, user, req): data = self.getAccountData(user) diff --git a/module/plugins/accounts/ReloadCc.py b/module/plugins/accounts/ReloadCc.py index b3c26c6d34..3bc28ee9f1 100644 --- a/module/plugins/accounts/ReloadCc.py +++ b/module/plugins/accounts/ReloadCc.py @@ -11,8 +11,8 @@ class ReloadCc(Account): __type__ = "account" __description__ = """Reload.Cc account plugin""" - __author_name__ = ("Reload Team") - __author_mail__ = ("hello@reload.cc") + __author_name__ = "Reload Team" + __author_mail__ = "hello@reload.cc" def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py index b532768b1a..776773eb61 100644 --- a/module/plugins/accounts/ShareRapidCom.py +++ b/module/plugins/accounts/ShareRapidCom.py @@ -11,6 +11,7 @@ class ShareRapidCom(Account): __type__ = "account" __description__ = """ShareRapid account plugin""" __author_name__ = ("MikyWoW", "zoidberg") + __author_mail__ = ("mikywow@seznam.cz", "zoidberg@mujmail.cz") login_timeout = 60 diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py index 82b499bbd1..daa102df0a 100644 --- a/module/plugins/accounts/SimplydebridCom.py +++ b/module/plugins/accounts/SimplydebridCom.py @@ -9,8 +9,8 @@ class SimplydebridCom(Account): __version__ = "0.1" __type__ = "account" __description__ = """Simply-Debrid.com account plugin""" - __author_name__ = ("Kagenoshin") - __author_mail__ = ("kagenoshin@gmx.ch") + __author_name__ = "Kagenoshin" + __author_mail__ = "kagenoshin@gmx.ch" def loadAccountInfo(self, user, req): get_data = {'login': 2, 'u': self.loginname, 'p': self.password} diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py index 6e2b1c96d1..e371a89b12 100644 --- a/module/plugins/accounts/StahnuTo.py +++ b/module/plugins/accounts/StahnuTo.py @@ -28,8 +28,8 @@ class StahnuTo(Account): __version__ = "0.02" __type__ = "account" __description__ = """StahnuTo account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" #login_timeout = 60 diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index 5d4471c306..73615b13a5 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -28,8 +28,8 @@ class TurbobitNet(Account): __version__ = "0.01" __type__ = "account" __description__ = """TurbobitNet account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" #login_timeout = 60 diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index 429a32db31..e1596e164a 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -11,7 +11,7 @@ class UlozTo(Account): __type__ = "account" __description__ = """uloz.to account plugin""" __author_name__ = ("zoidberg", "pulpe") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_mail__ = "zoidberg@mujmail.cz" TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([0-9.]+) MB"' diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py index 58fb0f7e55..d2c78927d5 100644 --- a/module/plugins/accounts/UnrestrictLi.py +++ b/module/plugins/accounts/UnrestrictLi.py @@ -24,8 +24,8 @@ class UnrestrictLi(Account): __version__ = "0.03" __type__ = "account" __description__ = """Unrestrict.li account plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def loadAccountInfo(self, user, req): json_data = req.load('http://unrestrict.li/api/jdownloader/user.php?format=json') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index ac1f3fd359..a9e86e2977 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -28,8 +28,8 @@ class UploadedTo(Account): __version__ = "0.26" __type__ = "account" __description__ = """ul.net account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index 12463f2857..c43dcfbd19 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -13,8 +13,8 @@ class UploadheroCom(Account): __version__ = "0.2" __type__ = "account" __description__ = """Uploadhero.co account plugin""" - __author_name__ = ("mcmyst") - __author_mail__ = ("mcmyst@hotmail.fr") + __author_name__ = "mcmyst" + __author_mail__ = "mcmyst@hotmail.fr" def loadAccountInfo(self, user, req): premium_pattern = re.compile('Il vous reste <span class="bleu">([0-9]+)</span> jours premium.') diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py index d13df4f9d0..187434b197 100644 --- a/module/plugins/accounts/UploadingCom.py +++ b/module/plugins/accounts/UploadingCom.py @@ -28,8 +28,8 @@ class UploadingCom(Account): __version__ = "0.1" __type__ = "account" __description__ = """uploading.com account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def loadAccountInfo(self, user, req): src = req.load("http://uploading.com/") diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index 17ca81f68a..0215254bd3 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -7,8 +7,8 @@ class UptoboxCom(XFSPAccount): __version__ = "0.02" __type__ = "account" __description__ = """DDLStorage.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" MAIN_PAGE = "http://uptobox.com/" diff --git a/module/plugins/accounts/WarserverCz.py b/module/plugins/accounts/WarserverCz.py index 2c871eb6d3..62c7e19fad 100644 --- a/module/plugins/accounts/WarserverCz.py +++ b/module/plugins/accounts/WarserverCz.py @@ -28,8 +28,8 @@ class WarserverCz(Account): __version__ = "0.02" __type__ = "account" __description__ = """Warserver.cz account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" VALID_UNTIL_PATTERN = ur'<li>Neomezené stahování do: <strong>(.+?)<' TRAFFIC_LEFT_PATTERN = ur'<li>Kredit: <strong>(.+?)<' diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py index c4eab74dcc..75aae25b9e 100644 --- a/module/plugins/accounts/YibaishiwuCom.py +++ b/module/plugins/accounts/YibaishiwuCom.py @@ -27,8 +27,8 @@ class YibaishiwuCom(Account): __version__ = "0.01" __type__ = "account" __description__ = """115.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}' diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index 13ed95133b..dfc6047e69 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -9,8 +9,8 @@ class ZeveraCom(Account): __version__ = "0.21" __type__ = "account" __description__ = """Zevera.com account plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def loadAccountInfo(self, user, req): data = self.getAPIData(req) diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 301b033d4a..f7bb7a889e 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -15,8 +15,8 @@ class CCF(Container): __version__ = "0.2" __pattern__ = r"(?!http://).*\.ccf$" __description__ = """CCF Container Convert Plugin""" - __author_name__ = ("Willnix") - __author_mail__ = ("Willnix@pyload.org") + __author_name__ = "Willnix" + __author_mail__ = "Willnix@pyload.org" def decrypt(self, pyfile): diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py index b77ddb9d95..86754915de 100644 --- a/module/plugins/crypter/BitshareComFolder.py +++ b/module/plugins/crypter/BitshareComFolder.py @@ -24,8 +24,8 @@ class BitshareComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?bitshare\.com/\?d=\w+" __version__ = "0.01" __description__ = """Bitshare.com Folder Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'<a href="(http://bitshare.com/files/.+)">.+</a></td>' TITLE_PATTERN = r'View public folder "(?P<title>.+)"</h1>' diff --git a/module/plugins/crypter/C1neonCom.py b/module/plugins/crypter/C1neonCom.py index c1e9013b38..5506820af7 100644 --- a/module/plugins/crypter/C1neonCom.py +++ b/module/plugins/crypter/C1neonCom.py @@ -9,5 +9,5 @@ class C1neonCom(DeadCrypter): __pattern__ = r"http://(www\.)?c1neon.com/.*?" __version__ = "0.05" __description__ = """C1neon.Com Container Plugin""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index ffa8039a14..fa616fb28c 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -9,7 +9,7 @@ class CrockoComFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?crocko.com/f/.*" __version__ = "0.01" __description__ = """Crocko.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>' \ No newline at end of file diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index 679e891b95..7fe0cb0362 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -9,5 +9,5 @@ class CryptItCom(DeadCrypter): __pattern__ = r"http://[\w\.]*?crypt-it\.com/(s|e|d|c)/[\w]+" __version__ = "0.11" __description__ = """Crypt.It.com Container Plugin""" - __author_name__ = ("jeix") - __author_mail__ = ("jeix@hasnomail.de") + __author_name__ = "jeix" + __author_mail__ = "jeix@hasnomail.de" diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index 9ccda3ed2b..5d352702fc 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -10,8 +10,8 @@ class CzshareComFolder(Crypter): __pattern__ = r"http://(\w*\.)*czshare\.(com|cz)/folders/.*" __version__ = "0.1" __description__ = """Czshare.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>' LINK_PATTERN = r'<td class="col2"><a href="([^"]+)">info</a></td>' diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py index 822addca13..c92d3accab 100644 --- a/module/plugins/crypter/DDLMusicOrg.py +++ b/module/plugins/crypter/DDLMusicOrg.py @@ -13,8 +13,8 @@ class DDLMusicOrg(Crypter): __pattern__ = r"http://[\w\.]*?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+" __version__ = "0.3" __description__ = """ddl-music.org Container Plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def setup(self): self.multiDL = False diff --git a/module/plugins/crypter/DailymotionBatch.py b/module/plugins/crypter/DailymotionBatch.py index 1427bdc133..ad1cae67f4 100644 --- a/module/plugins/crypter/DailymotionBatch.py +++ b/module/plugins/crypter/DailymotionBatch.py @@ -31,8 +31,8 @@ class DailymotionBatch(Crypter): __pattern__ = r"https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)" __version__ = "0.01" __description__ = """Dailymotion channel & playlist decrypter""" - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" def api_response(self, ref, req=None): url = urljoin("https://api.dailymotion.com/", ref) diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index f710f60d7e..cbc4289e59 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -27,7 +27,7 @@ class DataHuFolder(SimpleCrypter): __version__ = "0.03" __description__ = """Data.hu Folder Plugin""" __author_name__ = ("crash", "stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r"<a href='(http://data\.hu/get/.+)' target='_blank'>\1</a>" TITLE_PATTERN = ur'<title>(?P<title>.+) Let\xf6lt\xe9se' diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 15c317acfc..2bb32b0729 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -9,7 +9,7 @@ class DepositfilesComFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?depositfiles.com/folders/\w+" __version__ = "0.01" __description__ = """Depositfiles.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'
    ]*>\s*' diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 7b7c34feec..46001918f3 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -27,8 +27,8 @@ class Dereferer(Crypter): __pattern__ = r'https?://([^/]+)/.*?(?P(ht|f)tps?(://|%3A%2F%2F).*)' __version__ = "0.1" __description__ = """Crypter for dereferers""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def decrypt(self, pyfile): link = re.match(self.__pattern__, self.pyfile.url).group('url') diff --git a/module/plugins/crypter/DontKnowMe.py b/module/plugins/crypter/DontKnowMe.py index 0791e3c22f..03a016d27b 100644 --- a/module/plugins/crypter/DontKnowMe.py +++ b/module/plugins/crypter/DontKnowMe.py @@ -12,8 +12,8 @@ class DontKnowMe(Crypter): __pattern__ = r"http://dontknow.me/at/\?.+$" __version__ = "0.1" __description__ = """DontKnowMe""" - __author_name__ = ("selaux") - __author_mail__ = ("") + __author_name__ = "selaux" + __author_mail__ = "" LINK_PATTERN = r"http://dontknow.me/at/\?(.+)$" diff --git a/module/plugins/crypter/DownloadVimeoCom.py b/module/plugins/crypter/DownloadVimeoCom.py index 5626725996..9b5fd552a3 100644 --- a/module/plugins/crypter/DownloadVimeoCom.py +++ b/module/plugins/crypter/DownloadVimeoCom.py @@ -13,8 +13,9 @@ class DownloadVimeoCom(Crypter): ## The download from dailymotion failed with a 403 __version__ = '0.1' __description__ = """Video Download Plugin based on downloadvimeo.com""" - __author_name__ = ('4Christopher') - __author_mail__ = ('4Christopher@gmx.de') + __author_name__ = "4Christopher" + __author_mail__ = "4Christopher@gmx.de" + BASE_URL = 'http://downloadvimeo.com' def decrypt(self, pyfile): diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 64302c800b..6a157a9c0f 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -11,8 +11,8 @@ class DuckCryptInfo(Crypter): __pattern__ = r"http://(?:www\.)?duckcrypt.info/(folder|wait|link)/(\w+)/?(\w*)" __version__ = "0.02" __description__ = """DuckCrypt.Info Container Plugin""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" TIMER_PATTERN = r'(.*)' diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py index a1918f055a..3f179cd347 100644 --- a/module/plugins/crypter/DuploadOrgFolder.py +++ b/module/plugins/crypter/DuploadOrgFolder.py @@ -24,7 +24,7 @@ class DuploadOrgFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?dupload\.org/folder/\d+/" __version__ = "0.01" __description__ = """Dupload.org Folder Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'[^<]+' diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 104ec3fd71..0e28fc35e1 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -24,8 +24,8 @@ class EasybytezComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?easybytez\.com/users/(?P\d+/\d+)" __version__ = "0.05" __description__ = """Easybytez Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g?per_page=10000")] diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 122c0f6719..956fa6bfba 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -13,8 +13,8 @@ class EmbeduploadCom(Crypter): __description__ = """EmbedUpload.com crypter""" __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "embedupload"), ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'
    ]*>\s*' diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index b6bf4fd071..311c1960a7 100644 --- a/module/plugins/crypter/FilebeerInfoFolder.py +++ b/module/plugins/crypter/FilebeerInfoFolder.py @@ -9,6 +9,6 @@ class FilebeerInfoFolder(DeadCrypter): __pattern__ = r"http://(?:www\.)?filebeer\.info/(\d+~f).*" __version__ = "0.02" __description__ = """Filebeer.info Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index 64b8ac37e2..547b8e873c 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -10,8 +10,8 @@ class FilefactoryComFolder(Crypter): __pattern__ = r"(http://(www\.)?filefactory\.com/f/\w+).*" __version__ = "0.1" __description__ = """Filefactory.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'(.*?)
    ' LINK_PATTERN = r'    ' diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 42481c15e8..0bf42f56e4 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -11,8 +11,8 @@ class FileserveComFolder(Crypter): __pattern__ = r"http://(?:www\.)?fileserve.com/list/\w+" __version__ = "0.11" __description__ = """FileServeCom.com Folder Plugin""" - __author_name__ = ("fionnc") - __author_mail__ = ("fionnc@gmail.com") + __author_name__ = "fionnc" + __author_mail__ = "fionnc@gmail.com" FOLDER_PATTERN = r'(.*?)
    ' LINK_PATTERN = r'    ' diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py index bb90e63b8a..2595fa72a8 100644 --- a/module/plugins/crypter/FilestubeCom.py +++ b/module/plugins/crypter/FilestubeCom.py @@ -24,8 +24,8 @@ class FilestubeCom(SimpleCrypter): __pattern__ = r"http://(?:w{3}.)?filestube\.(?:com|to)/\w+" __version__ = "0.03" __description__ = """Filestube.com Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r"]* href=\"(http://[^\"]+)" TITLE_PATTERN = r" (?P.+) download\s*</h1>" diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index 519a468f3d..1e86afdc1c 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -26,8 +26,8 @@ class FreakhareComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?freakshare\.com/folder/.+" __version__ = "0.01" __description__ = """Freakhare.com Folder Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'<a href="(http://freakshare.com/files/[^"]+)" target="_blank">' TITLE_PATTERN = r'Folder:</b> (?P<title>.+)' diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index 8d165abe4a..7c838e6090 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -26,8 +26,8 @@ class FreetexthostCom(SimpleCrypter): __pattern__ = r"http://(?:w{3}.)?freetexthost\.com/\w+" __version__ = "0.01" __description__ = """Freetexthost.com Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def getLinks(self): m = re.search(r'<div id="contentsinner">\s*(.+)<div class="viewcount">', self.html, re.DOTALL) diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index 2d7a3c490d..77217ff544 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -9,7 +9,7 @@ class FshareVnFolder(SimpleCrypter): __pattern__ = r"http://(www\.)?fshare.vn/folder/.*" __version__ = "0.01" __description__ = """Fshare.vn Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">' diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py index bcb1d74945..7b78af9268 100644 --- a/module/plugins/crypter/GooGl.py +++ b/module/plugins/crypter/GooGl.py @@ -25,8 +25,8 @@ class GooGl(Crypter): __pattern__ = r"https?://(www\.)?goo\.gl/\w+" __version__ = "0.01" __description__ = """Goo.gl Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" API_URL = 'https://www.googleapis.com/urlshortener/v1/url' diff --git a/module/plugins/crypter/HotfileFolderCom.py b/module/plugins/crypter/HotfileFolderCom.py index 79691ad01b..3836bcb340 100644 --- a/module/plugins/crypter/HotfileFolderCom.py +++ b/module/plugins/crypter/HotfileFolderCom.py @@ -12,8 +12,8 @@ class HotfileFolderCom(Crypter): __pattern__ = r"http://(?:www\.)?hotfile.com/list/\w+/\w+" __version__ = "0.1" __description__ = """HotfileFolder Download Plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def decrypt(self, pyfile): html = self.load(pyfile.url) diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index d155f4bb60..ca6dd5026a 100644 --- a/module/plugins/crypter/ILoadTo.py +++ b/module/plugins/crypter/ILoadTo.py @@ -9,5 +9,5 @@ class ILoadTo(DeadCrypter): __pattern__ = r"http://iload\.to/go/\d+-[\w\.-]+/" __version__ = "0.11" __description__ = """iload.to Crypter Plugin""" - __author_name__ = ("hzpz") - __author_mail__ = ("") + __author_name__ = "hzpz" + __author_mail__ = "" diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 129da6608d..d75ab463c4 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -21,8 +21,8 @@ class LinkSaveIn(Crypter): __pattern__ = r"http://(www\.)?linksave.in/(?P<id>\w+)$" __version__ = "2.01" __description__ = """LinkSave.in Crypter Plugin""" - __author_name__ = ("fragonib") - __author_mail__ = ("fragonib[AT]yahoo[DOT]es") + __author_name__ = "fragonib" + __author_mail__ = "fragonib[AT]yahoo[DOT]es" # Constants _JK_KEY_ = "jk" diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 6a11c98b08..1880e03ebc 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -26,6 +26,7 @@ class LinkdecrypterCom(Crypter): __version__ = "0.27" __description__ = """linkdecrypter.com""" __author_name__ = ("zoidberg", "flowlee") + __author_mail__ = ("zoidberg@mujmail.cz", "") TEXTAREA_PATTERN = r'<textarea name="links" wrap="off" readonly="1" class="caja_des">(.+)</textarea>' PASSWORD_PATTERN = r'<input type="text" name="password"' diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index 52abe1b3c5..6e4d8fe898 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -12,8 +12,8 @@ class LixIn(Crypter): __pattern__ = r"http://(www.)?lix.in/(?P<id>.*)" __version__ = "0.22" __description__ = """Lix.in Container Plugin""" - __author_name__ = ("spoob") - __author_mail__ = ("spoob@pyload.org") + __author_name__ = "spoob" + __author_mail__ = "spoob@pyload.org" CAPTCHA_PATTERN = '<img src="(?P<image>captcha_img.php\?.*?)"' SUBMIT_PATTERN = r"value='continue.*?'" diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py index 4586098811..e3aec6b734 100644 --- a/module/plugins/crypter/LofCc.py +++ b/module/plugins/crypter/LofCc.py @@ -9,5 +9,5 @@ class LofCc(DeadCrypter): __pattern__ = r"http://lof.cc/(.*)" __version__ = "0.21" __description__ = """lof.cc Plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index 3709d33493..1c0c389da8 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -12,8 +12,8 @@ class MediafireComFolder(Crypter): __pattern__ = r"http://(\w*\.)*mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))" __version__ = "0.14" __description__ = """Mediafire.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_KEY_PATTERN = r"var afI= '(\w+)';" FILE_URL_PATTERN = '<meta property="og:url" content="http://www.mediafire.com/\?(\w+)"/>' diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index c9c3f8f2de..8119ba814e 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -9,5 +9,5 @@ class Movie2kTo(DeadCrypter): __pattern__ = r"http://(?:www\.)?movie2k\.to/(.*)\.html" __version__ = "0.51" __description__ = """Movie2k.to Container Plugin""" - __author_name__ = ("4Christopher") - __author_mail__ = ("4Christopher@gmx.de") + __author_name__ = "4Christopher" + __author_mail__ = "4Christopher@gmx.de" diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 055d723755..dcc27f2e7d 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -12,8 +12,8 @@ class MultiloadCz(Crypter): __description__ = """multiload.cz""" __config__ = [("usedHoster", "str", "Prefered hoster list (bar-separated) ", ""), ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>' LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="([^"]+)">' diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index 111ecdf6c8..f54566b100 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -15,8 +15,8 @@ class MultiuploadCom(Crypter): __description__ = """MultiUpload.com crypter""" __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "multiupload"), ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" ML_LINK_PATTERN = r'<div id="downloadbutton_" style=""><a href="([^"]+)"' diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py index 49b932fc0c..eae8360380 100644 --- a/module/plugins/crypter/NosvideoCom.py +++ b/module/plugins/crypter/NosvideoCom.py @@ -8,6 +8,7 @@ class NosvideoCom(SimpleCrypter): __version__ = "0.01" __description__ = """Nosvideo.com Plugin""" __author_name__ = "igel" + __author_mail__ = "igelkun@myopera.com" LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload.com/\?d=\w+)"' TITLE_PATTERN = r"<[tT]itle>Watch (?P<title>.+)</[tT]itle>" diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py index a2e6d039e9..55b90c0e46 100644 --- a/module/plugins/crypter/OneKhDe.py +++ b/module/plugins/crypter/OneKhDe.py @@ -13,8 +13,8 @@ class OneKhDe(Crypter): __pattern__ = r"http://(www\.)?1kh.de/f/" __version__ = "0.1" __description__ = """1kh.de Container Plugin""" - __author_name__ = ("spoob") - __author_mail__ = ("spoob@pyload.org") + __author_name__ = "spoob" + __author_mail__ = "spoob@pyload.org" def __init__(self, parent): Crypter.__init__(self, parent) diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index 98d7e8242f..93ca6888a1 100755 --- a/module/plugins/crypter/OronComFolder.py +++ b/module/plugins/crypter/OronComFolder.py @@ -9,5 +9,5 @@ class OronComFolder(DeadCrypter): __pattern__ = r"http://(?:www\.)?oron.com/folder/\w+" __version__ = "0.11" __description__ = """Oron.com Folder Plugin""" - __author_name__ = ("DHMH") - __author_mail__ = ("webmaster@pcProfil.de") + __author_name__ = "DHMH" + __author_mail__ = "webmaster@pcProfil.de" diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py index 942ab613bf..fe5acfa93f 100644 --- a/module/plugins/crypter/PastebinCom.py +++ b/module/plugins/crypter/PastebinCom.py @@ -24,8 +24,8 @@ class PastebinCom(SimpleCrypter): __pattern__ = r"http://(?:w{3}.)?pastebin\.com/\w+" __version__ = "0.01" __description__ = """Pastebin.com Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>' TITLE_PATTERN = r'<div class="paste_box_line1" title="(?P<title>[^"]+)">' diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 18ac68eec3..51947fed35 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -10,8 +10,8 @@ class QuickshareCzFolder(Crypter): __pattern__ = r"http://(www\.)?quickshare.cz/slozka-\d+.*" __version__ = "0.1" __description__ = """Quickshare.cz Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>' LINK_PATTERN = r'(http://www.quickshare.cz/\S+)' diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index 0dc7ddf4e1..cce24c9729 100644 --- a/module/plugins/crypter/RSLayerCom.py +++ b/module/plugins/crypter/RSLayerCom.py @@ -9,5 +9,5 @@ class RSLayerCom(DeadCrypter): __pattern__ = r"http://(www\.)?rs-layer.com/directory-" __version__ = "0.21" __description__ = """RS-Layer.com Container Plugin""" - __author_name__ = ("hzpz") - __author_mail__ = ("none") + __author_name__ = "hzpz" + __author_mail__ = "" diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 104968e066..d2562ca860 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -15,8 +15,8 @@ class RelinkUs(Crypter): __pattern__ = r"http://(www\.)?relink.us/(f/|((view|go).php\?id=))(?P<id>.+)" __version__ = "3.0" __description__ = """Relink.us Crypter Plugin""" - __author_name__ = ("fragonib") - __author_mail__ = ("fragonib[AT]yahoo[DOT]es") + __author_name__ = "fragonib" + __author_mail__ = "fragonib[AT]yahoo[DOT]es" # Constants PREFERRED_LINK_SOURCES = ['cnl2', 'dlc', 'web'] diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index 85cf552c8d..725e629abf 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -15,8 +15,8 @@ class SafelinkingNet(Crypter): __pattern__ = r'https?://safelinking.net/([pd])/\w+' __version__ = '0.1' __description__ = 'Safelinking.net Crypter Plugin' - __author_name__ = 'quareevo' - __author_mail__ = 'quareevo@arcor.de' + __author_name__ = "quareevo" + __author_mail__ = "quareevo@arcor.de" __Solvemedia_pattern__ = "solvemediaApiKey = '([\w\.\-_]+)';" diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py index 4c3bbf4a63..603f9d9b03 100644 --- a/module/plugins/crypter/SecuredIn.py +++ b/module/plugins/crypter/SecuredIn.py @@ -9,5 +9,5 @@ class SecuredIn(DeadCrypter): __pattern__ = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html" __version__ = "0.21" __description__ = """secured.in Container Plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 09ac21873a..09c300bf7c 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -14,8 +14,8 @@ class ShareLinksBiz(Crypter): __pattern__ = r"(?P<base>http://[\w\.]*?(share-links|s2l)\.biz)/(?P<id>_?[0-9a-z]+)(/.*)?" __version__ = "1.13" __description__ = """Share-Links.biz Crypter""" - __author_name__ = ("fragonib") - __author_mail__ = ("fragonib[AT]yahoo[DOT]es") + __author_name__ = "fragonib" + __author_mail__ = "fragonib[AT]yahoo[DOT]es" def setup(self): self.baseUrl = None diff --git a/module/plugins/crypter/ShareRapidComFolder.py b/module/plugins/crypter/ShareRapidComFolder.py index 951c09d456..cccf3da91a 100644 --- a/module/plugins/crypter/ShareRapidComFolder.py +++ b/module/plugins/crypter/ShareRapidComFolder.py @@ -9,7 +9,7 @@ class ShareRapidComFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?((share(-?rapid\.(biz|com|cz|info|eu|net|org|pl|sk)|-(central|credit|free|net)\.cz|-ms\.net)|(s-?rapid|rapids)\.(cz|sk))|(e-stahuj|mediatack|premium-rapidshare|rapidshare-premium|qiuck)\.cz|kadzet\.com|stahuj-zdarma\.eu|strelci\.net|universal-share\.com)/(slozka/.+)" __version__ = "0.01" __description__ = """Share-Rapid.com Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">' diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index 7472e28fe2..d03a816482 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -24,5 +24,5 @@ class SpeedLoadOrgFolder(DeadCrypter): __pattern__ = r"http://(www\.)?speedload\.org/(\d+~f$|folder/\d+/)" __version__ = "0.3" __description__ = """Speedload Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index 45a14f5a24..793bcfe300 100644 --- a/module/plugins/crypter/StealthTo.py +++ b/module/plugins/crypter/StealthTo.py @@ -12,8 +12,8 @@ class StealthTo(Crypter): __pattern__ = r"http://(www\.)?stealth.to/folder/" __version__ = "0.1" __description__ = """Stealth.to Container Plugin""" - __author_name__ = ("spoob") - __author_mail__ = ("spoob@pyload.org") + __author_name__ = "spoob" + __author_mail__ = "spoob@pyload.org" def __init__(self, parent): Crypter.__init__(self, parent) diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index d393507c7f..444eb53f6a 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -28,8 +28,8 @@ class TnyCz(SimpleCrypter): __pattern__ = r"http://(?:www\.)?tny\.cz/\w+" __version__ = "0.01" __description__ = """Tny.cz Plugin""" - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" TITLE_PATTERN = r'<title>(?P<title>.+) - .+' diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index cdd84bbc63..5a64557895 100644 --- a/module/plugins/crypter/TrailerzoneInfo.py +++ b/module/plugins/crypter/TrailerzoneInfo.py @@ -9,5 +9,5 @@ class TrailerzoneInfo(DeadCrypter): __pattern__ = r"http://(www\.)?trailerzone.info/.*?" __version__ = "0.03" __description__ = """TrailerZone.info Crypter Plugin""" - __author_name__ = ("godofdream") - __author_mail__ = ("soilfiction@gmail.com") + __author_name__ = "godofdream" + __author_mail__ = "soilfiction@gmail.com" diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index a5ccfc7538..d927be6b6f 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -10,8 +10,8 @@ class UlozToFolder(Crypter): __pattern__ = r"http://.*(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(m|soubory)/.*" __version__ = "0.2" __description__ = """Uloz.to Folder Plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FOLDER_PATTERN = r'
      (.*?)
    ' LINK_PATTERN = r'
    [^<]+' diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index 88d4e04e85..464ef2cc9c 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -26,8 +26,8 @@ class UploadedToFolder(SimpleCrypter): __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P\w+)" __version__ = "0.3" __description__ = """UploadedTo Crypter Plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" PLAIN_PATTERN = r'(?P[^<]+)' diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index df70c5aea1..8768952fef 100644 --- a/module/plugins/crypter/WiiReloadedOrg.py +++ b/module/plugins/crypter/WiiReloadedOrg.py @@ -9,5 +9,5 @@ class WiiReloadedOrg(DeadCrypter): __pattern__ = r"http://www\.wii-reloaded\.org/protect/get\.php\?i=.+" __version__ = "0.11" __description__ = """Wii-Reloaded.org Crypter Plugin""" - __author_name__ = ("hzpz") - __author_mail__ = ("none") + __author_name__ = "hzpz" + __author_mail__ = "" diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py index 09832f0376..7ad0b22e06 100644 --- a/module/plugins/crypter/XupPl.py +++ b/module/plugins/crypter/XupPl.py @@ -7,8 +7,8 @@ class XupPl(Crypter): __pattern__ = r"https?://.*\.xup\.pl/.*" __version__ = "0.1" __description__ = """Xup.pl Crypter Plugin""" - __author_name__ = ("z00nx") - __author_mail__ = ("z00nx0@gmail.com") + __author_name__ = "z00nx" + __author_mail__ = "z00nx0@gmail.com" def decrypt(self, pyfile): header = self.load(self.pyfile.url, just_header=True) diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py index 696f3927e8..cccade063e 100644 --- a/module/plugins/crypter/YoutubeBatch.py +++ b/module/plugins/crypter/YoutubeBatch.py @@ -36,8 +36,8 @@ class YoutubeBatch(Crypter): __config__ = [("likes", "bool", "Grab user (channel) liked videos", "False"), ("favorites", "bool", "Grab user (channel) favorite videos", "False"), ("uploads", "bool", "Grab channel unplaylisted videos", "True")] - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" def api_response(self, ref, req): req.update({"key": API_KEY}) diff --git a/module/plugins/hooks/AlldebridCom.py b/module/plugins/hooks/AlldebridCom.py index 775e6adc3a..1e66806326 100644 --- a/module/plugins/hooks/AlldebridCom.py +++ b/module/plugins/hooks/AlldebridCom.py @@ -19,8 +19,8 @@ class AlldebridCom(MultiHoster): ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __description__ = """Alldebrid.com hook plugin""" - __author_name__ = ("Andy, Voigt") - __author_mail__ = ("spamsales@online.de") + __author_name__ = "Andy Voigt" + __author_mail__ = "spamsales@online.de" def getHoster(self): https = "https" if self.getConfig("https") else "http" diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py index 6a9de24de5..85331a2c2e 100755 --- a/module/plugins/hooks/Captcha9kw.py +++ b/module/plugins/hooks/Captcha9kw.py @@ -42,8 +42,8 @@ class Captcha9kw(Hook): "False"), ("timeout", "int", "Timeout (max. 300)", "300"), ("passkey", "password", "API key", ""), ] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" API_URL = "://www.9kw.eu/index.cgi" diff --git a/module/plugins/hooks/CaptchaTrader.py b/module/plugins/hooks/CaptchaTrader.py index 51bb75a17c..df54ec70bf 100644 --- a/module/plugins/hooks/CaptchaTrader.py +++ b/module/plugins/hooks/CaptchaTrader.py @@ -49,8 +49,8 @@ class CaptchaTrader(Hook): ("username", "str", "Username", ""), ("force", "bool", "Force CT even if client is connected", False), ("passkey", "password", "Password", ""), ] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" SUBMIT_URL = "http://api.captchatrader.com/submit" RESPOND_URL = "http://api.captchatrader.com/respond" diff --git a/module/plugins/hooks/DebridItaliaCom.py b/module/plugins/hooks/DebridItaliaCom.py index 71ebac85c5..49733c2440 100644 --- a/module/plugins/hooks/DebridItaliaCom.py +++ b/module/plugins/hooks/DebridItaliaCom.py @@ -29,8 +29,8 @@ class DebridItaliaCom(MultiHoster): ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __description__ = """Debriditalia.com hook plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def getHoster(self): return ["netload.in", "hotfile.com", "rapidshare.com", "multiupload.com", diff --git a/module/plugins/hooks/EasybytezCom.py b/module/plugins/hooks/EasybytezCom.py index cc55da9c0f..2228973e49 100644 --- a/module/plugins/hooks/EasybytezCom.py +++ b/module/plugins/hooks/EasybytezCom.py @@ -13,8 +13,8 @@ class EasybytezCom(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] __description__ = """EasyBytez.com hook plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def getHoster(self): self.account = self.core.accountManager.getAccountPlugin(self.__name__) diff --git a/module/plugins/hooks/Ev0InFetcher.py b/module/plugins/hooks/Ev0InFetcher.py index 912cb5964c..0267dd4a70 100644 --- a/module/plugins/hooks/Ev0InFetcher.py +++ b/module/plugins/hooks/Ev0InFetcher.py @@ -32,8 +32,8 @@ class Ev0InFetcher(Hook): ("quality", "xvid;x264;rmvb", "Video Format", "xvid"), ("hoster", "str", "Hoster to use (comma seperated)", "NetloadIn,RapidshareCom,MegauploadCom,HotfileCom")] - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def setup(self): self.interval = self.getConfig("interval") * 60 diff --git a/module/plugins/hooks/FastixRu.py b/module/plugins/hooks/FastixRu.py index 25c9a1a674..b7d1dd05d7 100644 --- a/module/plugins/hooks/FastixRu.py +++ b/module/plugins/hooks/FastixRu.py @@ -16,8 +16,8 @@ class FastixRu(MultiHoster): ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __description__ = """Fastix hook plugin""" - __author_name__ = ("Massimo, Rosamilia") - __author_mail__ = ("max@spiritix.eu") + __author_name__ = "Massimo Rosamilia" + __author_mail__ = "max@spiritix.eu" def getHoster(self): page = getURL( diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMe.py index 30d76cb8ed..021ce2246c 100644 --- a/module/plugins/hooks/FreeWayMe.py +++ b/module/plugins/hooks/FreeWayMe.py @@ -30,8 +30,8 @@ class FreeWayMe(MultiHoster): ("hosterList", "str", "Hoster list (comma separated)", ""), ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - __author_name__ = ("Nicolas Giese") - __author_mail__ = ("james@free-way.me") + __author_name__ = "Nicolas Giese" + __author_mail__ = "james@free-way.me" def getHoster(self): hostis = getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip() diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py index e44c1e1720..39e135db10 100644 --- a/module/plugins/hooks/HotFolder.py +++ b/module/plugins/hooks/HotFolder.py @@ -39,8 +39,8 @@ class HotFolder(Hook): ("keep", "bool", "Keep added containers", "True"), ("file", "str", "Link file", "links.txt")] __threaded__ = [] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.de") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.de" def setup(self): self.interval = 10 diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py index 8dadf08ed3..98c0f98754 100644 --- a/module/plugins/hooks/IRCInterface.py +++ b/module/plugins/hooks/IRCInterface.py @@ -48,8 +48,8 @@ class IRCInterface(Thread, Hook): ("info_file", "bool", "Inform about every file finished", "False"), ("info_pack", "bool", "Inform about every package finished", "True"), ("captcha", "bool", "Send captcha requests", "True")] - __author_name__ = ("Jeix") - __author_mail__ = ("Jeix@hasnomail.com") + __author_name__ = "Jeix" + __author_mail__ = "Jeix@hasnomail.com" def __init__(self, core, manager): Thread.__init__(self) diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterCom.py index 8f656eb99d..550cc0d628 100644 --- a/module/plugins/hooks/LinkdecrypterCom.py +++ b/module/plugins/hooks/LinkdecrypterCom.py @@ -28,7 +28,8 @@ class LinkdecrypterCom(Hook): __version__ = "0.19" __description__ = """linkdecrypter.com - regexp loader""" __config__ = [("activated", "bool", "Activated", "False")] - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def coreReady(self): try: diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index 869b5b6f84..e7f35d4068 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -34,8 +34,8 @@ class MergeFiles(Hook): __description__ = "Merges parts splitted with hjsplit" __config__ = [("activated", "bool", "Activated", "False")] __threaded__ = ["packageFinished"] - __author_name__ = ("and9000") - __author_mail__ = ("me@has-no-mail.com") + __author_name__ = "and9000" + __author_mail__ = "me@has-no-mail.com" def setup(self): # nothing to do diff --git a/module/plugins/hooks/MultiDebridCom.py b/module/plugins/hooks/MultiDebridCom.py index c951386487..a3551d1c45 100644 --- a/module/plugins/hooks/MultiDebridCom.py +++ b/module/plugins/hooks/MultiDebridCom.py @@ -31,8 +31,8 @@ class MultiDebridCom(MultiHoster): ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __description__ = """Multi-debrid.com hook plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def getHoster(self): json_data = getURL('http://multi-debrid.com/api.php?hosts', decode=True) diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 473e6dcb1c..e0895f7065 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -28,8 +28,8 @@ class MultiHome(Hook): __description__ = """ip address changer""" __config__ = [("activated", "bool", "Activated", "False"), ("interfaces", "str", "Interfaces", "None")] - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") + __author_name__ = "mkaay" + __author_mail__ = "mkaay@mkaay.de" def setup(self): self.register = {} diff --git a/module/plugins/hooks/MultishareCz.py b/module/plugins/hooks/MultishareCz.py index fc35bb7855..75a6fd6a03 100644 --- a/module/plugins/hooks/MultishareCz.py +++ b/module/plugins/hooks/MultishareCz.py @@ -14,8 +14,8 @@ class MultishareCz(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")] __description__ = """MultiShare.cz hook plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" HOSTER_PATTERN = r']*?alt="([^"]+)">\s*[^>]*?alt="OK"' diff --git a/module/plugins/hooks/OverLoadMe.py b/module/plugins/hooks/OverLoadMe.py index bc8f9f5cb2..09ceea3ad4 100644 --- a/module/plugins/hooks/OverLoadMe.py +++ b/module/plugins/hooks/OverLoadMe.py @@ -15,8 +15,8 @@ class OverLoadMe(MultiHoster): ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "12")] __description__ = """Over-Load.me hook plugin""" - __author_name__ = ("marley") - __author_email__ = ("marley@over-load.me") + __author_name__ = "marley" + __author_mail__ = "marley@over-load.me" def getHoster(self): https = "https" if self.getConfig("https") else "http" diff --git a/module/plugins/hooks/PremiumizeMe.py b/module/plugins/hooks/PremiumizeMe.py index 07630420c3..d6d2577a78 100644 --- a/module/plugins/hooks/PremiumizeMe.py +++ b/module/plugins/hooks/PremiumizeMe.py @@ -16,8 +16,8 @@ class PremiumizeMe(MultiHoster): ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - __author_name__ = ("Florian Franzen") - __author_mail__ = ("FlorianFranzen@gmail.com") + __author_name__ = "Florian Franzen" + __author_mail__ = "FlorianFranzen@gmail.com" def getHoster(self): # If no accounts are available there will be no hosters available diff --git a/module/plugins/hooks/RPNetBiz.py b/module/plugins/hooks/RPNetBiz.py index 69976ffc99..85ba72a465 100644 --- a/module/plugins/hooks/RPNetBiz.py +++ b/module/plugins/hooks/RPNetBiz.py @@ -13,8 +13,8 @@ class RPNetBiz(MultiHoster): ("hosterList", "str", "Hoster list (comma separated)", ""), ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - __author_name__ = ("Dman") - __author_mail__ = ("dmanugm@gmail.com") + __author_name__ = "Dman" + __author_mail__ = "dmanugm@gmail.com" def getHoster(self): # No hosts supported if no account diff --git a/module/plugins/hooks/RealdebridCom.py b/module/plugins/hooks/RealdebridCom.py index 41e9884953..a77fac0963 100644 --- a/module/plugins/hooks/RealdebridCom.py +++ b/module/plugins/hooks/RealdebridCom.py @@ -16,8 +16,8 @@ class RealdebridCom(MultiHoster): ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"), ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __description__ = """Real-Debrid.com hook plugin""" - __author_name__ = ("Devirex, Hazzard") - __author_mail__ = ("naibaf_11@yahoo.de") + __author_name__ = "Devirex Hazzard" + __author_mail__ = "naibaf_11@yahoo.de" def getHoster(self): https = "https" if self.getConfig("https") else "http" diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py index 6e24988c83..8b110fa532 100644 --- a/module/plugins/hooks/RehostTo.py +++ b/module/plugins/hooks/RehostTo.py @@ -16,8 +16,8 @@ class RehostTo(MultiHoster): ("interval", "int", "Reload interval in hours (0 to disable)", "24")] __description__ = """rehost.to hook plugin""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def getHoster(self): page = getURL("http://rehost.to/api.php?cmd=get_supported_och_dl&long_ses=%s" % self.long_ses) diff --git a/module/plugins/hooks/ReloadCc.py b/module/plugins/hooks/ReloadCc.py index d07923624f..c4b805d707 100644 --- a/module/plugins/hooks/ReloadCc.py +++ b/module/plugins/hooks/ReloadCc.py @@ -14,8 +14,8 @@ class ReloadCc(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] - __author_name__ = ("Reload Team") - __author_mail__ = ("hello@reload.cc") + __author_name__ = "Reload Team" + __author_mail__ = "hello@reload.cc" interval = 0 # Disable periodic calls diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py index 64853194a7..8b4dd98a39 100644 --- a/module/plugins/hooks/RestartFailed.py +++ b/module/plugins/hooks/RestartFailed.py @@ -26,8 +26,8 @@ class RestartFailed(Hook): __description__ = "Periodically restart all failed downloads in queue" __config__ = [("activated", "bool", "Activated", "False"), ("interval", "int", "Interval in minutes", "90")] - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" event_list = ["pluginConfigChanged"] diff --git a/module/plugins/hooks/SimplydebridCom.py b/module/plugins/hooks/SimplydebridCom.py index 3272df567d..71f003ce9f 100644 --- a/module/plugins/hooks/SimplydebridCom.py +++ b/module/plugins/hooks/SimplydebridCom.py @@ -12,8 +12,8 @@ class SimplydebridCom(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] __description__ = """Simply-Debrid.com hook plugin""" - __author_name__ = ("Kagenoshin") - __author_mail__ = ("kagenoshin@gmx.ch") + __author_name__ = "Kagenoshin" + __author_mail__ = "kagenoshin@gmx.ch" def getHoster(self): page = getURL("http://simply-debrid.com/api.php?list=1") diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py index 455832b095..8750ab47f1 100644 --- a/module/plugins/hooks/UnSkipOnFail.py +++ b/module/plugins/hooks/UnSkipOnFail.py @@ -28,8 +28,8 @@ class UnSkipOnFail(Hook): __version__ = '0.01' __description__ = 'When a download fails, restart "skipped" duplicates.' __config__ = [('activated', 'bool', 'Activated', True), ] - __author_name__ = ('hagg',) - __author_mail__ = ('') + __author_name__ = "hagg" + __author_mail__ = "" def downloadFailed(self, pyfile): pyfile_name = basename(pyfile.name) diff --git a/module/plugins/hooks/UnrestrictLi.py b/module/plugins/hooks/UnrestrictLi.py index 0810a22d5b..7643e8802d 100644 --- a/module/plugins/hooks/UnrestrictLi.py +++ b/module/plugins/hooks/UnrestrictLi.py @@ -32,8 +32,8 @@ class UnrestrictLi(MultiHoster): ("history", "bool", "Delete History", "False")] __description__ = """Unrestrict.li hook plugin""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" def getHoster(self): json_data = getURL('http://unrestrict.li/api/jdownloader/hosts.php?format=json') diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index 62031e6a47..37ea1b67cb 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -35,8 +35,8 @@ class UpdateManager(Hook): __config__ = [("activated", "bool", "Activated", "True"), ("interval", "int", "Check interval in minutes", "480"), ("debug", "bool", "Check for plugin changes when in debug mode", False)] - __author_name__ = ("RaNaN") - __author_mail__ = ("ranan@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "ranan@pyload.org" URL = "http://get.pyload.org/check2/%s/" MIN_TIME = 3 * 60 * 60 # 3h minimum check interval diff --git a/module/plugins/hooks/WindowsPhoneToastNotify.py b/module/plugins/hooks/WindowsPhoneToastNotify.py index d110f7896b..e960046577 100644 --- a/module/plugins/hooks/WindowsPhoneToastNotify.py +++ b/module/plugins/hooks/WindowsPhoneToastNotify.py @@ -22,8 +22,8 @@ class WindowsPhoneToastNotify(Hook): __name__ = "WindowsPhoneToastNotify" __version__ = "0.02" __description__ = """Send push notifications to Windows Phone.""" - __author_name__ = ("Andy Voigt") - __author_mail__ = ("phone-support@hotmail.de") + __author_name__ = "Andy Voigt" + __author_mail__ = "phone-support@hotmail.de" __config__ = [("activated", "bool", "Activated", False), ("force", "bool", "Force even if client is connected", False), ("pushId", "str", "pushId", ""), diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index 24d51ed60e..914777dec2 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -14,8 +14,8 @@ class XFileSharingPro(Hook): ("includeList", "str", "Include hosters (comma separated)", ""), ("excludeList", "str", "Exclude hosters (comma separated)", "")] __description__ = """Hoster URL pattern loader for the generic XFileSharingPro plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def coreReady(self): self.loadPattern() diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py index adffc04e39..0e92b6f2b7 100644 --- a/module/plugins/hooks/XMPPInterface.py +++ b/module/plugins/hooks/XMPPInterface.py @@ -39,8 +39,8 @@ class XMPPInterface(IRCInterface, JabberClient): ("info_file", "bool", "Inform about every file finished", "False"), ("info_pack", "bool", "Inform about every package finished", "True"), ("captcha", "bool", "Send captcha requests", "True")] - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" implements(IMessageHandlersProvider) diff --git a/module/plugins/hooks/ZeveraCom.py b/module/plugins/hooks/ZeveraCom.py index fb84886d1f..5fbf20b56f 100644 --- a/module/plugins/hooks/ZeveraCom.py +++ b/module/plugins/hooks/ZeveraCom.py @@ -12,8 +12,8 @@ class ZeveraCom(MultiHoster): ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), ("hosterList", "str", "Hoster list (comma separated)", "")] __description__ = """Real-Debrid.com hook plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" def getHoster(self): page = getURL("http://www.zevera.com/jDownloader.ashx?cmd=gethosters") diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index 82f4531a69..7634c24602 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -15,8 +15,8 @@ class AlldebridCom(Hoster): __pattern__ = r"https?://.*alldebrid\..*" __description__ = """Alldebrid.com hoster plugin""" - __author_name__ = ("Andy, Voigt") - __author_mail__ = ("spamsales@online.de") + __author_name__ = "Andy Voigt" + __author_mail__ = "spamsales@online.de" def getFilename(self, url): try: diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index 2bdfda7c48..3a735bcda1 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -15,8 +15,8 @@ class BasePlugin(Hoster): __pattern__ = r"^unmatchable$" __version__ = "0.19" __description__ = """Base Plugin when any other didnt fit""" - __author_name__ = ("RaNaN") - __author_mail__ = ("RaNaN@pyload.org") + __author_name__ = "RaNaN" + __author_mail__ = "RaNaN@pyload.org" def setup(self): self.chunkLimit = -1 diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py index d923a0633b..c6c1223f35 100644 --- a/module/plugins/hoster/BezvadataCz.py +++ b/module/plugins/hoster/BezvadataCz.py @@ -26,8 +26,8 @@ class BezvadataCz(SimpleHoster): __pattern__ = r"http://(\w*\.)*bezvadata.cz/stahnout/.*" __version__ = "0.24" __description__ = """BezvaData.cz""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'

    Soubor: (?P[^<]+)

    ' FILE_SIZE_PATTERN = r'
  • Velikost: (?P[^<]+)
    • ' diff --git a/module/plugins/hoster/BillionuploadsCom.py b/module/plugins/hoster/BillionuploadsCom.py index 91e869c59f..eb54ad7142 100644 --- a/module/plugins/hoster/BillionuploadsCom.py +++ b/module/plugins/hoster/BillionuploadsCom.py @@ -8,8 +8,8 @@ class BillionuploadsCom(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)*?billionuploads.com/\w{12}" __version__ = "0.01" __description__ = """billionuploads.com hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'Filename:(?P.*?)
    ' FILE_SIZE_PATTERN = r'Size:(?P.*?)
    ' diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index 2b3f7777fe..f633fb71fb 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -13,8 +13,8 @@ class BitshareCom(SimpleHoster): __pattern__ = r"http://(www\.)?bitshare\.com/(files/(?P[a-zA-Z0-9]+)(/(?P.*?)\.html)?|\?f=(?P[a-zA-Z0-9]+))" __version__ = "0.49" __description__ = """Bitshare.Com File Download Hoster""" - __author_name__ = ("paulking", "fragonib") - __author_mail__ = (None, "fragonib[AT]yahoo[DOT]es") + __author_name__ = ("Paul King", "fragonib") + __author_mail__ = ("", "fragonib[AT]yahoo[DOT]es") HOSTER_DOMAIN = "bitshare.com" FILE_OFFLINE_PATTERN = r'(>We are sorry, but the requested file was not found in our database|>Error - File not available<|The file was deleted either by the uploader, inactivity or due to copyright claim)' diff --git a/module/plugins/hoster/BoltsharingCom.py b/module/plugins/hoster/BoltsharingCom.py index cc8b1c7e61..40bd065646 100644 --- a/module/plugins/hoster/BoltsharingCom.py +++ b/module/plugins/hoster/BoltsharingCom.py @@ -9,8 +9,8 @@ class BoltsharingCom(DeadHoster): __pattern__ = r"http://(?:\w*\.)*?boltsharing.com/\w{12}" __version__ = "0.02" __description__ = """Boltsharing.com hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(BoltsharingCom) diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py index 66d46c2e87..b5540e3996 100644 --- a/module/plugins/hoster/CatShareNet.py +++ b/module/plugins/hoster/CatShareNet.py @@ -11,8 +11,8 @@ class CatShareNet(SimpleHoster): __pattern__ = r"http://(www\.)?catshare.net/\w{16}.*" __version__ = "0.01" __description__ = """CatShare.net Download Hoster""" - __author_name__ = ("z00nx") - __author_mail__ = ("z00nx0@gmail.com") + __author_name__ = "z00nx" + __author_mail__ = "z00nx0@gmail.com" FILE_INFO_PATTERN = r'

    ]+>(?P.*)

    \s+

    ]+>(?P.*)

    ' FILE_OFFLINE_PATTERN = r'Podany plik zosta' diff --git a/module/plugins/hoster/ChipDe.py b/module/plugins/hoster/ChipDe.py index 8e13b914d5..48442aefc3 100644 --- a/module/plugins/hoster/ChipDe.py +++ b/module/plugins/hoster/ChipDe.py @@ -11,8 +11,8 @@ class ChipDe(Crypter): __pattern__ = r"http://(?:www\.)?chip.de/video/.*\.html" __version__ = "0.1" __description__ = """Chip.de Container Plugin""" - __author_name__ = ('4Christopher') - __author_mail__ = ('4Christopher@gmx.de') + __author_name__ = "4Christopher" + __author_mail__ = "4Christopher@gmx.de" def decrypt(self, pyfile): self.html = self.load(pyfile.url) diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py index 68df322f56..a810dc69f5 100644 --- a/module/plugins/hoster/CramitIn.py +++ b/module/plugins/hoster/CramitIn.py @@ -8,8 +8,8 @@ class CramitIn(XFileSharingPro): __pattern__ = r"http://(?:\w*\.)*cramit.in/\w{12}" __version__ = "0.04" __description__ = """Cramit.in hoster plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r'\s*(?P.*?).*?\s*\((?P.*?)\)' DIRECT_LINK_PATTERN = r'href="(http://cramit.in/file_download/.*?)"' diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py index 5bd1a945cc..6eb299c87a 100644 --- a/module/plugins/hoster/CrockoCom.py +++ b/module/plugins/hoster/CrockoCom.py @@ -12,8 +12,8 @@ class CrockoCom(SimpleHoster): __pattern__ = r"http://(www\.)?(crocko|easy-share).com/\w+" __version__ = "0.16" __description__ = """Crocko Download Hoster""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'Download:\s*(?P.*)' FILE_SIZE_PATTERN = r'(?P[^<]+)' diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index 58573d3292..65a685cc3a 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -30,7 +30,8 @@ class CzshareCom(SimpleHoster): __pattern__ = r"http://(\w*\.)*czshare\.(com|cz)/(\d+/|download.php\?).*" __version__ = "0.93" __description__ = """CZshare.com""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'
    \s*

    \s*Cel. n.zev: ]*>(?P[^<]+)' FILE_SIZE_PATTERN = r'

    (?:\s*

    [^\n]*

    )*\s*Velikost:\s*(?P[0-9., ]+)(?P[kKMG])i?B\s*
    ' diff --git a/module/plugins/hoster/DailymotionCom.py b/module/plugins/hoster/DailymotionCom.py index 0822b0c52e..93eceeff43 100644 --- a/module/plugins/hoster/DailymotionCom.py +++ b/module/plugins/hoster/DailymotionCom.py @@ -63,8 +63,8 @@ class DailymotionCom(Hoster): __version__ = "0.2" __config__ = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "HD 720p")] __description__ = """Dailymotion Video Download Hoster""" - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = "Walter Purcaro" + __author_mail__ = "vuolter@gmail.com" def setup(self): self.resumeDownload = self.multiDL = True diff --git a/module/plugins/hoster/DataHu.py b/module/plugins/hoster/DataHu.py index 7abd93d1ff..390b40628e 100644 --- a/module/plugins/hoster/DataHu.py +++ b/module/plugins/hoster/DataHu.py @@ -30,7 +30,7 @@ class DataHu(SimpleHoster): __version__ = "0.01" __description__ = """Data.hu Download Hoster""" __author_name__ = ("crash", "stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = ur'(?P<N>.*) \((?P<S>[^)]+)\) let\xf6lt\xe9se' FILE_OFFLINE_PATTERN = ur'Az adott f\xe1jl nem l\xe9tezik' diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py index 1e24388d7f..9f30752b03 100644 --- a/module/plugins/hoster/DataportCz.py +++ b/module/plugins/hoster/DataportCz.py @@ -25,7 +25,8 @@ class DataportCz(SimpleHoster): __pattern__ = r"http://(?:.*?\.)?dataport.cz/file/(.*)" __version__ = "0.37" __description__ = """Dataport.cz plugin - free only""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'(?P[^<]+)' FILE_SIZE_PATTERN = r'Velikost\s*(?P[^<]+)' diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index d7760d9402..7841460b34 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -27,8 +27,8 @@ class DateiTo(SimpleHoster): __pattern__ = r"http://(?:www\.)?datei\.to/datei/(?P\w+)\.html" __version__ = "0.02" __description__ = """Datei.to plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'Dateiname:\s*(?P.*?)\s*(?P.*?)' FILE_INFO_PATTERN = r'\s*.*?\((?P[0-9.]*) (?P[kKMG])i?B\)' diff --git a/module/plugins/hoster/EgoFilesCom.py b/module/plugins/hoster/EgoFilesCom.py index 22ca999319..a454751b5d 100644 --- a/module/plugins/hoster/EgoFilesCom.py +++ b/module/plugins/hoster/EgoFilesCom.py @@ -30,8 +30,8 @@ class EgoFilesCom(SimpleHoster): __pattern__ = r"https?://(www\.)?egofiles.com/(\w+)" __version__ = "0.13" __description__ = """Egofiles.com Download Hoster""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = r'
    \s+(?P[^\t]+)\s+
    \s+(File size|Rozmiar): (?P[\w.]+) (?P\w+) \|' FILE_OFFLINE_PATTERN = r'(File size|Rozmiar): 0 KB' diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 03bec8bbd3..d0f87aede2 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -26,7 +26,8 @@ class EuroshareEu(SimpleHoster): __pattern__ = r"http://(\w*\.)?euroshare.(eu|sk|cz|hu|pl)/file/.*" __version__ = "0.25" __description__ = """Euroshare.eu""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r'(?P.+?) \((?P.+?)\)' FILE_OFFLINE_PATTERN = ur'

    S.bor sa nena.iel

    |Požadovaná stránka neexistuje!' diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index 0678185ed9..807f388feb 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -29,7 +29,8 @@ class ExtabitCom(SimpleHoster): __pattern__ = r"http://(?:www\.)?extabit\.com/(file|go|fid)/(?P\w+)" __version__ = "0.5" __description__ = """Extabit.com""" - __author_name__ = ("zoidberg") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_NAME_PATTERN = r'File:\s*\s*
    ' FILE_SIZE_PATTERN = r'Size:\s*(?P[^<]+)' diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index 8805081c95..39091d769d 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -13,8 +13,8 @@ class FastixRu(Hoster): __type__ = "hoster" __pattern__ = r"http://(?:www\.)?fastix\.(ru|it)/file/(?P[a-zA-Z0-9]{24})" __description__ = """Fastix hoster plugin""" - __author_name__ = ("Massimo Rosamilia") - __author_mail__ = ("max@spiritix.eu") + __author_name__ = "Massimo Rosamilia" + __author_mail__ = "max@spiritix.eu" def getFilename(self, url): try: diff --git a/module/plugins/hoster/FileApeCom.py b/module/plugins/hoster/FileApeCom.py index 2a5daf16a1..de1597d877 100644 --- a/module/plugins/hoster/FileApeCom.py +++ b/module/plugins/hoster/FileApeCom.py @@ -10,7 +10,8 @@ class FileApeCom(DeadHoster): __pattern__ = r"http://(www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+" __version__ = "0.12" __description__ = """FileApe Download Hoster""" - __author_name__ = ("espes") + __author_name__ = "espes" + __author_mail__ = "" getInfo = create_getInfo(FileApeCom) diff --git a/module/plugins/hoster/FilebeerInfo.py b/module/plugins/hoster/FilebeerInfo.py index d1bef9e6ec..15cacfb497 100644 --- a/module/plugins/hoster/FilebeerInfo.py +++ b/module/plugins/hoster/FilebeerInfo.py @@ -9,8 +9,8 @@ class FilebeerInfo(DeadHoster): __pattern__ = r"http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P\w+).*" __version__ = "0.03" __description__ = """Filebeer.info plugin""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" getInfo = create_getInfo(FilebeerInfo) diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index c7684a05df..26e421b06e 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -29,6 +29,7 @@ class FilecloudIo(SimpleHoster): __version__ = "0.02" __description__ = """Filecloud.io (formerly Ifile.it) plugin - free account only""" __author_name__ = ("zoidberg", "stickell") + __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") FILE_SIZE_PATTERN = r'{var __ab1 = (?P\d+);}' FILE_NAME_PATTERN = r'id="aliasSpan">(?P.*?)  <' diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py index 37987059b2..14caba01cb 100644 --- a/module/plugins/hoster/FilefactoryCom.py +++ b/module/plugins/hoster/FilefactoryCom.py @@ -26,8 +26,8 @@ class FilefactoryCom(SimpleHoster): __pattern__ = r"https?://(?:www\.)?filefactory\.com/file/(?P[a-zA-Z0-9]+)" __version__ = "0.47" __description__ = """Filefactory.Com File Download Hoster""" - __author_name__ = ("stickell") - __author_mail__ = ("l.stickell@yahoo.it") + __author_name__ = "stickell" + __author_mail__ = "l.stickell@yahoo.it" FILE_INFO_PATTERN = r'
    ]*>\s*

    (?P[^<]+)

    \s*
    \s*(?P[\d.]+) (?P\w+) uploaded' DIRECT_LINK_PATTERN = r']*>]*> Download with FileFactory Premium' diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py index 0fb0b6150a..e8857257a1 100644 --- a/module/plugins/hoster/FilejungleCom.py +++ b/module/plugins/hoster/FilejungleCom.py @@ -26,8 +26,8 @@ class FilejungleCom(FileserveCom): __pattern__ = r"http://(?:www\.)?filejungle\.com/f/(?P[^/]+).*" __version__ = "0.51" __description__ = """Filejungle.com plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" URLS = ['http://www.filejungle.com/f/', 'http://www.filejungle.com/check_links.php', 'http://www.filejungle.com/checkReCaptcha.php'] diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index 0c3cb925be..b7a7e1d506 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -35,8 +35,8 @@ class FilepostCom(SimpleHoster): __pattern__ = r"https?://(?:www\.)?(?:filepost\.com/files|fp.io)/([^/]+).*" __version__ = "0.27" __description__ = """Filepost.com plugin - free only""" - __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") + __author_name__ = "zoidberg" + __author_mail__ = "zoidberg@mujmail.cz" FILE_INFO_PATTERN = r']*>(?P[^>]+?) - (?P[0-9\.]+ [kKMG]i?B)\' class="inp_text"/>' #FILE_INFO_PATTERN = r'

    (?P[^<]+)

    \s*
    \s*