diff options
Diffstat (limited to 'module/plugins')
268 files changed, 6714 insertions, 6035 deletions
diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py index beaddeac9..9fb050535 100644 --- a/module/plugins/accounts/AlldebridCom.py +++ b/module/plugins/accounts/AlldebridCom.py @@ -1,49 +1,52 @@ -from module.plugins.Account import Account
-import xml.dom.minidom as dom
-from BeautifulSoup import BeautifulSoup
-from time import time
-import re
+import xml.dom.minidom as dom +from time import time +import re import urllib -
-class AlldebridCom(Account):
- __name__ = "AlldebridCom"
- __version__ = "0.21"
- __type__ = "account"
- __description__ = """AllDebrid.com account plugin"""
- __author_name__ = ("Andy, Voigt")
- __author_mail__ = ("spamsales@online.de")
-
- def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
- page = req.load("http://www.alldebrid.com/account/")
- soup=BeautifulSoup(page)
- #Try to parse expiration date directly from the control panel page (better accuracy)
- try:
- time_text=soup.find('div',attrs={'class':'remaining_time_text'}).strong.string
- self.log.debug("Account expires in: %s" % time_text)
- p = re.compile('\d+')
- exp_data=p.findall(time_text)
- exp_time=time()+int(exp_data[0])*24*60*60+int(exp_data[1])*60*60+(int(exp_data[2])-1)*60
- #Get expiration date from API
- except:
- data = self.getAccountData(user)
- page = req.load("http://www.alldebrid.com/api.php?action=info_user&login=%s&pw=%s" % (user, data["password"]))
- self.log.debug(page)
- xml = dom.parseString(page)
- exp_time=time()+int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue)*86400
- account_info = {"validuntil": exp_time, "trafficleft": -1}
- return account_info
-
- def login(self, user, data, req):
- - urlparams = urllib.urlencode({'action':'login','login_login':user,'login_password':data["password"]}) - page = req.load("http://www.alldebrid.com/register/?%s" % (urlparams)) -
- if "This login doesn't exist" in page:
- self.wrongPassword()
- + +from module.plugins.Account import Account +from BeautifulSoup import BeautifulSoup + + +class AlldebridCom(Account): + __name__ = "AlldebridCom" + __version__ = "0.21" + __type__ = "account" + __description__ = """AllDebrid.com account plugin""" + __author_name__ = ("Andy, Voigt") + __author_mail__ = ("spamsales@online.de") + + def loadAccountInfo(self, user, req): + data = self.getAccountData(user) + page = req.load("http://www.alldebrid.com/account/") + soup = BeautifulSoup(page) + #Try to parse expiration date directly from the control panel page (better accuracy) + try: + time_text = soup.find('div', attrs={'class': 'remaining_time_text'}).strong.string + self.log.debug("Account expires in: %s" % time_text) + p = re.compile('\d+') + exp_data = p.findall(time_text) + exp_time = time() + int(exp_data[0]) * 24 * 60 * 60 + int( + exp_data[1]) * 60 * 60 + (int(exp_data[2]) - 1) * 60 + #Get expiration date from API + except: + data = self.getAccountData(user) + page = req.load("http://www.alldebrid.com/api.php?action=info_user&login=%s&pw=%s" % (user, + data["password"])) + self.log.debug(page) + xml = dom.parseString(page) + exp_time = time() + int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue) * 86400 + account_info = {"validuntil": exp_time, "trafficleft": -1} + return account_info + + def login(self, user, data, req): + urlparams = urllib.urlencode({'action': 'login', 'login_login': user, 'login_password': data["password"]}) + page = req.load("http://www.alldebrid.com/register/?%s" % urlparams) + + if "This login doesn't exist" in page: + self.wrongPassword() + if "The password is not valid" in page: self.wrongPassword() - + if "Invalid captcha" in page: self.wrongPassword() diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py index 0d036488b..bf5cc54af 100644 --- a/module/plugins/accounts/BayfilesCom.py +++ b/module/plugins/accounts/BayfilesCom.py @@ -17,10 +17,11 @@ @author: zoidberg """ +from time import time + from module.plugins.Account import Account from module.common.json_layer import json_loads -import re -from time import time, mktime, strptime + class BayfilesCom(Account): __name__ = "BayfilesCom" @@ -33,14 +34,13 @@ class BayfilesCom(Account): def loadAccountInfo(self, user, req): for i in range(2): response = json_loads(req.load("http://api.bayfiles.com/v1/account/info")) - self.logDebug(response) - if not response["error"]: + self.logDebug(response) + if not response["error"]: break self.logWarning(response["error"]) self.relogin() - - return {"premium": bool(response['premium']), \ - "trafficleft": -1, \ + + return {"premium": bool(response['premium']), "trafficleft": -1, "validuntil": response['expires'] if response['expires'] >= int(time()) else -1} def login(self, user, data, req): @@ -48,4 +48,4 @@ class BayfilesCom(Account): self.logDebug(response) if response["error"]: self.logError(response["error"]) - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py index a4f56e31c..39cff36eb 100644 --- a/module/plugins/accounts/BitshareCom.py +++ b/module/plugins/accounts/BitshareCom.py @@ -19,6 +19,7 @@ from module.plugins.Account import Account + class BitshareCom(Account): __name__ = "BitshareCom" __version__ = "0.11" @@ -28,17 +29,17 @@ class BitshareCom(Account): def loadAccountInfo(self, user, req): page = req.load("http://bitshare.com/mysettings.html") - + if "\"http://bitshare.com/myupgrade.html\">Free" in page: - return {"validuntil": -1, "trafficleft":-1, "premium": False} + return {"validuntil": -1, "trafficleft": -1, "premium": False} if not '<input type="checkbox" name="directdownload" checked="checked" />' in page: self.core.log.warning(_("Activate direct Download in your Bitshare Account")) return {"validuntil": -1, "trafficleft": -1, "premium": True} - def login(self, user, data, req): - page = req.load("http://bitshare.com/login.html", post={ "user" : user, "password" : data["password"], "submit" :"Login"}, cookies=True) + page = req.load("http://bitshare.com/login.html", + post={"user": user, "password": data["password"], "submit": "Login"}, cookies=True) if "login" in req.lastEffectiveURL: self.wrongPassword() diff --git a/module/plugins/accounts/BoltsharingCom.py b/module/plugins/accounts/BoltsharingCom.py index 678591d1d..76e010532 100644 --- a/module/plugins/accounts/BoltsharingCom.py +++ b/module/plugins/accounts/BoltsharingCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class BoltsharingCom(XFSPAccount): __name__ = "BoltsharingCom" __version__ = "0.01" diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py index 182c9d647..b0334b191 100644 --- a/module/plugins/accounts/CramitIn.py +++ b/module/plugins/accounts/CramitIn.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class CramitIn(XFSPAccount): __name__ = "CramitIn" __version__ = "0.01" @@ -8,5 +9,5 @@ class CramitIn(XFSPAccount): __description__ = """cramit.in account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - MAIN_PAGE = "http://cramit.in/"
\ No newline at end of file + + MAIN_PAGE = "http://cramit.in/" diff --git a/module/plugins/accounts/CyberlockerCh.py b/module/plugins/accounts/CyberlockerCh.py index 31e0c3e24..0eaa262eb 100644 --- a/module/plugins/accounts/CyberlockerCh.py +++ b/module/plugins/accounts/CyberlockerCh.py @@ -2,6 +2,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount from module.plugins.internal.SimpleHoster import parseHtmlForm + class CyberlockerCh(XFSPAccount): __name__ = "CyberlockerCh" __version__ = "0.01" @@ -13,7 +14,7 @@ class CyberlockerCh(XFSPAccount): MAIN_PAGE = "http://cyberlocker.ch/" def login(self, user, data, req): - html = req.load(self.MAIN_PAGE + 'login.html', decode = True) + html = req.load(self.MAIN_PAGE + 'login.html', decode=True) action, inputs = parseHtmlForm('name="FL"', html) if not inputs: @@ -25,7 +26,7 @@ class CyberlockerCh(XFSPAccount): # Without this a 403 Forbidden is returned req.http.lastURL = self.MAIN_PAGE + 'login.html' - html = req.load(self.MAIN_PAGE, post = inputs, decode = True) + html = req.load(self.MAIN_PAGE, post=inputs, decode=True) if 'Incorrect Login or Password' in html or '>Error<' in html: self.wrongPassword() diff --git a/module/plugins/accounts/DdlstorageCom.py b/module/plugins/accounts/DdlstorageCom.py index 01d165f23..6c610aa84 100644 --- a/module/plugins/accounts/DdlstorageCom.py +++ b/module/plugins/accounts/DdlstorageCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class DdlstorageCom(XFSPAccount): __name__ = "DdlstorageCom" __version__ = "0.01" @@ -8,5 +9,5 @@ class DdlstorageCom(XFSPAccount): __description__ = """DDLStorage.com account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - MAIN_PAGE = "http://ddlstorage.com/"
\ No newline at end of file + + MAIN_PAGE = "http://ddlstorage.com/" diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py index 91dd3787f..82acd8f8e 100644 --- a/module/plugins/accounts/DebridItaliaCom.py +++ b/module/plugins/accounts/DebridItaliaCom.py @@ -16,7 +16,6 @@ ############################################################################ import re -import _strptime import time from module.plugins.Account import Account diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py index b0730de8e..5f2408e72 100644 --- a/module/plugins/accounts/DepositfilesCom.py +++ b/module/plugins/accounts/DepositfilesCom.py @@ -17,31 +17,31 @@ @author: mkaay """ -from module.plugins.Account import Account import re from time import strptime, mktime +from module.plugins.Account import Account + + class DepositfilesCom(Account): __name__ = "DepositfilesCom" - __version__ = "0.1" + __version__ = "0.2" __type__ = "account" __description__ = """depositfiles.com account plugin""" - __author_name__ = ("mkaay") - __author_mail__ = ("mkaay@mkaay.de") - - def loadAccountInfo(self, user, req): + __author_name__ = ("mkaay", "stickell") + __author_mail__ = ("mkaay@mkaay.de", "l.stickell@yahoo.it") + def loadAccountInfo(self, user, req): src = req.load("http://depositfiles.com/de/gold/") - validuntil = re.search("noch den Gold-Zugriff: <b>(.*?)</b></div>", src).group(1) + validuntil = re.search(r"Sie haben Gold Zugang bis: <b>(.*?)</b></div>", src).group(1) validuntil = int(mktime(strptime(validuntil, "%Y-%m-%d %H:%M:%S"))) - tmp = {"validuntil":validuntil, "trafficleft":-1} - return tmp - - def login(self, user, data, req): + return {"validuntil": validuntil, "trafficleft": -1} + def login(self, user, data, req): req.load("http://depositfiles.com/de/gold/payment.php") - src = req.load("http://depositfiles.com/de/login.php", get={"return": "/de/gold/payment.php"}, post={"login": user, "password": data["password"]}) + src = req.load("http://depositfiles.com/de/login.php", get={"return": "/de/gold/payment.php"}, + post={"login": user, "password": data["password"]}) if r'<div class="error_message">Sie haben eine falsche Benutzername-Passwort-Kombination verwendet.</div>' in src: self.wrongPassword() diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py index ba7829b83..cd995fbe5 100644 --- a/module/plugins/accounts/EasybytezCom.py +++ b/module/plugins/accounts/EasybytezCom.py @@ -17,11 +17,13 @@ @author: zoidberg """ +import re +from time import mktime, strptime + from module.plugins.Account import Account from module.plugins.internal.SimpleHoster import parseHtmlForm -import re from module.utils import parseFileSize -from time import mktime, strptime + class EasybytezCom(Account): __name__ = "EasybytezCom" @@ -30,16 +32,16 @@ class EasybytezCom(Account): __description__ = """EasyBytez.com account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + VALID_UNTIL_PATTERN = r'<TR><TD>Premium account expire:</TD><TD><b>([^<]+)</b>' TRAFFIC_LEFT_PATTERN = r'<TR><TD>Traffic available today:</TD><TD><b>(?P<S>[^<]+)</b>' - def loadAccountInfo(self, user, req): - html = req.load("http://www.easybytez.com/?op=my_account", decode = True) - + def loadAccountInfo(self, user, req): + html = req.load("http://www.easybytez.com/?op=my_account", decode=True) + validuntil = trafficleft = None premium = False - + found = re.search(self.VALID_UNTIL_PATTERN, html) if found: premium = True @@ -56,18 +58,18 @@ class EasybytezCom(Account): if "Unlimited" in trafficleft: premium = True else: - trafficleft = parseFileSize(trafficleft) / 1024 - - return ({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}) - + trafficleft = parseFileSize(trafficleft) / 1024 + + return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} + def login(self, user, data, req): - html = req.load('http://www.easybytez.com/login.html', decode = True) + html = req.load('http://www.easybytez.com/login.html', decode=True) action, inputs = parseHtmlForm('name="FL"', html) inputs.update({"login": user, "password": data['password'], "redirect": "http://www.easybytez.com/"}) - - html = req.load(action, post = inputs, decode = True) - - if 'Incorrect Login or Password' in html or '>Error<' in html: - self.wrongPassword()
\ No newline at end of file + + html = req.load(action, post=inputs, decode=True) + + if 'Incorrect Login or Password' in html or '>Error<' in html: + self.wrongPassword() diff --git a/module/plugins/accounts/EgoFilesCom.py b/module/plugins/accounts/EgoFilesCom.py index da1ed03ad..9c2b918c3 100644 --- a/module/plugins/accounts/EgoFilesCom.py +++ b/module/plugins/accounts/EgoFilesCom.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account import re import time + +from module.plugins.Account import Account from module.utils import parseFileSize + class EgoFilesCom(Account): __name__ = "EgoFilesCom" __version__ = "0.2" diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py index 42967d975..830c1db3f 100644 --- a/module/plugins/accounts/EuroshareEu.py +++ b/module/plugins/accounts/EuroshareEu.py @@ -17,11 +17,12 @@ @author: zoidberg """ -from module.plugins.Account import Account from time import mktime, strptime -from string import replace import re +from module.plugins.Account import Account + + class EuroshareEu(Account): __name__ = "EuroshareEu" __version__ = "0.01" @@ -33,23 +34,23 @@ class EuroshareEu(Account): def loadAccountInfo(self, user, req): self.relogin(user) html = req.load("http://euroshare.eu/customer-zone/settings/") - + found = re.search('id="input_expire_date" value="(\d+\.\d+\.\d+ \d+:\d+)"', html) if found is None: premium, validuntil = False, -1 else: premium = True validuntil = mktime(strptime(found.group(1), "%d.%m.%Y %H:%M")) - + return {"validuntil": validuntil, "trafficleft": -1, "premium": premium} - + def login(self, user, data, req): - + html = req.load('http://euroshare.eu/customer-zone/login/', post={ - "trvale": "1", - "login": user, - "password": data["password"] - }, decode=True) - + "trvale": "1", + "login": user, + "password": data["password"] + }, decode=True) + if u">Nesprávne prihlasovacie meno alebo heslo" in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py new file mode 100644 index 000000000..3e1896e44 --- /dev/null +++ b/module/plugins/accounts/FastixRu.py @@ -0,0 +1,32 @@ +from module.plugins.Account import Account +from module.common.json_layer import json_loads + + +class FastixRu(Account): + __name__ = "FastixRu" + __version__ = "0.02" + __type__ = "account" + __description__ = """Fastix account plugin""" + __author_name__ = ("Massimo, Rosamilia") + __author_mail__ = ("max@spiritix.eu") + + def loadAccountInfo(self, user, req): + data = self.getAccountData(user) + page = req.load("http://fastix.ru/api_v2/?apikey=%s&sub=getaccountdetails" % (data["api"])) + page = json_loads(page) + points = page['points'] + kb = float(points) + kb = kb * 1024 ** 2 / 1000 + if points > 0: + account_info = {"validuntil": -1, "trafficleft": kb} + else: + account_info = {"validuntil": None, "trafficleft": None, "premium": False} + return account_info + + def login(self, user, data, req): + page = req.load("http://fastix.ru/api_v2/?sub=get_apikey&email=%s&password=%s" % (user, data["password"])) + api = json_loads(page) + api = api['apikey'] + data["api"] = api + if "error_code" in page: + self.wrongPassword() diff --git a/module/plugins/accounts/FilebeerInfo.py b/module/plugins/accounts/FilebeerInfo.py index 40ab70519..3c3a9edfd 100644 --- a/module/plugins/accounts/FilebeerInfo.py +++ b/module/plugins/accounts/FilebeerInfo.py @@ -20,7 +20,7 @@ import re from time import mktime, strptime from module.plugins.Account import Account -from module.utils import parseFileSize + class FilebeerInfo(Account): __name__ = "FilebeerInfo" @@ -29,29 +29,29 @@ class FilebeerInfo(Account): __description__ = """filebeer.info account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + VALID_UNTIL_PATTERN = r'Reverts To Free Account:\s</td>\s*<td>\s*(.*?)\s*</td>' - + def loadAccountInfo(self, user, req): - html = req.load("http://filebeer.info/upgrade.php", decode = True) + html = req.load("http://filebeer.info/upgrade.php", decode=True) premium = not 'Free User </td>' in html - + validuntil = None if premium: try: - validuntil = mktime(strptime(re.search(self.VALID_UNTIL_PATTERN, html).group(1), "%d/%m/%Y %H:%M:%S")) + validuntil = mktime(strptime(re.search(self.VALID_UNTIL_PATTERN, html).group(1), "%d/%m/%Y %H:%M:%S")) except Exception, e: self.logError("Unable to parse account info", e) return {"validuntil": validuntil, "trafficleft": -1, "premium": premium} - + def login(self, user, data, req): - html = req.load('http://filebeer.info/login.php', post = { + html = req.load('http://filebeer.info/login.php', post={ "submit": 'Login', "loginPassword": data['password'], "loginUsername": user, "submitme": '1' - }, decode = True) - + }, decode=True) + if "<ul class='pageErrors'>" in html or ">Your username and password are invalid<" in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py index cf9f92209..5de722ea7 100644 --- a/module/plugins/accounts/FilecloudIo.py +++ b/module/plugins/accounts/FilecloudIo.py @@ -19,6 +19,7 @@ from module.plugins.Account import Account + class FilecloudIo(Account): __name__ = "FilecloudIo" __version__ = "0.01" @@ -26,24 +27,23 @@ class FilecloudIo(Account): __description__ = """FilecloudIo account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - def loadAccountInfo(self, user, req): - return ({"validuntil": -1, "trafficleft": -1, "premium": False}) - + + def loadAccountInfo(self, user, req): + return {"validuntil": -1, "trafficleft": -1, "premium": False} + def login(self, user, data, req): req.cj.setCookie("secure.filecloud.io", "lang", "en") html = req.load('https://secure.filecloud.io/user-login.html') - + if not hasattr(self, "form_data"): self.form_data = {} - + self.form_data["username"] = user self.form_data["password"] = data['password'] - + html = req.load('https://secure.filecloud.io/user-login_p.html', - post = self.form_data, - multipart = True) - + post=self.form_data, + multipart=True) + self.logged_in = True if "you have successfully logged in - filecloud.io" in html else False self.form_data = {} -
\ No newline at end of file diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py index 8e163e2f6..679409058 100644 --- a/module/plugins/accounts/FilefactoryCom.py +++ b/module/plugins/accounts/FilefactoryCom.py @@ -17,10 +17,12 @@ @author: zoidberg """ -from module.plugins.Account import Account import re from time import mktime, strptime +from module.plugins.Account import Account + + class FilefactoryCom(Account): __name__ = "FilefactoryCom" __version__ = "0.13" @@ -28,27 +30,27 @@ class FilefactoryCom(Account): __description__ = """filefactory.com account plugin""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") - + ACCOUNT_INFO_PATTERN = r'<time datetime="([\d-]+)">' - def loadAccountInfo(self, user, req): + def loadAccountInfo(self, user, req): html = req.load("http://www.filefactory.com/member/") - + found = re.search(self.ACCOUNT_INFO_PATTERN, html) if found: premium = True - validuntil = mktime(strptime(found.group(1),"%Y-%m-%d")) + validuntil = mktime(strptime(found.group(1), "%Y-%m-%d")) else: premium = False - validuntil = -1 + validuntil = -1 return {"premium": premium, "trafficleft": -1, "validuntil": validuntil} def login(self, user, data, req): html = req.load("http://www.filefactory.com/member/login.php", post={ - "email": user, + "email": user, "password": data["password"], "redirect": "/"}) - + if '/member/login.php?err=1' in req.http.header: self.wrongPassword() diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py index 8ac25c201..2f2a6012d 100644 --- a/module/plugins/accounts/FilejungleCom.py +++ b/module/plugins/accounts/FilejungleCom.py @@ -17,10 +17,12 @@ @author: zoidberg """ -from module.plugins.Account import Account import re from time import mktime, strptime +from module.plugins.Account import Account + + class FilejungleCom(Account): __name__ = "FilejungleCom" __version__ = "0.11" @@ -28,9 +30,9 @@ class FilejungleCom(Account): __description__ = """filejungle.com account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + login_timeout = 60 - + URL = "http://filejungle.com/" TRAFFIC_LEFT_PATTERN = r'"/extend_premium\.php">Until (\d+ [A-Za-z]+ \d+)<br' LOGIN_FAILED_PATTERN = r'<span htmlfor="loginUser(Name|Password)" generated="true" class="fail_info">' @@ -42,19 +44,19 @@ class FilejungleCom(Account): premium = True validuntil = mktime(strptime(found.group(1), "%d %b %Y")) else: - premium = False + premium = False validuntil = -1 return {"premium": premium, "trafficleft": -1, "validuntil": validuntil} def login(self, user, data, req): html = req.load(self.URL + "login.php", post={ - "loginUserName": user, + "loginUserName": user, "loginUserPassword": data["password"], "loginFormSubmit": "Login", - "recaptcha_challenge_field": "", - "recaptcha_response_field": "", + "recaptcha_challenge_field": "", + "recaptcha_response_field": "", "recaptcha_shortencode_field": ""}) - + if re.search(self.LOGIN_FAILED_PATTERN, html): - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index 7afd00f25..45ce5ab37 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -16,7 +16,6 @@ ############################################################################ import re -import _strptime import time from module.plugins.Account import Account diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py index feacacaf5..8b0b5f54f 100644 --- a/module/plugins/accounts/FilerioCom.py +++ b/module/plugins/accounts/FilerioCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class FilerioCom(XFSPAccount): __name__ = "FilerioCom" __version__ = "0.01" @@ -8,5 +9,5 @@ class FilerioCom(XFSPAccount): __description__ = """FileRio.in account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - MAIN_PAGE = "http://filerio.in/"
\ No newline at end of file + + MAIN_PAGE = "http://filerio.in/" diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py index 98fe13248..ea976bd44 100644 --- a/module/plugins/accounts/FilesMailRu.py +++ b/module/plugins/accounts/FilesMailRu.py @@ -18,8 +18,7 @@ """ from module.plugins.Account import Account -import re -from time import time + class FilesMailRu(Account): __name__ = "FilesMailRu" @@ -31,11 +30,13 @@ class FilesMailRu(Account): def loadAccountInfo(self, user, req): return {"validuntil": None, "trafficleft": None} - - def login(self, user, data,req): + + def login(self, user, data, req): user, domain = user.split("@") - page = req.load("http://swa.mail.ru/cgi-bin/auth", None, { "Domain" : domain, "Login": user, "Password" : data['password'], "Page" : "http://files.mail.ru/"}, cookies=True) + page = req.load("http://swa.mail.ru/cgi-bin/auth", None, + {"Domain": domain, "Login": user, "Password": data['password'], + "Page": "http://files.mail.ru/"}, cookies=True) - if "Неверное имя пользователя или пароль" in page: # @TODO seems not to work + if "Неверное имя пользователя или пароль" in page: # @TODO seems not to work self.wrongPassword() diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 5e5068f22..d4056891a 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -22,6 +22,7 @@ from time import mktime, strptime from module.plugins.Account import Account from module.common.json_layer import json_loads + class FileserveCom(Account): __name__ = "FileserveCom" __version__ = "0.2" @@ -43,7 +44,6 @@ class FileserveCom(Account): else: return {"premium": False, "trafficleft": None, "validuntil": None} - def login(self, user, data, req): page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data["password"], "submit": "Submit+Query"}) diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py index bd3820277..69a465671 100644 --- a/module/plugins/accounts/FourSharedCom.py +++ b/module/plugins/accounts/FourSharedCom.py @@ -20,6 +20,7 @@ from module.plugins.Account import Account from module.common.json_layer import json_loads + class FourSharedCom(Account): __name__ = "FourSharedCom" __version__ = "0.01" @@ -27,22 +28,22 @@ class FourSharedCom(Account): __description__ = """FourSharedCom account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - def loadAccountInfo(self, user, req): + + def loadAccountInfo(self, user, req): #fixme - return ({"validuntil": -1, "trafficleft": -1, "premium": False}) - + return {"validuntil": -1, "trafficleft": -1, "premium": False} + def login(self, user, data, req): req.cj.setCookie("www.4shared.com", "4langcookie", "en") response = req.load('http://www.4shared.com/login', - post = {"login": user, - "password": data['password'], - "remember": "false", - "doNotRedirect": "true"}) - self.logDebug(response) + post={"login": user, + "password": data['password'], + "remember": "false", + "doNotRedirect": "true"}) + self.logDebug(response) response = json_loads(response) - + if not "ok" in response or response['ok'] != True: if "rejectReason" in response and response['rejectReason'] != True: - self.logError(response['rejectReason']) - self.wrongPassword()
\ No newline at end of file + self.logError(response['rejectReason']) + self.wrongPassword() diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 732f9e203..cdf45114a 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -21,6 +21,7 @@ from time import strptime, mktime from module.plugins.Account import Account + class FreakshareCom(Account): __name__ = "FreakshareCom" __version__ = "0.1" @@ -45,7 +46,8 @@ class FreakshareCom(Account): return {"validuntil": validuntil, "trafficleft": traffic} def login(self, user, data, req): - page = req.load("http://freakshare.com/login.html", None, { "submit" : "Login", "user" : user, "pass" : data['password']}, cookies=True) + page = req.load("http://freakshare.com/login.html", None, + {"submit": "Login", "user": user, "pass": data['password']}, cookies=True) if "Falsche Logindaten!" in page or "Wrong Username or Password!" in page: self.wrongPassword() diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 9b22cbafb..75191e74a 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -17,11 +17,13 @@ @author: zoidberg """ -from module.plugins.Account import Account from time import mktime, strptime from pycurl import REFERER import re +from module.plugins.Account import Account + + class FshareVn(Account): __name__ = "FshareVn" __version__ = "0.04" @@ -35,13 +37,14 @@ class FshareVn(Account): DIRECT_DOWNLOAD_PATTERN = ur'<input type="checkbox"\s*([^=>]*)[^>]*/>Kích hoạt download trực tiếp</dt>' def loadAccountInfo(self, user, req): - html = req.load("http://www.fshare.vn/account_info.php", decode = True) + html = req.load("http://www.fshare.vn/account_info.php", decode=True) found = re.search(self.VALID_UNTIL_PATTERN, html) if found: premium = True validuntil = mktime(strptime(found.group(1), '%I:%M:%S %p %d-%m-%Y')) found = re.search(self.TRAFFIC_LEFT_PATTERN, html) - trafficleft = float(found.group(1)) * 1024 ** {'k': 0, 'K': 0, 'M': 1, 'G': 2}[found.group(2)] if found else 0 + trafficleft = float(found.group(1)) * 1024 ** { + 'k': 0, 'K': 0, 'M': 1, 'G': 2}[found.group(2)] if found else 0 else: premium = False validuntil = None @@ -52,11 +55,11 @@ class FshareVn(Account): def login(self, user, data, req): req.http.c.setopt(REFERER, "https://www.fshare.vn/login.php") - html = req.load('https://www.fshare.vn/login.php', post = { - "login_password" : data['password'], - "login_useremail" : user, - "url_refe" : "https://www.fshare.vn/login.php" - }, referer = True, decode = True) + html = req.load('https://www.fshare.vn/login.php', post={ + "login_password": data['password'], + "login_useremail": user, + "url_refe": "https://www.fshare.vn/login.php" + }, referer=True, decode=True) if not '<img alt="VIP"' in html: self.wrongPassword() diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py index 9c1081662..681d14cea 100644 --- a/module/plugins/accounts/Ftp.py +++ b/module/plugins/accounts/Ftp.py @@ -2,6 +2,7 @@ from module.plugins.Account import Account + class Ftp(Account): __name__ = "Ftp" __version__ = "0.01" @@ -9,5 +10,5 @@ class Ftp(Account): __description__ = """Ftp dummy account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - login_timeout = info_threshold = 1000000
\ No newline at end of file + + login_timeout = info_threshold = 1000000 diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index c7a918dec..4718ade99 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -17,10 +17,12 @@ @author: zoidberg """ -from module.plugins.Account import Account import re import time +from module.plugins.Account import Account + + class HellshareCz(Account): __name__ = "HellshareCz" __version__ = "0.14" @@ -49,7 +51,7 @@ class HellshareCz(Account): vt = [int(x) for x in credit.split('.')[:2]] lt = time.localtime() year = lt.tm_year + int(vt[1] < lt.tm_mon or (vt[1] == lt.tm_mon and vt[0] < lt.tm_mday)) - validuntil = time.mktime(time.strptime("%s%d 23:59:59" % (credit,year), "%d.%m.%Y %H:%M:%S")) + validuntil = time.mktime(time.strptime("%s%d 23:59:59" % (credit, year), "%d.%m.%Y %H:%M:%S")) trafficleft = -1 else: #Traffic-based account @@ -77,11 +79,11 @@ class HellshareCz(Account): return html = req.load('http://www.hellshare.com/login?do=loginForm-submit', post={ - "login": "Log in", - "password": data["password"], - "username": user, - "perm_login": "on" - }) + "login": "Log in", + "password": data["password"], + "username": user, + "perm_login": "on" + }) if "<p>You input a wrong user name or wrong password</p>" in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/HellspyCz.py b/module/plugins/accounts/HellspyCz.py index 5f14a093e..1bb574731 100644 --- a/module/plugins/accounts/HellspyCz.py +++ b/module/plugins/accounts/HellspyCz.py @@ -17,9 +17,10 @@ @author: zoidberg """ -from module.plugins.Account import Account import re -import string + +from module.plugins.Account import Account + class HellspyCz(Account): __name__ = "HellspyCz" @@ -48,23 +49,25 @@ class HellspyCz(Account): return {"validuntil": -1, "trafficleft": credits} - def login(self, user, data,req): - header = req.load('http://www.hellspy.com/', just_header = True) - self.phpsessid = re.search(r'PHPSESSID=(\w+)', header).group(1) + def login(self, user, data, req): + header = req.load('http://www.hellspy.com/', just_header=True) + self.phpsessid = re.search(r'PHPSESSID=(\w+)', header).group(1) self.logDebug("PHPSESSID:" + self.phpsessid) - + html = req.load("http://www.hellspy.com/--%s-" % self.phpsessid) - html = req.load("http://www.hell-share.com/user/login/?do=apiLoginForm-submit&api_hash=hellspy_iq&user_hash=%s" % self.phpsessid, post={ + html = req.load( + "http://www.hell-share.com/user/login/?do=apiLoginForm-submit&api_hash=hellspy_iq&user_hash=%s" % self.phpsessid, + post={ "login": "1", "password": data["password"], "username": user, - "redir_url": 'http://www.hellspy.com/?do=loginBox-login', + "redir_url": 'http://www.hellspy.com/?do=loginBox-login', "permanent_login": "1" - }) + }) cj = self.getAccountCookies(user) cj.setCookie(".hellspy.com", "PHPSESSID", self.phpsessid) if not re.search(self.CREDIT_LEFT_PATTERN, html): - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/HotfileCom.py b/module/plugins/accounts/HotfileCom.py index 23e42dacf..4c144a883 100644 --- a/module/plugins/accounts/HotfileCom.py +++ b/module/plugins/accounts/HotfileCom.py @@ -17,18 +17,20 @@ @author: mkaay, JoKoT3 """ -from module.plugins.Account import Account from time import strptime, mktime import hashlib +from module.plugins.Account import Account + + class HotfileCom(Account): __name__ = "HotfileCom" __version__ = "0.2" __type__ = "account" __description__ = """hotfile.com account plugin""" - __author_name__ = ("mkaay","JoKoT3") - __author_mail__ = ("mkaay@mkaay.de","jokot3@gmail.com") - + __author_name__ = ("mkaay", "JoKoT3") + __author_mail__ = ("mkaay@mkaay.de", "jokot3@gmail.com") + def loadAccountInfo(self, user, req): resp = self.apiCall("getuserinfo", user=user) if resp.startswith("."): @@ -40,28 +42,28 @@ class HotfileCom(Account): info[key] = value if info['is_premium'] == '1': - info["premium_until"] = info["premium_until"].replace("T"," ") + info["premium_until"] = info["premium_until"].replace("T", " ") zone = info["premium_until"][19:] info["premium_until"] = info["premium_until"][:19] zone = int(zone[:3]) - - validuntil = int(mktime(strptime(info["premium_until"], "%Y-%m-%d %H:%M:%S"))) + (zone*3600) - tmp = {"validuntil":validuntil, "trafficleft":-1, "premium":True} + + validuntil = int(mktime(strptime(info["premium_until"], "%Y-%m-%d %H:%M:%S"))) + (zone * 3600) + tmp = {"validuntil": validuntil, "trafficleft": -1, "premium": True} elif info['is_premium'] == '0': - tmp = {"premium":False} - + tmp = {"premium": False} + return tmp - + def apiCall(self, method, post={}, user=None): if user: data = self.getAccountData(user) else: user, data = self.selectAccount() - + req = self.getAccountRequest(user) - - digest = req.load("http://api.hotfile.com/", post={"action":"getdigest"}) + + digest = req.load("http://api.hotfile.com/", post={"action": "getdigest"}) h = hashlib.md5() h.update(data["password"]) hp = h.hexdigest() @@ -69,18 +71,19 @@ class HotfileCom(Account): h.update(hp) h.update(digest) pwhash = h.hexdigest() - + post.update({"action": method}) - post.update({"username":user, "passwordmd5dig":pwhash, "digest":digest}) + post.update({"username": user, "passwordmd5dig": pwhash, "digest": digest}) resp = req.load("http://api.hotfile.com/", post=post) req.close() return resp - + def login(self, user, data, req): cj = self.getAccountCookies(user) cj.setCookie("hotfile.com", "lang", "en") req.load("http://hotfile.com/", cookies=True) - page = req.load("http://hotfile.com/login.php", post={"returnto": "/", "user": user, "pass": data["password"]}, cookies=True) + page = req.load("http://hotfile.com/login.php", post={"returnto": "/", "user": user, "pass": data["password"]}, + cookies=True) if "Bad username/password" in page: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py index 805d19900..5701d1f03 100644 --- a/module/plugins/accounts/Http.py +++ b/module/plugins/accounts/Http.py @@ -2,6 +2,7 @@ from module.plugins.Account import Account + class Http(Account): __name__ = "Http" __version__ = "0.01" @@ -9,5 +10,5 @@ class Http(Account): __description__ = """Http dummy account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - login_timeout = info_threshold = 1000000
\ No newline at end of file + + login_timeout = info_threshold = 1000000 diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py index 91601fc95..e7d5f9ca9 100644 --- a/module/plugins/accounts/MegasharesCom.py +++ b/module/plugins/accounts/MegasharesCom.py @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account import re from time import mktime, strptime +from module.plugins.Account import Account + + class MegasharesCom(Account): __name__ = "MegasharesCom" __version__ = "0.02" @@ -11,32 +13,32 @@ class MegasharesCom(Account): __description__ = """megashares.com account plugin""" __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>' - + def loadAccountInfo(self, user, req): #self.relogin(user) - html = req.load("http://d01.megashares.com/myms.php", decode = True) - + html = req.load("http://d01.megashares.com/myms.php", decode=True) + premium = False if '>Premium Upgrade<' in html else True - + validuntil = trafficleft = -1 - try: + try: timestr = re.search(self.VALID_UNTIL_PATTERN, html).group(1) self.logDebug(timestr) validuntil = mktime(strptime(timestr, "%b %d, %Y")) except Exception, e: - self.logError(e) - + self.logError(e) + return {"validuntil": validuntil, "trafficleft": -1, "premium": premium} - + def login(self, user, data, req): - html = req.load('http://d01.megashares.com/myms_login.php', post = { - "httpref": "", - "myms_login": "Login", + html = req.load('http://d01.megashares.com/myms_login.php', post={ + "httpref": "", + "myms_login": "Login", "mymslogin_name": user, "mymspassword": data['password'] - }, decode = True) - + }, decode=True) + if not '<span class="b ml">%s</span>' % user in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py index 39439cbbe..273936615 100644 --- a/module/plugins/accounts/MultishareCz.py +++ b/module/plugins/accounts/MultishareCz.py @@ -23,6 +23,7 @@ from module.plugins.Account import Account import re from module.utils import parseFileSize + class MultishareCz(Account): __name__ = "MultishareCz" __version__ = "0.02" @@ -30,29 +31,29 @@ class MultishareCz(Account): __description__ = """multishare.cz account plugin""" __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="([^"]+)">' def loadAccountInfo(self, user, req): #self.relogin(user) - html = req.load("http://www.multishare.cz/profil/", decode = True) - - found = re.search(self.TRAFFIC_LEFT_PATTERN, html) + html = req.load("http://www.multishare.cz/profil/", decode=True) + + found = re.search(self.TRAFFIC_LEFT_PATTERN, html) trafficleft = parseFileSize(found.group('S'), found.group('U')) / 1024 if found else 0 - self.premium = True if trafficleft else False - - html = req.load("http://www.multishare.cz/", decode = True) + self.premium = True if trafficleft else False + + html = req.load("http://www.multishare.cz/", decode=True) mms_info = dict(re.findall(self.ACCOUNT_INFO_PATTERN, html)) return dict(mms_info, **{"validuntil": -1, "trafficleft": trafficleft}) - + def login(self, user, data, req): - html = req.load('http://www.multishare.cz/html/prihlaseni_process.php', post = { - "akce": "Přihlásit", + html = req.load('http://www.multishare.cz/html/prihlaseni_process.php', post={ + "akce": "Přihlásit", "heslo": data['password'], "jmeno": user - }, decode = True) - + }, decode=True) + if '<div class="akce-chyba akce">' in html: self.wrongPassword()
\ No newline at end of file diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py index cef3e298b..3e3bd93c1 100755 --- a/module/plugins/accounts/NetloadIn.py +++ b/module/plugins/accounts/NetloadIn.py @@ -17,10 +17,12 @@ @author: mkaay """ -from module.plugins.Account import Account import re from time import time +from module.plugins.Account import Account + + class NetloadIn(Account): __name__ = "NetloadIn" __version__ = "0.22" @@ -41,9 +43,11 @@ class NetloadIn(Account): validuntil = None premium = False trafficleft = None - return {"validuntil": validuntil, "trafficleft": trafficleft, "premium" : premium} - - def login(self, user, data,req): - page = req.load("http://netload.in/index.php", None, { "txtuser" : user, "txtpass" : data['password'], "txtcheck" : "login", "txtlogin" : "Login"}, cookies=True) + return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} + + def login(self, user, data, req): + page = req.load("http://netload.in/index.php", None, + {"txtuser": user, "txtpass": data['password'], "txtcheck": "login", "txtlogin": "Login"}, + cookies=True) if "password or it might be invalid!" in page: self.wrongPassword() diff --git a/module/plugins/accounts/Premium4Me.py b/module/plugins/accounts/Premium4Me.py index c95b9b129..467c5943e 100644 --- a/module/plugins/accounts/Premium4Me.py +++ b/module/plugins/accounts/Premium4Me.py @@ -1,23 +1,25 @@ -from module.plugins.Account import Account
-
-class Premium4Me(Account):
- __name__ = "Premium4Me"
- __version__ = "0.03"
- __type__ = "account"
- __description__ = """Premium.to account plugin"""
- __author_name__ = ("RaNaN", "zoidberg", "stickell")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
-
- def loadAccountInfo(self, user, req):
- traffic = req.load("http://premium.to/api/traffic.php?authcode=%s" % self.authcode)
-
- account_info = {"trafficleft": int(traffic) / 1024,
- "validuntil": -1}
-
- return account_info
-
- def login(self, user, data, req):
- self.authcode = req.load("http://premium.to/api/getauthcode.php?username=%s&password=%s" % (user, data["password"])).strip()
-
- if "wrong username" in self.authcode:
- self.wrongPassword()
\ No newline at end of file +from module.plugins.Account import Account + + +class Premium4Me(Account): + __name__ = "Premium4Me" + __version__ = "0.03" + __type__ = "account" + __description__ = """Premium.to account plugin""" + __author_name__ = ("RaNaN", "zoidberg", "stickell") + __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") + + def loadAccountInfo(self, user, req): + traffic = req.load("http://premium.to/api/traffic.php?authcode=%s" % self.authcode) + + account_info = {"trafficleft": int(traffic) / 1024, + "validuntil": -1} + + return account_info + + def login(self, user, data, req): + self.authcode = req.load("http://premium.to/api/getauthcode.php?username=%s&password=%s" % ( + user, data["password"])).strip() + + if "wrong username" in self.authcode: + self.wrongPassword() diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py index 1a446b842..c5c712c52 100644 --- a/module/plugins/accounts/PremiumizeMe.py +++ b/module/plugins/accounts/PremiumizeMe.py @@ -1,44 +1,42 @@ -from module.plugins.Account import Account
-
-from module.common.json_layer import json_loads
-
-class PremiumizeMe(Account):
- __name__ = "PremiumizeMe"
- __version__ = "0.11"
- __type__ = "account"
- __description__ = """Premiumize.Me account plugin"""
-
- __author_name__ = ("Florian Franzen")
- __author_mail__ = ("FlorianFranzen@gmail.com")
-
- def loadAccountInfo(self, user, req):
-
- # Get user data from premiumize.me
- status = self.getAccountStatus(user, req)
- self.logDebug(status)
-
- # Parse account info
- account_info = {"validuntil": float(status['result']['expires']),
- "trafficleft": max(0, status['result']['trafficleft_bytes'] / 1024)}
-
- if status['result']['type'] == 'free':
- account_info['premium'] = False
-
- return account_info
-
- def login(self, user, data, req):
-
- # Get user data from premiumize.me
- status = self.getAccountStatus(user, req)
-
- # Check if user and password are valid
- if status['status'] != 200:
- self.wrongPassword()
-
-
- def getAccountStatus(self, user, req):
-
- # Use premiumize.me API v1 (see https://secure.premiumize.me/?show=api) to retrieve account info and return the parsed json answer
- answer = req.load("https://api.premiumize.me/pm-api/v1.php?method=accountstatus¶ms[login]=%s¶ms[pass]=%s" % (user, self.accounts[user]['password']))
- return json_loads(answer)
-
+from module.plugins.Account import Account + +from module.common.json_layer import json_loads + + +class PremiumizeMe(Account): + __name__ = "PremiumizeMe" + __version__ = "0.11" + __type__ = "account" + __description__ = """Premiumize.Me account plugin""" + __author_name__ = ("Florian Franzen") + __author_mail__ = ("FlorianFranzen@gmail.com") + + def loadAccountInfo(self, user, req): + # Get user data from premiumize.me + status = self.getAccountStatus(user, req) + self.logDebug(status) + + # Parse account info + account_info = {"validuntil": float(status['result']['expires']), + "trafficleft": max(0, status['result']['trafficleft_bytes'] / 1024)} + + if status['result']['type'] == 'free': + account_info['premium'] = False + + return account_info + + def login(self, user, data, req): + # Get user data from premiumize.me + status = self.getAccountStatus(user, req) + + # Check if user and password are valid + if status['status'] != 200: + self.wrongPassword() + + def getAccountStatus(self, user, req): + # Use premiumize.me API v1 (see https://secure.premiumize.me/?show=api) + # to retrieve account info and return the parsed json answer + answer = req.load( + "https://api.premiumize.me/pm-api/v1.php?method=accountstatus¶ms[login]=%s¶ms[pass]=%s" % ( + user, self.accounts[user]['password'])) + return json_loads(answer) diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py index 94649cc43..1af7cbffd 100644 --- a/module/plugins/accounts/QuickshareCz.py +++ b/module/plugins/accounts/QuickshareCz.py @@ -21,6 +21,7 @@ import re from module.plugins.Account import Account from module.utils import parseFileSize + class QuickshareCz(Account): __name__ = "QuickshareCz" __version__ = "0.01" @@ -28,26 +29,26 @@ class QuickshareCz(Account): __description__ = """quickshare.cz account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + def loadAccountInfo(self, user, req): - html = req.load("http://www.quickshare.cz/premium", decode = True) - - found = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html) + html = req.load("http://www.quickshare.cz/premium", decode=True) + + found = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html) if found: - trafficleft = parseFileSize(found.group(1)) / 1024 + trafficleft = parseFileSize(found.group(1)) / 1024 premium = True if trafficleft else False else: trafficleft = None - premium = False + premium = False return {"validuntil": -1, "trafficleft": trafficleft, "premium": premium} - + def login(self, user, data, req): - html = req.load('http://www.quickshare.cz/html/prihlaseni_process.php', post = { + html = req.load('http://www.quickshare.cz/html/prihlaseni_process.php', post={ "akce": u'Přihlásit', "heslo": data['password'], "jmeno": user - }, decode = True) - + }, decode=True) + if u'>Takový uživatel neexistuje.<' in html or u'>Špatné heslo.<' in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py index 85adc71a3..8a02b712c 100644 --- a/module/plugins/accounts/RapidgatorNet.py +++ b/module/plugins/accounts/RapidgatorNet.py @@ -17,11 +17,10 @@ @author: zoidberg """ -import re from module.plugins.Account import Account -from module.utils import parseFileSize from module.common.json_layer import json_loads + class RapidgatorNet(Account): __name__ = "RapidgatorNet" __version__ = "0.04" @@ -29,24 +28,24 @@ class RapidgatorNet(Account): __description__ = """rapidgator.net account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + API_URL = 'http://rapidgator.net/api/user' - + def loadAccountInfo(self, user, req): try: - sid = self.getAccountData(user).get('SID') + sid = self.getAccountData(user).get('SID') assert sid - + json = req.load("%s/info?sid=%s" % (self.API_URL, sid)) - self.logDebug("API:USERINFO", json) + self.logDebug("API:USERINFO", json) json = json_loads(json) - + if json['response_status'] == 200: if "reset_in" in json['response']: self.scheduleRefresh(user, json['response']['reset_in']) - - return {"validuntil": json['response']['expire_date'], - "trafficleft": int(json['response']['traffic_left']) / 1024, + + return {"validuntil": json['response']['expire_date'], + "trafficleft": int(json['response']['traffic_left']) / 1024, "premium": True} else: self.logError(json['response_details']) @@ -54,21 +53,19 @@ class RapidgatorNet(Account): self.logError(e) return {"validuntil": None, "trafficleft": None, "premium": False} - - def login(self, user, data, req): + + def login(self, user, data, req): try: - json = req.load('%s/login' % self.API_URL, - post = {"username": user, - "password": data['password']}) + json = req.load('%s/login' % self.API_URL, post={"username": user, "password": data['password']}) self.logDebug("API:LOGIN", json) - json = json_loads(json) - + json = json_loads(json) + if json['response_status'] == 200: data['SID'] = str(json['response']['session_id']) - return + return else: self.logError(json['response_details']) except Exception, e: self.logError(e) - + self.wrongPassword() diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py index 15722e099..b2066cd1e 100644 --- a/module/plugins/accounts/RapidshareCom.py +++ b/module/plugins/accounts/RapidshareCom.py @@ -19,6 +19,7 @@ from module.plugins.Account import Account + class RapidshareCom(Account): __name__ = "RapidshareCom" __version__ = "0.22" @@ -26,11 +27,12 @@ class RapidshareCom(Account): __description__ = """Rapidshare.com account plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") - + def loadAccountInfo(self, user, req): data = self.getAccountData(user) api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi" - api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, "password": data["password"], "withcookie": 1} + api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, + "password": data["password"], "withcookie": 1} src = req.load(api_url_base, cookies=False, get=api_param_prem) if src.startswith("ERROR"): raise Exception(src) @@ -41,20 +43,21 @@ class RapidshareCom(Account): continue k, v = t.split("=") info[k] = v - + validuntil = int(info["billeduntil"]) premium = True if validuntil else False - tmp = {"premium": premium, "validuntil": validuntil, "trafficleft":-1, "maxtraffic":-1} + tmp = {"premium": premium, "validuntil": validuntil, "trafficleft": -1, "maxtraffic": -1} return tmp - + def login(self, user, data, req): api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi" - api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, "password": data["password"], "withcookie": 1} + api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user, + "password": data["password"], "withcookie": 1} src = req.load(api_url_base, cookies=False, get=api_param_prem) if src.startswith("ERROR"): - raise Exception(src+"### Note you have to use your account number for login, instead of name.") + raise Exception(src + "### Note you have to use your account number for login, instead of name.") fields = src.split("\n") info = {} for t in fields: @@ -64,5 +67,3 @@ class RapidshareCom(Account): info[k] = v cj = self.getAccountCookies(user) cj.setCookie("rapidshare.com", "enc", info["cookie"]) - - diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py index 90ad02d43..f4ae4a79a 100644 --- a/module/plugins/accounts/RarefileNet.py +++ b/module/plugins/accounts/RarefileNet.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class RarefileNet(XFSPAccount): __name__ = "RarefileNet" __version__ = "0.02" @@ -8,5 +9,5 @@ class RarefileNet(XFSPAccount): __description__ = """RareFile.net account plugin""" __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 adbd090db..11b985a13 100644 --- a/module/plugins/accounts/RealdebridCom.py +++ b/module/plugins/accounts/RealdebridCom.py @@ -1,25 +1,28 @@ -from module.plugins.Account import Account
-import xml.dom.minidom as dom
-
-class RealdebridCom(Account):
- __name__ = "RealdebridCom"
- __version__ = "0.41"
- __type__ = "account"
- __description__ = """Real-Debrid.com account plugin"""
- __author_name__ = ("Devirex, Hazzard")
- __author_mail__ = ("naibaf_11@yahoo.de")
-
- def loadAccountInfo(self, user, req):
- page = req.load("http://real-debrid.com/api/account.php")
- xml = dom.parseString(page)
- account_info = {"validuntil": int(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue),
- "trafficleft": -1}
-
- return account_info
-
- def login(self, user, data, req):
- page = req.load("https://real-debrid.com/ajax/login.php", get = {"user": user, "pass": data["password"]})
- #page = req.load("https://real-debrid.com/login.html", post={"user": user, "pass": data["password"]}, cookies=True)
-
- if "Your login informations are incorrect" in page:
- self.wrongPassword()
+import xml.dom.minidom as dom + +from module.plugins.Account import Account + + +class RealdebridCom(Account): + __name__ = "RealdebridCom" + __version__ = "0.41" + __type__ = "account" + __description__ = """Real-Debrid.com account plugin""" + __author_name__ = ("Devirex, Hazzard") + __author_mail__ = ("naibaf_11@yahoo.de") + + def loadAccountInfo(self, user, req): + page = req.load("http://real-debrid.com/api/account.php") + xml = dom.parseString(page) + account_info = {"validuntil": int(xml.getElementsByTagName("expiration")[0].childNodes[0].nodeValue), + "trafficleft": -1} + + return account_info + + def login(self, user, data, req): + page = req.load("https://real-debrid.com/ajax/login.php", get={"user": user, "pass": data["password"]}) + # page = req.load("https://real-debrid.com/login.html", + # post={"user": user, "pass": data["password"]}, cookies=True) + + if "Your login informations are incorrect" in page: + self.wrongPassword() diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index e1cb2668f..58c91801b 100644 --- a/module/plugins/accounts/RehostTo.py +++ b/module/plugins/accounts/RehostTo.py @@ -9,9 +9,7 @@ class RehostTo(Account): __author_name__ = ("RaNaN") __author_mail__ = ("RaNaN@pyload.org") - def loadAccountInfo(self, user, req): - data = self.getAccountData(user) page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data["password"])) data = [x.split("=") for x in page.split(",")] @@ -33,5 +31,3 @@ class RehostTo(Account): if "Login failed." in page: self.wrongPassword() - - diff --git a/module/plugins/accounts/ReloadCc.py b/module/plugins/accounts/ReloadCc.py index e4cb32c42..b3c26c6d3 100644 --- a/module/plugins/accounts/ReloadCc.py +++ b/module/plugins/accounts/ReloadCc.py @@ -1,9 +1,10 @@ -from module.plugins.Account import Account +from module.plugins.Account import Account from module.common.json_layer import json_loads from module.network.HTTPRequest import BadHeader + class ReloadCc(Account): __name__ = "ReloadCc" __version__ = "0.3" @@ -37,7 +38,6 @@ class ReloadCc(Account): if status['status'] != "ok": self.wrongPassword() - def getAccountStatus(self, user, req): # Use reload.cc API v1 to retrieve account info and return the parsed json answer query_params = dict( diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py index f734eb11b..484de2d7a 100644 --- a/module/plugins/accounts/RyushareCom.py +++ b/module/plugins/accounts/RyushareCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class RyushareCom(XFSPAccount): __name__ = "RyushareCom" __version__ = "0.03" @@ -8,11 +9,12 @@ class RyushareCom(XFSPAccount): __description__ = """ryushare.com account plugin""" __author_name__ = ("zoidberg", "trance4us") __author_mail__ = ("zoidberg@mujmail.cz", "") - + MAIN_PAGE = "http://ryushare.com/" - + def login(self, user, data, req): req.lastURL = "http://ryushare.com/login.python" - html = req.load("http://ryushare.com/login.python", post={"login": user, "password": data["password"], "op": "login"}) - if 'Incorrect Login or Password' in html or '>Error<' in html: - self.wrongPassword()
\ No newline at end of file + html = req.load("http://ryushare.com/login.python", + post={"login": user, "password": data["password"], "op": "login"}) + if 'Incorrect Login or Password' in html or '>Error<' in html: + self.wrongPassword() diff --git a/module/plugins/accounts/Share76Com.py b/module/plugins/accounts/Share76Com.py index 9c946ae50..1dfcd8510 100644 --- a/module/plugins/accounts/Share76Com.py +++ b/module/plugins/accounts/Share76Com.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class Share76Com(XFSPAccount): __name__ = "Share76Com" __version__ = "0.02" diff --git a/module/plugins/accounts/ShareFilesCo.py b/module/plugins/accounts/ShareFilesCo.py index 0d8ea6635..cff52d570 100644 --- a/module/plugins/accounts/ShareFilesCo.py +++ b/module/plugins/accounts/ShareFilesCo.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class ShareFilesCo(XFSPAccount): __name__ = "ShareFilesCo" __version__ = "0.01" diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py index f8043449c..b532768b1 100644 --- a/module/plugins/accounts/ShareRapidCom.py +++ b/module/plugins/accounts/ShareRapidCom.py @@ -4,44 +4,45 @@ import re from time import mktime, strptime from module.plugins.Account import Account + class ShareRapidCom(Account): __name__ = "ShareRapidCom" __version__ = "0.32" __type__ = "account" __description__ = """ShareRapid account plugin""" __author_name__ = ("MikyWoW", "zoidberg") - + login_timeout = 60 - + def loadAccountInfo(self, user, req): src = req.load("http://share-rapid.com/mujucet/", decode=True) - + found = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src) if found: data = self.getAccountData(user) data["options"]["limitDL"] = [int(found.group(1))] - + found = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src) if found: validuntil = mktime(strptime(found.group(1), "%d.%m.%Y - %H:%M")) - return {"premium": True, "trafficleft": -1, "validuntil": validuntil} - + return {"premium": True, "trafficleft": -1, "validuntil": validuntil} + found = re.search(r'<tr><td>GB:</td><td>(.*?) GB', src) if found: trafficleft = float(found.group(1)) * (1 << 20) return {"premium": True, "trafficleft": trafficleft, "validuntil": -1} - + return {"premium": False, "trafficleft": None, "validuntil": None} def login(self, user, data, req): htm = req.load("http://share-rapid.com/prihlaseni/", cookies=True) if "Heslo:" in htm: start = htm.index('id="inp_hash" name="hash" value="') - htm = htm[start+33:] + htm = htm[start + 33:] hashes = htm[0:32] htm = req.load("http://share-rapid.com/prihlaseni/", post={"hash": hashes, - "login": user, + "login": user, "pass1": data["password"], "remember": 0, - "sbmt": u"Přihlásit"}, cookies=True)
\ No newline at end of file + "sbmt": u"Přihlásit"}, cookies=True) diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index fe2b412db..03babb5e6 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -19,6 +19,7 @@ from module.plugins.Account import Account + class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __version__ = "0.24" @@ -29,7 +30,7 @@ class ShareonlineBiz(Account): def getUserAPI(self, user, req): return req.load("http://api.share-online.biz/account.php", - {"username": user, "password": self.accounts[user]["password"], "act": "userDetails"}) + {"username": user, "password": self.accounts[user]["password"], "act": "userDetails"}) def loadAccountInfo(self, user, req): src = self.getUserAPI(user, req) @@ -53,4 +54,4 @@ class ShareonlineBiz(Account): def login(self, user, data, req): src = self.getUserAPI(user, req) if "EXCEPTION" in src: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/SpeedLoadOrg.py b/module/plugins/accounts/SpeedLoadOrg.py index 4eb2b52de..bb9fb05fb 100644 --- a/module/plugins/accounts/SpeedLoadOrg.py +++ b/module/plugins/accounts/SpeedLoadOrg.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class SpeedLoadOrg(XFSPAccount): __name__ = "SpeedLoadOrg" __version__ = "0.01" diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py index 8a4523bc5..6e2b1c96d 100644 --- a/module/plugins/accounts/StahnuTo.py +++ b/module/plugins/accounts/StahnuTo.py @@ -17,9 +17,11 @@ @author: zoidberg """ +import re + from module.plugins.Account import Account from module.utils import parseFileSize -import re + class StahnuTo(Account): __name__ = "StahnuTo" @@ -28,22 +30,22 @@ class StahnuTo(Account): __description__ = """StahnuTo account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + #login_timeout = 60 - def loadAccountInfo(self, user, req): + def loadAccountInfo(self, user, req): html = req.load("http://www.stahnu.to/") - + found = re.search(r'>VIP: (\d+.*)<', html) - trafficleft = parseFileSize(found.group(1)) * 1024 if found else 0 + trafficleft = parseFileSize(found.group(1)) * 1024 if found else 0 return {"premium": trafficleft > (512 * 1024), "trafficleft": trafficleft, "validuntil": -1} - def login(self, user, data, req): + def login(self, user, data, req): html = req.load("http://www.stahnu.to/login.php", post={ "username": user, "password": data["password"], "submit": "Login"}) - + if not '<a href="logout.php">' in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py index c4b819131..5d4471c30 100644 --- a/module/plugins/accounts/TurbobitNet.py +++ b/module/plugins/accounts/TurbobitNet.py @@ -17,10 +17,12 @@ @author: zoidberg """ -from module.plugins.Account import Account import re from time import mktime, strptime +from module.plugins.Account import Account + + class TurbobitNet(Account): __name__ = "TurbobitNet" __version__ = "0.01" @@ -28,12 +30,12 @@ class TurbobitNet(Account): __description__ = """TurbobitNet account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + #login_timeout = 60 - def loadAccountInfo(self, user, req): + def loadAccountInfo(self, user, req): html = req.load("http://turbobit.net") - + found = re.search(r'<u>Turbo Access</u> to ([0-9.]+)', html) if found: premium = True @@ -46,11 +48,11 @@ class TurbobitNet(Account): def login(self, user, data, req): req.cj.setCookie("turbobit.net", "user_lang", "en") - + html = req.load("http://turbobit.net/user/login", post={ "user[login]": user, "user[pass]": data["password"], "user[submit]": "Login"}) - + if not '<div class="menu-item user-name">' in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py index 6652c8b7c..dc59db9cc 100644 --- a/module/plugins/accounts/UlozTo.py +++ b/module/plugins/accounts/UlozTo.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account import re +from module.plugins.Account import Account + + class UlozTo(Account): __name__ = "UlozTo" __version__ = "0.04" @@ -10,27 +12,27 @@ class UlozTo(Account): __description__ = """uloz.to account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="http://www.ulozto.net/kredit" title="[^"]*?GB = ([0-9.]+) MB"' def loadAccountInfo(self, user, req): #this cookie gets lost somehow after each request - self.phpsessid = req.cj.getCookie("ULOSESSID") - html = req.load("http://www.ulozto.net/", decode = True) - req.cj.setCookie("www.ulozto.net", "ULOSESSID", self.phpsessid) - + self.phpsessid = req.cj.getCookie("ULOSESSID") + html = req.load("http://www.ulozto.net/", decode=True) + req.cj.setCookie("www.ulozto.net", "ULOSESSID", self.phpsessid) + found = re.search(self.TRAFFIC_LEFT_PATTERN, html) - trafficleft = int(float(found.group(1).replace(' ','').replace(',','.')) * 1000 / 1.024) if found else 0 + trafficleft = int(float(found.group(1).replace(' ', '').replace(',', '.')) * 1000 / 1.024) if found else 0 self.premium = True if trafficleft else False - + return {"validuntil": -1, "trafficleft": trafficleft} - + def login(self, user, data, req): - html = req.load('http://www.ulozto.net/login?do=loginForm-submit', post = { + html = req.load('http://www.ulozto.net/login?do=loginForm-submit', post={ "login": "Submit", "password": data['password'], - "username": user - }, decode = True) - + "username": user + }, decode=True) + if '<ul class="error">' in html: self.wrongPassword() diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index e10b93e8d..ac1f3fd35 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -17,18 +17,20 @@ @author: mkaay """ -from module.plugins.Account import Account import re from time import time +from module.plugins.Account import Account + + class UploadedTo(Account): __name__ = "UploadedTo" - __version__ = "0.23" + __version__ = "0.26" __type__ = "account" __description__ = """ul.net account plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") - + def loadAccountInfo(self, user, req): req.load("http://uploaded.net/language/en") @@ -37,7 +39,7 @@ class UploadedTo(Account): premium = '<a href="register"><em>Premium</em>' in html or '<em>Premium</em></th>' in html if premium: - raw_traffic = re.search(r'<th colspan="2"><b class="cB">([^<]+)', html).group(1) + raw_traffic = re.search(r'<th colspan="2"><b class="cB">([^<]+)', html).group(1).replace('.', '') raw_valid = re.search(r"<td>Duration:</td>\s*<th>([^<]+)", html, re.MULTILINE).group(1).strip() traffic = int(self.parseTraffic(raw_traffic)) @@ -45,21 +47,22 @@ class UploadedTo(Account): if raw_valid == "unlimited": validuntil = -1 else: - raw_valid = re.findall(r"(\d+) (weeks|days|hours)", raw_valid) + raw_valid = re.findall(r"(\d+) (Week|weeks|days|day|hours|hour)", raw_valid) validuntil = time() for n, u in raw_valid: - validuntil += 3600 * int(n) * {"weeks": 168, "days": 24, "hours": 1}[u] + validuntil += 3600 * int(n) * {"Week": 168, "weeks": 168, "days": 24, + "day": 24, "hours": 1, "hour": 1}[u] - return {"validuntil":validuntil, "trafficleft":traffic, "maxtraffic":50*1024*1024} + return {"validuntil": validuntil, "trafficleft": traffic, "maxtraffic": 50 * 1024 * 1024} else: - return {"premium" : False, "validuntil" : -1} + return {"premium": False, "validuntil": -1} def login(self, user, data, req): req.load("http://uploaded.net/language/en") req.cj.setCookie("uploaded.net", "lang", "en") - - page = req.load("http://uploaded.net/io/login", post={ "id" : user, "pw" : data["password"], "_" : ""}) + + page = req.load("http://uploaded.net/io/login", post={"id": user, "pw": data["password"], "_": ""}) if "User and password do not match!" in page: self.wrongPassword() diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py index f1e0649e6..0e64a3ff5 100644 --- a/module/plugins/accounts/UploadheroCom.py +++ b/module/plugins/accounts/UploadheroCom.py @@ -1,35 +1,39 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from module.plugins.Account import Account
-import re,datetime,time
-
-class UploadheroCom(Account):
- __name__ = "UploadheroCom"
- __version__ = "0.1"
- __type__ = "account"
- __description__ = """Uploadhero.com account plugin"""
- __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.')
-
- data = self.getAccountData(user)
- page = req.load("http://uploadhero.com/my-account")
-
- if premium_pattern.search(page):
- end_date = datetime.date.today() + datetime.timedelta(days=int(premium_pattern.search(page).group(1)))
- end_date = time.mktime(future.timetuple())
- account_info = {"validuntil": end_date, "trafficleft": -1, "premium": True}
- else:
- account_info = {"validuntil": -1, "trafficleft": -1, "premium": False}
-
- return account_info
-
- def login(self, user, data, req):
- page = req.load("http://uploadhero.com/lib/connexion.php", post={"pseudo_login": user, "password_login": data["password"]})
-
- if "mot de passe invalide" in page:
- self.wrongPassword()
\ No newline at end of file +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +import datetime +import time + +from module.plugins.Account import Account + + +class UploadheroCom(Account): + __name__ = "UploadheroCom" + __version__ = "0.1" + __type__ = "account" + __description__ = """Uploadhero.com account plugin""" + __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.') + + data = self.getAccountData(user) + page = req.load("http://uploadhero.com/my-account") + + if premium_pattern.search(page): + end_date = datetime.date.today() + datetime.timedelta(days=int(premium_pattern.search(page).group(1))) + end_date = time.mktime(future.timetuple()) + account_info = {"validuntil": end_date, "trafficleft": -1, "premium": True} + else: + account_info = {"validuntil": -1, "trafficleft": -1, "premium": False} + + return account_info + + def login(self, user, data, req): + page = req.load("http://uploadhero.com/lib/connexion.php", + post={"pseudo_login": user, "password_login": data["password"]}) + + if "mot de passe invalide" in page: + self.wrongPassword() diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py index 507e4ab18..d13df4f9d 100644 --- a/module/plugins/accounts/UploadingCom.py +++ b/module/plugins/accounts/UploadingCom.py @@ -17,10 +17,12 @@ @author: mkaay """ -from module.plugins.Account import Account from time import time, strptime, mktime import re +from module.plugins.Account import Account + + class UploadingCom(Account): __name__ = "UploadingCom" __version__ = "0.1" @@ -28,25 +30,26 @@ class UploadingCom(Account): __description__ = """uploading.com account plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") - + def loadAccountInfo(self, user, req): src = req.load("http://uploading.com/") premium = True if "UPGRADE TO PREMIUM" in src: return {"validuntil": -1, "trafficleft": -1, "premium": False} - + m = re.search("Valid Until:(.*?)<", src) if m: validuntil = int(mktime(strptime(m.group(1).strip(), "%b %d, %Y"))) else: validuntil = -1 - + return {"validuntil": validuntil, "trafficleft": -1, "premium": True} - + def login(self, user, data, req): req.cj.setCookie("uploading.com", "lang", "1") req.cj.setCookie("uploading.com", "language", "1") req.cj.setCookie("uploading.com", "setlang", "en") req.cj.setCookie("uploading.com", "_lang", "en") req.load("http://uploading.com/") - req.load("http://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time()*1000), post={"email": user, "password": data["password"], "remember": "on"}) + req.load("http://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time() * 1000), + post={"email": user, "password": data["password"], "remember": "on"}) diff --git a/module/plugins/accounts/UploadstationCom.py b/module/plugins/accounts/UploadstationCom.py index e86cec7ce..040f6bbef 100644 --- a/module/plugins/accounts/UploadstationCom.py +++ b/module/plugins/accounts/UploadstationCom.py @@ -2,6 +2,7 @@ from module.plugins.accounts.FilejungleCom import FilejungleCom + class UploadstationCom(FilejungleCom): __name__ = "UploadstationCom" __version__ = "0.1" @@ -9,5 +10,5 @@ class UploadstationCom(FilejungleCom): __description__ = """uploadstation.com account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + URL = "http://uploadstation.com/" diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py index b07991817..7fc62694a 100644 --- a/module/plugins/accounts/UptoboxCom.py +++ b/module/plugins/accounts/UptoboxCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.internal.XFSPAccount import XFSPAccount + class UptoboxCom(XFSPAccount): __name__ = "UptoboxCom" __version__ = "0.01" @@ -8,5 +9,5 @@ class UptoboxCom(XFSPAccount): __description__ = """DDLStorage.com account plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - MAIN_PAGE = "http://uptobox.com/"
\ No newline at end of file + + MAIN_PAGE = "http://uptobox.com/" diff --git a/module/plugins/accounts/WarserverCz.py b/module/plugins/accounts/WarserverCz.py index 21961956b..2c871eb6d 100644 --- a/module/plugins/accounts/WarserverCz.py +++ b/module/plugins/accounts/WarserverCz.py @@ -17,10 +17,11 @@ @author: zoidberg """ -from module.plugins.Account import Account import re + +from module.plugins.Account import Account from module.utils import parseFileSize -from time import mktime, strptime + class WarserverCz(Account): __name__ = "WarserverCz" @@ -29,42 +30,39 @@ class WarserverCz(Account): __description__ = """Warserver.cz account plugin""" __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>(.+?)<' - + DOMAIN = "http://www.warserver.cz" - def loadAccountInfo(self, user, req): - html = req.load("%s/uzivatele/prehled" % self.DOMAIN, decode = True) - + def loadAccountInfo(self, user, req): + html = req.load("%s/uzivatele/prehled" % self.DOMAIN, decode=True) + validuntil = trafficleft = None premium = False - + found = re.search(self.VALID_UNTIL_PATTERN, html) if found: self.logDebug("VALID_UNTIL", found.group(1)) - try: + try: #validuntil = mktime(strptime(found.group(1), "%d %B %Y")) premium = True trafficleft = -1 except Exception, e: self.logError(e) - + found = re.search(self.TRAFFIC_LEFT_PATTERN, html) if found: self.logDebug("TRAFFIC_LEFT", found.group(1)) - trafficleft = parseFileSize((found.group(1).replace(" ",""))) // 1024 - premium = True if trafficleft > 1 << 18 else False - - return ({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}) - + trafficleft = parseFileSize((found.group(1).replace(" ", ""))) // 1024 + premium = True if trafficleft > 1 << 18 else False + + return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} + def login(self, user, data, req): - html = req.load('%s/uzivatele/prihlaseni?do=prihlaseni-submit' % self.DOMAIN, - post = {"username": user, - "password": data['password'], - "send": u"Přihlásit"}, - decode = True) - - if '<p class="chyba">' in html: - self.wrongPassword()
\ No newline at end of file + html = req.load('%s/uzivatele/prihlaseni?do=prihlaseni-submit' % self.DOMAIN, + post={"username": user, "password": data['password'], "send": u"Přihlásit"}, decode=True) + + if '<p class="chyba">' in html: + self.wrongPassword() diff --git a/module/plugins/accounts/WuploadCom.py b/module/plugins/accounts/WuploadCom.py index 3d9ddfffa..2a8bfee8e 100644 --- a/module/plugins/accounts/WuploadCom.py +++ b/module/plugins/accounts/WuploadCom.py @@ -22,6 +22,7 @@ from types import MethodType from module.plugins.Account import Account from module.common.json_layer import json_loads + class WuploadCom(Account): __name__ = "WuploadCom" __version__ = "0.1" @@ -44,4 +45,4 @@ class WuploadCom(Account): def getDomain(self, req): xml = req.load(self.API_URL + "/utility?method=getWuploadDomainForCurrentIp&format=json", decode=True) - return json_loads(xml)["FSApi_Utility"]["getWuploadDomainForCurrentIp"]["response"]
\ No newline at end of file + return json_loads(xml)["FSApi_Utility"]["getWuploadDomainForCurrentIp"]["response"] diff --git a/module/plugins/accounts/X7To.py b/module/plugins/accounts/X7To.py index 8c2bf245a..34a7b99be 100644 --- a/module/plugins/accounts/X7To.py +++ b/module/plugins/accounts/X7To.py @@ -1,66 +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: ernieb
-"""
-
-import re
-from time import strptime, mktime
-
-from module.plugins.Account import Account
-
-class X7To(Account):
- __name__ = "X7To"
- __version__ = "0.1"
- __type__ = "account"
- __description__ = """X7.To account plugin"""
- __author_name__ = ("ernieb")
- __author_mail__ = ("ernieb")
-
- def loadAccountInfo(self, user, req):
- page = req.load("http://www.x7.to/my")
-
- validCheck = re.search("Premium-Mitglied bis ([0-9]*-[0-9]*-[0-9]*)", page, re.IGNORECASE)
- if validCheck:
- valid = validCheck.group(1)
- valid = int(mktime(strptime(valid, "%Y-%m-%d")))
- else:
- validCheck = re.search("Premium member until ([0-9]*-[0-9]*-[0-9]*)", page, re.IGNORECASE)
- if validCheck:
- valid = validCheck.group(1)
- valid = int(mktime(strptime(valid, "%Y-%m-%d")))
- else:
- valid = 0
-
- trafficleft = re.search(r'<em style="white-space:nowrap">([\d]*[,]?[\d]?[\d]?) (KB|MB|GB)</em>', page, re.IGNORECASE)
- if trafficleft:
- units = float(trafficleft.group(1).replace(",", "."))
- pow = {'KB': 0, 'MB': 1, 'GB': 2}[trafficleft.group(2)]
- trafficleft = int(units * 1024 ** pow)
- else:
- trafficleft = -1
-
- return {"trafficleft": trafficleft, "validuntil": valid}
-
-
- def login(self, user, data, req):
- #req.cj.setCookie("share.cx", "lang", "english")
- page = req.load("http://x7.to/lang/en", None, {})
- page = req.load("http://x7.to/james/login", None,
- {"redirect": "http://www.x7.to/", "id": user, "pw": data['password'], "submit": "submit"})
-
- if "Username and password are not matching." in page:
- self.wrongPassword()
+# -*- 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: ernieb +""" + +import re +from time import strptime, mktime + +from module.plugins.Account import Account + + +class X7To(Account): + __name__ = "X7To" + __version__ = "0.1" + __type__ = "account" + __description__ = """X7.To account plugin""" + __author_name__ = ("ernieb") + __author_mail__ = ("ernieb") + + def loadAccountInfo(self, user, req): + page = req.load("http://www.x7.to/my") + + validCheck = re.search("Premium-Mitglied bis ([0-9]*-[0-9]*-[0-9]*)", page, re.IGNORECASE) + if validCheck: + valid = validCheck.group(1) + valid = int(mktime(strptime(valid, "%Y-%m-%d"))) + else: + validCheck = re.search("Premium member until ([0-9]*-[0-9]*-[0-9]*)", page, re.IGNORECASE) + if validCheck: + valid = validCheck.group(1) + valid = int(mktime(strptime(valid, "%Y-%m-%d"))) + else: + valid = 0 + + trafficleft = re.search(r'<em style="white-space:nowrap">([\d]*[,]?[\d]?[\d]?) (KB|MB|GB)</em>', + page, re.IGNORECASE) + if trafficleft: + units = float(trafficleft.group(1).replace(",", ".")) + pow = {'KB': 0, 'MB': 1, 'GB': 2}[trafficleft.group(2)] + trafficleft = int(units * 1024 ** pow) + else: + trafficleft = -1 + + return {"trafficleft": trafficleft, "validuntil": valid} + + def login(self, user, data, req): + #req.cj.setCookie("share.cx", "lang", "english") + page = req.load("http://x7.to/lang/en", None, {}) + page = req.load("http://x7.to/james/login", None, + {"redirect": "http://www.x7.to/", "id": user, "pw": data['password'], "submit": "submit"}) + + if "Username and password are not matching." in page: + self.wrongPassword() diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py index e2aa6f11d..c4eab74dc 100644 --- a/module/plugins/accounts/YibaishiwuCom.py +++ b/module/plugins/accounts/YibaishiwuCom.py @@ -17,9 +17,11 @@ @author: zoidberg """ -from module.plugins.Account import Account import re +from module.plugins.Account import Account + + class YibaishiwuCom(Account): __name__ = "YibaishiwuCom" __version__ = "0.01" @@ -32,20 +34,20 @@ class YibaishiwuCom(Account): def loadAccountInfo(self, user, req): #self.relogin(user) - html = req.load("http://115.com/", decode = True) - + html = req.load("http://115.com/", decode=True) + found = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S) premium = True if (found and 'is_vip: 1' in found.group(1)) else False validuntil = trafficleft = (-1 if found else 0) return dict({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}) def login(self, user, data, req): - html = req.load('http://passport.115.com/?ac=login', post = { + html = req.load('http://passport.115.com/?ac=login', post={ "back": "http://www.115.com/", "goto": "http://115.com/", "login[account]": user, "login[passwd]": data['password'] - }, decode = True) + }, decode=True) if not 'var USER_PERMISSION = {' in html: - self.wrongPassword()
\ No newline at end of file + self.wrongPassword() diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index 61a66cd89..13ed95133 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- +from time import mktime, strptime + from module.plugins.Account import Account -import re -from time import mktime, strptime class ZeveraCom(Account): __name__ = "ZeveraCom" @@ -10,17 +10,17 @@ class ZeveraCom(Account): __type__ = "account" __description__ = """Zevera.com account plugin""" __author_name__ = ("zoidberg") - __author_mail__ = ("zoidberg@mujmail.cz") - - def loadAccountInfo(self, user, req): + __author_mail__ = ("zoidberg@mujmail.cz") + + def loadAccountInfo(self, user, req): data = self.getAPIData(req) if data == "No traffic": account_info = {"trafficleft": 0, "validuntil": 0, "premium": False} else: account_info = { "trafficleft": int(data['availabletodaytraffic']) * 1024, - "validuntil": mktime(strptime(data['endsubscriptiondate'],"%Y/%m/%d %H:%M:%S")), - "premium": True + "validuntil": mktime(strptime(data['endsubscriptiondate'], "%Y/%m/%d %H:%M:%S")), + "premium": True } return account_info @@ -29,8 +29,8 @@ class ZeveraCom(Account): self.password = data["password"] if self.getAPIData(req) == "No traffic": self.wrongPassword() - - def getAPIData(self, req, just_header = False, **kwargs): + + def getAPIData(self, req, just_header=False, **kwargs): get_data = { 'cmd': 'accountinfo', 'login': self.loginname, @@ -38,12 +38,14 @@ class ZeveraCom(Account): } get_data.update(kwargs) - response = req.load("http://www.zevera.com/jDownloader.ashx", get = get_data, decode = True, just_header = just_header) + response = req.load("http://www.zevera.com/jDownloader.ashx", get=get_data, + decode=True, just_header=just_header) self.logDebug(response) if ':' in response: if not just_header: - response = response.replace(',','\n') - return dict((y.strip().lower(), z.strip()) for (y,z) in [x.split(':',1) for x in response.splitlines() if ':' in x]) + response = response.replace(',', '\n') + return dict((y.strip().lower(), z.strip()) for (y, z) in + [x.split(':', 1) for x in response.splitlines() if ':' in x]) else: - return response
\ No newline at end of file + return response diff --git a/module/plugins/crypter/C1neonCom.py b/module/plugins/crypter/C1neonCom.py index 36b84764e..7d20d8a73 100644 --- a/module/plugins/crypter/C1neonCom.py +++ b/module/plugins/crypter/C1neonCom.py @@ -20,6 +20,8 @@ import re import random from module.plugins.Crypter import Crypter from module.common.json_layer import json_loads + + class C1neonCom(Crypter): __name__ = "C1neonCom" __type__ = "container" @@ -31,9 +33,10 @@ class C1neonCom(Crypter): ("useStreams", "bool", "Use Streams too", False), ("hosterListMode", "all;onlypreferred", "Use for hosters (if supported)", "all"), ("randomPreferred", "bool", "Randomize Preferred-List", False), - ("hosterList", "str", "Preferred Hoster list (comma separated, no ending)", "2shared,Bayfiles,Netload,Rapidshare,Share-online"), + ("hosterList", "str", "Preferred Hoster list (comma separated, no ending)", + "2shared,Bayfiles,Netload,Rapidshare,Share-online"), ("ignoreList", "str", "Ignored Hoster list (comma separated, no ending)", "Megaupload") - ] + ] __description__ = """C1neon.Com Container Plugin""" __author_name__ = ("godofdream") __author_mail__ = ("soilfiction@gmail.com") @@ -41,13 +44,13 @@ class C1neonCom(Crypter): VALUES_PATTERN = r"var subcats = (.*?)(;</script>|;var)" SHOW_PATTERN = r"title='(.*?)'" SERIE_PATTERN = r"<title>.*Serie.*</title>" - + def decrypt(self, pyfile): src = self.req.load(str(pyfile.url)) pattern = re.compile(self.VALUES_PATTERN, re.DOTALL) data = json_loads(re.search(pattern, src).group(1)) - + # Get package info links = [] Showname = re.search(self.SHOW_PATTERN, src) @@ -55,7 +58,7 @@ class C1neonCom(Crypter): Showname = Showname.group(1).decode("utf-8") else: Showname = self.pyfile.package().name - + if re.search(self.SERIE_PATTERN, src): for Season in data: self.logDebug("Season " + Season) @@ -63,21 +66,22 @@ class C1neonCom(Crypter): self.logDebug("Episode " + Episode) links.extend(self.getpreferred(data[Season][Episode])) if self.getConfig("changeNameS") == "Episode": - self.packages.append((data[Season][Episode]['info']['name'].split("»")[0], links, data[Season][Episode]['info']['name'].split("»")[0])) + self.packages.append((data[Season][Episode]['info']['name'].split("»")[0], links, + data[Season][Episode]['info']['name'].split("»")[0])) links = [] - - if self.getConfig("changeNameS") == "Season": + + if self.getConfig("changeNameS") == "Season": self.packages.append((Showname + " Season " + Season, links, Showname + " Season " + Season)) links = [] if self.getConfig("changeNameS") == "Show": - if links == []: + if links == []: self.fail('Could not extract any links (Out of Date?)') else: self.packages.append((Showname, links, Showname)) - + elif self.getConfig("changeNameS") == "Packagename": - if links == []: + if links == []: self.fail('Could not extract any links (Out of Date?)') else: self.core.files.addLinks(links, self.pyfile.package().id) @@ -85,13 +89,13 @@ class C1neonCom(Crypter): for Movie in data: links.extend(self.getpreferred(data[Movie])) if self.getConfig("changeName") == "Movie": - if links == []: + if links == []: self.fail('Could not extract any links (Out of Date?)') else: self.packages.append((Showname, links, Showname)) - + elif self.getConfig("changeName") == "Packagename": - if links == []: + if links == []: self.fail('Could not extract any links (Out of Date?)') else: self.core.files.addLinks(links, self.pyfile.package().id) @@ -106,28 +110,27 @@ class C1neonCom(Crypter): hosterlist.update(hosterslist['d']) if self.getConfig("useStreams") and 's' in hosterslist: hosterlist.update(hosterslist['s']) - + result = [] - preferredList = self.getConfig("hosterList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',') + preferredList = self.getConfig("hosterList").strip().lower().replace( + '|',',').replace('.', '').replace(';', ',').split(',') if self.getConfig("randomPreferred") == True: random.shuffle(preferredList) for preferred in preferredList: for Hoster in hosterlist: - if preferred == Hoster.split('<')[0].strip().lower().replace('.',''): + if preferred == Hoster.split('<')[0].strip().lower().replace('.', ''): for Part in hosterlist[Hoster]: self.logDebug("selected " + Part[3]) result.append(str(Part[3])) return result - ignorelist = self.getConfig("ignoreList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',') + ignorelist = self.getConfig("ignoreList").strip().lower().replace( + '|', ',').replace('.', '').replace(';', ',').split( ',') if self.getConfig('hosterListMode') == "all": for Hoster in hosterlist: - if Hoster.split('<')[0].strip().lower().replace('.','') not in ignorelist: + if Hoster.split('<')[0].strip().lower().replace('.', '') not in ignorelist: for Part in hosterlist[Hoster]: self.logDebug("selected " + Part[3]) result.append(str(Part[3])) return result return result - - - diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py index d727ec7ab..ffa8039a1 100644 --- a/module/plugins/crypter/CrockoComFolder.py +++ b/module/plugins/crypter/CrockoComFolder.py @@ -2,6 +2,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter + class CrockoComFolder(SimpleCrypter): __name__ = "CrockoComFolder" __type__ = "crypter" diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py index 4935758c7..08ae1cac5 100644 --- a/module/plugins/crypter/CryptItCom.py +++ b/module/plugins/crypter/CryptItCom.py @@ -16,7 +16,7 @@ class CryptItCom(Crypter): __description__ = """Crypt.It.com Container Plugin""" __author_name__ = ("jeix") __author_mail__ = ("jeix@hasnomail.de") - + def file_exists(self): html = self.load(self.pyfile.url) if r'<div class="folder">Was ist Crypt-It</div>' in html: @@ -31,7 +31,7 @@ class CryptItCom(Crypter): repl_pattern = r"/(s|e|d|c)/" url = re.sub(repl_pattern, r"/d/", self.pyfile.url) - pyfile.name = "tmp_cryptit_%s.ccf" % randint(0,1000) + pyfile.name = "tmp_cryptit_%s.ccf" % randint(0, 1000) location = self.download(url) self.packages.append(["Crypt-it Package", [location], "Crypt-it Package"]) diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index c240c6a70..9ccda3ed2 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -3,6 +3,7 @@ import re from module.plugins.Crypter import Crypter + class CzshareComFolder(Crypter): __name__ = "CzshareComFolder" __type__ = "crypter" diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py index f7cc996d0..822addca1 100644 --- a/module/plugins/crypter/DDLMusicOrg.py +++ b/module/plugins/crypter/DDLMusicOrg.py @@ -6,6 +6,7 @@ from time import sleep from module.plugins.Crypter import Crypter + class DDLMusicOrg(Crypter): __name__ = "DDLMusicOrg" __type__ = "container" @@ -17,24 +18,26 @@ class DDLMusicOrg(Crypter): def setup(self): self.multiDL = False - + def decrypt(self, pyfile): html = self.req.load(self.pyfile.url, cookies=True) - + if re.search(r"Wer dies nicht rechnen kann", html) is not None: self.offline() - + math = re.search(r"(\d+) ([\+-]) (\d+) =\s+<inp", self.html) id = re.search(r"name=\"id\" value=\"(\d+)\"", self.html).group(1) linknr = re.search(r"name=\"linknr\" value=\"(\d+)\"", self.html).group(1) - + solve = "" if math.group(2) == "+": solve = int(math.group(1)) + int(math.group(3)) else: solve = int(math.group(1)) - int(math.group(3)) sleep(3) - htmlwithlink = self.req.load(self.pyfile.url, cookies=True, post={"calc%s" % linknr:solve, "send%s" % linknr:"Send", "id":id, "linknr":linknr}) + htmlwithlink = self.req.load(self.pyfile.url, cookies=True, + post={"calc%s" % linknr: solve, "send%s" % linknr: "Send", "id": id, + "linknr": linknr}) m = re.search(r"<form id=\"ff\" action=\"(.*?)\" method=\"post\">", htmlwithlink) if m: self.packages.append((self.pyfile.package().name, [m.group(1)], self.pyfile.package().folder)) diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py index 9023b238f..15c317acf 100644 --- a/module/plugins/crypter/DepositfilesComFolder.py +++ b/module/plugins/crypter/DepositfilesComFolder.py @@ -2,6 +2,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter + class DepositfilesComFolder(SimpleCrypter): __name__ = "DepositfilesComFolder" __type__ = "crypter" @@ -11,4 +12,4 @@ class DepositfilesComFolder(SimpleCrypter): __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">'
\ No newline at end of file + LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">' diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py index 584835e18..7b7c34fee 100644 --- a/module/plugins/crypter/Dereferer.py +++ b/module/plugins/crypter/Dereferer.py @@ -20,6 +20,7 @@ import urllib from module.plugins.Crypter import Crypter + class Dereferer(Crypter): __name__ = "Dereferer" __type__ = "crypter" @@ -31,4 +32,4 @@ class Dereferer(Crypter): def decrypt(self, pyfile): link = re.match(self.__pattern__, self.pyfile.url).group('url') - self.core.files.addLinks([ urllib.unquote(link).rstrip('+') ], self.pyfile.package().id) + self.core.files.addLinks([urllib.unquote(link).rstrip('+')], self.pyfile.package().id) diff --git a/module/plugins/crypter/DontKnowMe.py b/module/plugins/crypter/DontKnowMe.py index dfa72df47..0791e3c22 100644 --- a/module/plugins/crypter/DontKnowMe.py +++ b/module/plugins/crypter/DontKnowMe.py @@ -5,6 +5,7 @@ import urllib from module.plugins.Crypter import Crypter + class DontKnowMe(Crypter): __name__ = "DontKnowMe" __type__ = "crypter" @@ -18,4 +19,4 @@ class DontKnowMe(Crypter): def decrypt(self, pyfile): link = re.findall(self.LINK_PATTERN, self.pyfile.url)[0] - self.core.files.addLinks([ urllib.unquote(link) ], self.pyfile.package().id) + self.core.files.addLinks([urllib.unquote(link)], self.pyfile.package().id) diff --git a/module/plugins/crypter/DownloadVimeoCom.py b/module/plugins/crypter/DownloadVimeoCom.py index 88310915b..562672599 100644 --- a/module/plugins/crypter/DownloadVimeoCom.py +++ b/module/plugins/crypter/DownloadVimeoCom.py @@ -5,26 +5,27 @@ import re import HTMLParser from module.plugins.Crypter import Crypter + class DownloadVimeoCom(Crypter): - __name__ = 'DownloadVimeoCom' - __type__ = 'crypter' - __pattern__ = r'(?:http://vimeo\.com/\d*|http://smotri\.com/video/view/\?id=.*)' - ## 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') - BASE_URL = 'http://downloadvimeo.com' + __name__ = 'DownloadVimeoCom' + __type__ = 'crypter' + __pattern__ = r'(?:http://vimeo\.com/\d*|http://smotri\.com/video/view/\?id=.*)' + ## 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') + BASE_URL = 'http://downloadvimeo.com' - def decrypt(self, pyfile): - self.package = pyfile.package() - html = self.load('%s/generate?url=%s' % (self.BASE_URL, pyfile.url)) - h = HTMLParser.HTMLParser() - try: - f = re.search(r'cmd quality="(?P<quality>[^"]+?)">\s*?(?P<URL>[^<]*?)</cmd>', html) - except: - self.logDebug('Failed to find the URL') - else: - url = h.unescape(f.group('URL')) - self.logDebug('Quality: %s, URL: %s' % (f.group('quality'), url)) - self.packages.append((self.package.name, [url], self.package.folder)) + def decrypt(self, pyfile): + self.package = pyfile.package() + html = self.load('%s/generate?url=%s' % (self.BASE_URL, pyfile.url)) + h = HTMLParser.HTMLParser() + try: + f = re.search(r'cmd quality="(?P<quality>[^"]+?)">\s*?(?P<URL>[^<]*?)</cmd>', html) + except: + self.logDebug('Failed to find the URL') + else: + url = h.unescape(f.group('URL')) + self.logDebug('Quality: %s, URL: %s' % (f.group('quality'), url)) + self.packages.append((self.package.name, [url], self.package.folder)) diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py index 4886d24db..64302c800 100644 --- a/module/plugins/crypter/DuckCryptInfo.py +++ b/module/plugins/crypter/DuckCryptInfo.py @@ -4,6 +4,7 @@ import re from module.lib.BeautifulSoup import BeautifulSoup from module.plugins.Crypter import Crypter + class DuckCryptInfo(Crypter): __name__ = "DuckCryptInfo" __type__ = "container" @@ -14,7 +15,7 @@ class DuckCryptInfo(Crypter): __author_mail__ = ("soilfiction@gmail.com") TIMER_PATTERN = r'<span id="timer">(.*)</span>' - + def decrypt(self, pyfile): url = pyfile.url # seems we don't need to wait @@ -31,10 +32,9 @@ class DuckCryptInfo(Crypter): else: self.handleFolder(found) - - + def handleFolder(self, found): - src = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(found.group(2))) + src = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(found.group(2))) found = re.search(self.__pattern__, src) self.logDebug("Redirectet to " + str(found.group(0))) src = self.load(str(found.group(0))) @@ -55,4 +55,3 @@ class DuckCryptInfo(Crypter): self.logDebug('no links found - (Plugin out of date?)') else: self.core.files.addLinks([link], self.pyfile.package().id) - diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 1b887e421..83ec6472e 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -15,8 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################ -import re - from module.plugins.internal.SimpleCrypter import SimpleCrypter @@ -24,37 +22,14 @@ class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" __pattern__ = r"https?://(www\.)?easybytez\.com/users/\w+/\w+" - __version__ = "0.01" + __version__ = "0.02" __description__ = """Easybytez Crypter Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") LINK_PATTERN = r'<div class="link"><a href="(http://www\.easybytez\.com/\w+)" target="_blank">.+</a></div>' TITLE_PATTERN = r'<Title>Files of (?P<title>.+) folder</Title>' - PAGES_PATTERN = r"<a href='[^']+'>(\d+)</a><a href='[^']+'>Next »</a><br><small>\(\d+ total\)</small></div>" - - def decrypt(self, pyfile): - self.html = self.load(pyfile.url, decode=True) - - package_name, folder_name = self.getPackageNameAndFolder() - - package_links = re.findall(self.LINK_PATTERN, self.html) - - pages = re.search(self.PAGES_PATTERN, self.html) - if pages: - pages = int(pages.group(1)) - else: - pages = 1 - - p = 2 - while p <= pages: - self.html = self.load(pyfile.url, get={'page': p}, decode=True) - package_links += re.findall(self.LINK_PATTERN, self.html) - p += 1 - - self.logDebug('Package has %d links' % len(package_links)) + PAGES_PATTERN = r"<a href='[^']+'>(?P<pages>\d+)</a><a href='[^']+'>Next »</a><br><small>\(\d+ total\)</small></div>" - if package_links: - self.packages = [(package_name, package_links, folder_name)] - else: - self.fail('Could not extract any links')
\ No newline at end of file + def loadPage(self, page_n): + return self.load(self.pyfile.url, get={'page': page_n}, decode=True) diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index 8fd70882f..122c0f671 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -4,6 +4,7 @@ import re from module.plugins.Crypter import Crypter from module.network.HTTPRequest import BadHeader + class EmbeduploadCom(Crypter): __name__ = "EmbeduploadCom" __type__ = "crypter" @@ -11,7 +12,7 @@ class EmbeduploadCom(Crypter): __version__ = "0.02" __description__ = """EmbedUpload.com crypter""" __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "embedupload"), - ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] + ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") @@ -19,9 +20,9 @@ class EmbeduploadCom(Crypter): def decrypt(self, pyfile): self.html = self.load(self.pyfile.url, decode=True) - tmp_links = [] + tmp_links = [] new_links = [] - + found = re.findall(self.LINK_PATTERN, self.html) if found: prefered_set = set(self.getConfig("preferedHoster").split('|')) @@ -33,22 +34,20 @@ class EmbeduploadCom(Crypter): if not new_links: ignored_set = set(self.getConfig("ignoredHoster").split('|')) ignored_set = map(lambda s: s.lower().split('.')[0], ignored_set) - print "IG", ignored_set - tmp_links.extend([x[1] for x in found if x[0] not in ignored_set]) + print "IG", ignored_set + tmp_links.extend([x[1] for x in found if x[0] not in ignored_set]) self.getLocation(tmp_links, new_links) if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: self.fail('Could not extract any links') - + def getLocation(self, tmp_links, new_links): for link in tmp_links: try: - header = self.load(link, just_header = True) - if "location" in header: + header = self.load(link, just_header=True) + if "location" in header: new_links.append(header['location']) except BadHeader: pass - -
\ No newline at end of file diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py index f45144f14..86ce5b697 100644 --- a/module/plugins/crypter/FilebeerInfoFolder.py +++ b/module/plugins/crypter/FilebeerInfoFolder.py @@ -3,6 +3,7 @@ import re from module.plugins.Crypter import Crypter + class FilebeerInfoFolder(Crypter): __name__ = "FilebeerInfoFolder" __type__ = "crypter" @@ -14,22 +15,22 @@ class FilebeerInfoFolder(Crypter): LINK_PATTERN = r'<td title="[^"]*"><a href="([^"]+)" target="_blank">' PAGE_COUNT_PATTERN = r'<p class="introText">\s*Total Pages (\d+)' - - def decrypt(self, pyfile): - pyfile.url = re.sub(self.__pattern__, r'http://filebeer.info/\1?page=1', pyfile.url) + + def decrypt(self, pyfile): + pyfile.url = re.sub(self.__pattern__, r'http://filebeer.info/\1?page=1', pyfile.url) html = self.load(pyfile.url) - + page_count = int(re.search(self.PAGE_COUNT_PATTERN, html).group(1)) new_links = [] - - for i in range(1, page_count + 1): - self.logInfo("Fetching links from page %i" % i) + + for i in range(1, page_count + 1): + self.logInfo("Fetching links from page %i" % i) new_links.extend(re.findall(self.LINK_PATTERN, html)) - + if i < page_count: - html = self.load("%s?page=%d" % (pyfile.url, i+1)) + html = self.load("%s?page=%d" % (pyfile.url, i + 1)) if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py index 32793b491..64b8ac37e 100644 --- a/module/plugins/crypter/FilefactoryComFolder.py +++ b/module/plugins/crypter/FilefactoryComFolder.py @@ -3,6 +3,7 @@ import re from module.plugins.Crypter import Crypter + class FilefactoryComFolder(Crypter): __name__ = "FilefactoryComFolder" __type__ = "crypter" @@ -22,7 +23,7 @@ class FilefactoryComFolder(Crypter): html = self.load(url_base) new_links = [] - for i in range(1,100): + for i in range(1, 100): self.logInfo("Fetching links from page %i" % i) found = re.search(self.FOLDER_PATTERN, html, re.DOTALL) if found is None: self.fail("Parse error (FOLDER)") @@ -41,4 +42,4 @@ class FilefactoryComFolder(Crypter): if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 9fe806971..42481c15e 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -4,6 +4,7 @@ import re from module.plugins.Crypter import Crypter + class FileserveComFolder(Crypter): __name__ = "FileserveComFolder" __type__ = "crypter" @@ -27,6 +28,6 @@ class FileserveComFolder(Crypter): new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1))) if new_links: - self.core.files.addLinks(map(lambda s:"http://fileserve.com%s" % s, new_links), self.pyfile.package().id) + self.core.files.addLinks(map(lambda s: "http://fileserve.com%s" % s, new_links), self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py index 5c96e723d..700a09b97 100644 --- a/module/plugins/crypter/FourChanOrg.py +++ b/module/plugins/crypter/FourChanOrg.py @@ -5,6 +5,7 @@ import re from module.plugins.Crypter import Crypter + class FourChanOrg(Crypter): # Based on 4chandl by Roland Beermann # https://gist.github.com/enkore/3492599 diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py new file mode 100644 index 000000000..519a468f3 --- /dev/null +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -0,0 +1,47 @@ +# -*- 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/>. # +############################################################################ + +import re + +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class FreakhareComFolder(SimpleCrypter): + __name__ = "FreakhareComFolder" + __type__ = "crypter" + __pattern__ = r"http://(?:www\.)?freakshare\.com/folder/.+" + __version__ = "0.01" + __description__ = """Freakhare.com Folder Plugin""" + __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>.+)' + PAGES_PATTERN = r'Pages: +(?P<pages>\d+)' + + def loadPage(self, page_n): + if not hasattr(self, 'f_id') and not hasattr(self, 'f_md5'): + m = re.search(r'http://freakshare.com/\?x=folder&f_id=(\d+)&f_md5=(\w+)', self.html) + if m: + self.f_id = m.group(1) + self.f_md5 = m.group(2) + return self.load('http://freakshare.com/', get={'x': 'folder', + 'f_id': self.f_id, + 'f_md5': self.f_md5, + 'entrys': '20', + 'page': page_n - 1, + 'order': ''}, decode=True) diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py index 2515e7edd..2d7a3c490 100644 --- a/module/plugins/crypter/FshareVnFolder.py +++ b/module/plugins/crypter/FshareVnFolder.py @@ -2,6 +2,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter + class FshareVnFolder(SimpleCrypter): __name__ = "FshareVnFolder" __type__ = "crypter" @@ -11,4 +12,4 @@ class FshareVnFolder(SimpleCrypter): __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">'
\ No newline at end of file + LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">' diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py index 4c26ba7f7..f8cb18b19 100644 --- a/module/plugins/crypter/HoerbuchIn.py +++ b/module/plugins/crypter/HoerbuchIn.py @@ -6,6 +6,7 @@ import re from module.plugins.Crypter import Crypter from module.lib.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup + class HoerbuchIn(Crypter): __name__ = "HoerbuchIn" __type__ = "container" @@ -14,42 +15,42 @@ class HoerbuchIn(Crypter): __description__ = """Hoerbuch.in Container Plugin""" __author_name__ = ("spoob", "mkaay") __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de") - + article = re.compile("http://(www\.)?hoerbuch\.in/wp/horbucher/\d+/.+/") protection = re.compile("http://(www\.)?hoerbuch\.in/protection/folder_\d+.html") def decrypt(self, pyfile): self.pyfile = pyfile - + if self.article.match(self.pyfile.url): src = self.load(self.pyfile.url) soup = BeautifulSoup(src, convertEntities=BeautifulStoneSoup.HTML_ENTITIES) - + abookname = soup.find("a", attrs={"rel": "bookmark"}).text for a in soup.findAll("a", attrs={"href": self.protection}): package = "%s (%s)" % (abookname, a.previousSibling.previousSibling.text[:-1]) links = self.decryptFolder(a["href"]) - + self.packages.append((package, links, self.pyfile.package().folder)) else: links = self.decryptFolder(self.pyfile.url) - + self.packages.append((self.pyfile.package().name, links, self.pyfile.package().folder)) - + def decryptFolder(self, url): m = self.protection.search(url) if not m: self.fail("Bad URL") url = m.group(0) - + self.pyfile.url = url src = self.req.load(url, post={"viewed": "adpg"}) - + links = [] pattern = re.compile("http://www\.hoerbuch\.in/protection/(\w+)/(.*?)\"") for hoster, lid in pattern.findall(src): self.req.lastURL = url self.load("http://www.hoerbuch.in/protection/%s/%s" % (hoster, lid)) links.append(self.req.lastEffectiveURL) - + return links diff --git a/module/plugins/crypter/HotfileFolderCom.py b/module/plugins/crypter/HotfileFolderCom.py index 00771e2a3..79691ad01 100644 --- a/module/plugins/crypter/HotfileFolderCom.py +++ b/module/plugins/crypter/HotfileFolderCom.py @@ -5,6 +5,7 @@ import re from module.plugins.Crypter import Crypter + class HotfileFolderCom(Crypter): __name__ = "HotfileFolderCom" __type__ = "crypter" @@ -17,9 +18,11 @@ class HotfileFolderCom(Crypter): def decrypt(self, pyfile): html = self.load(pyfile.url) - name = re.findall(r'<img src="/i/folder.gif" width="23" height="14" style="margin-bottom: -2px;" />([^<]+)', html, re.MULTILINE)[0].replace("/", "") + name = re.findall( + r'<img src="/i/folder.gif" width="23" height="14" style="margin-bottom: -2px;" />([^<]+)', html, + re.MULTILINE)[0].replace("/", "") new_links = re.findall(r'href="(http://(www.)?hotfile\.com/dl/\d+/[0-9a-zA-Z]+[^"]+)', html) new_links = [x[0] for x in new_links] - self.packages.append((name, new_links, name))
\ No newline at end of file + self.packages.append((name, new_links, name)) diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py index 9815ae266..61869fdc0 100644 --- a/module/plugins/crypter/ILoadTo.py +++ b/module/plugins/crypter/ILoadTo.py @@ -1,62 +1,64 @@ -
-import re
-import urllib
-
-from module.plugins.Crypter import Crypter
-from module.lib.BeautifulSoup import BeautifulSoup
-
-class ILoadTo(Crypter):
- __name__ = "ILoadTo"
- __type__ = "crypter"
- __pattern__ = r"http://iload\.to/go/\d+-[\w\.-]+/"
- __config__ = []
- __version__ = "0.1"
- __description__ = """iload.to Crypter Plugin"""
- __author_name__ = ("hzpz")
- __author_mail__ = ("none")
-
-
- def decrypt(self, pyfile):
- url = pyfile.url
- src = self.req.load(str(url))
- soup = BeautifulSoup(src)
-
- # find captcha URL and decrypt
- captchaTag = soup.find("img", attrs={"id": "Captcha"})
- if not captchaTag:
- self.fail("Cannot find Captcha")
-
- captchaUrl = "http://iload.to" + captchaTag["src"]
- self.logDebug("Captcha URL: %s" % captchaUrl)
- result = self.decryptCaptcha(str(captchaUrl))
-
- # find captcha form URL
- formTag = soup.find("form", attrs={"id": "CaptchaForm"})
- formUrl = "http://iload.to" + formTag["action"]
- self.logDebug("Form URL: %s" % formUrl)
-
- # submit decrypted captcha
- self.req.lastURL = url
- src = self.req.load(str(formUrl), post={'captcha': result})
-
- # find decrypted links
- links = re.findall(r"<a href=\"(.+)\" style=\"text-align:center;font-weight:bold;\" class=\"button\" target=\"_blank\" onclick=\"this.className\+=' success';\">", src)
-
- if not len(links) > 0:
- self.retry()
-
- self.correctCaptcha()
-
- cleanedLinks = []
- for link in links:
- if link.startswith("http://dontknow.me/at/?"):
- cleanedLink = urllib.unquote(link[23:])
- else:
- cleanedLink = link
- self.logDebug("Link: %s" % cleanedLink)
- cleanedLinks.append(cleanedLink)
-
- self.logDebug("Decrypted %d links" % len(links))
-
- self.pyfile.package().password = "iload.to"
- self.packages.append((self.pyfile.package().name, cleanedLinks, self.pyfile.package().folder))
\ No newline at end of file +import re +import urllib + +from module.plugins.Crypter import Crypter +from module.lib.BeautifulSoup import BeautifulSoup + + +class ILoadTo(Crypter): + __name__ = "ILoadTo" + __type__ = "crypter" + __pattern__ = r"http://iload\.to/go/\d+-[\w\.-]+/" + __config__ = [] + __version__ = "0.1" + __description__ = """iload.to Crypter Plugin""" + __author_name__ = ("hzpz") + __author_mail__ = ("none") + + + def decrypt(self, pyfile): + url = pyfile.url + src = self.req.load(str(url)) + soup = BeautifulSoup(src) + + # find captcha URL and decrypt + captchaTag = soup.find("img", attrs={"id": "Captcha"}) + if not captchaTag: + self.fail("Cannot find Captcha") + + captchaUrl = "http://iload.to" + captchaTag["src"] + self.logDebug("Captcha URL: %s" % captchaUrl) + result = self.decryptCaptcha(str(captchaUrl)) + + # find captcha form URL + formTag = soup.find("form", attrs={"id": "CaptchaForm"}) + formUrl = "http://iload.to" + formTag["action"] + self.logDebug("Form URL: %s" % formUrl) + + # submit decrypted captcha + self.req.lastURL = url + src = self.req.load(str(formUrl), post={'captcha': result}) + + # find decrypted links + links = re.findall( + r"<a href=\"(.+)\" style=\"text-align:center;font-weight:bold;\" class=\"button\" target=\"_blank\" onclick=\"this.className\+=' success';\">", + src) + + if not len(links) > 0: + self.retry() + + self.correctCaptcha() + + cleanedLinks = [] + for link in links: + if link.startswith("http://dontknow.me/at/?"): + cleanedLink = urllib.unquote(link[23:]) + else: + cleanedLink = link + self.logDebug("Link: %s" % cleanedLink) + cleanedLinks.append(cleanedLink) + + self.logDebug("Decrypted %d links" % len(links)) + + self.pyfile.package().password = "iload.to" + self.packages.append((self.pyfile.package().name, cleanedLinks, self.pyfile.package().folder)) diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index 30cc61055..129da6608 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -1,227 +1,228 @@ -# -*- coding: utf-8 -*-
-
-#
-# v2.01 - hagg
-# * cnl2 and web links are skipped if JS is not available (instead of failing the package)
-# * only best available link source is used (priority: cnl2>rsdf>ccf>dlc>web
-#
-
-from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
-from module.unescape import unescape
-import base64
-import binascii
-import re
-
-class LinkSaveIn(Crypter):
- __name__ = "LinkSaveIn"
- __type__ = "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")
-
- # Constants
- _JK_KEY_ = "jk"
- _CRYPTED_KEY_ = "crypted"
- HOSTER_DOMAIN = "linksave.in"
-
- def setup(self):
- self.html = None
- self.fileid = None
- self.captcha = False
- self.package = None
- self.preferred_sources = ['cnl2', 'rsdf', 'ccf', 'dlc', 'web']
-
- def decrypt(self, pyfile):
-
- # Init
- self.package = pyfile.package()
- self.fileid = re.match(self.__pattern__, pyfile.url).group('id')
- self.req.cj.setCookie(self.HOSTER_DOMAIN, "Linksave_Language", "english")
-
- # Request package
- self.html = self.load(self.pyfile.url)
- if not self.isOnline():
- self.offline()
-
- # Check for protection
- if self.isPasswordProtected():
- self.unlockPasswordProtection()
- self.handleErrors()
-
- if self.isCaptchaProtected():
- self.captcha = True
- self.unlockCaptchaProtection()
- self.handleErrors()
-
- # Get package name and folder
- (package_name, folder_name) = self.getPackageInfo()
-
- # Extract package links
- package_links = []
- for type_ in self.preferred_sources:
- package_links.extend(self.handleLinkSource(type_))
- if package_links: # use only first source which provides links
- break
- package_links = set(package_links)
-
- # Pack
- if package_links:
- self.packages = [(package_name, package_links, folder_name)]
- else:
- self.fail('Could not extract any links')
-
- def isOnline(self):
- if "<big>Error 404 - Folder not found!</big>" in self.html:
- self.logDebug("File not found")
- return False
- return True
-
- def isPasswordProtected(self):
- if re.search(r'''<input.*?type="password"''', self.html):
- self.logDebug("Links are password protected")
- return True
-
- def isCaptchaProtected(self):
- if "<b>Captcha:</b>" in self.html:
- self.logDebug("Links are captcha protected")
- return True
- return False
-
- def unlockPasswordProtection(self):
- password = self.getPassword()
- self.logDebug("Submitting password [%s] for protected links" % password)
- post = {"id": self.fileid, "besucherpasswort": password, 'login': 'submit'}
- self.html = self.load(self.pyfile.url, post=post)
-
- def unlockCaptchaProtection(self):
- captcha_hash = re.search(r'name="hash" value="([^"]+)', self.html).group(1)
- captcha_url = re.search(r'src=".(/captcha/cap.php\?hsh=[^"]+)', self.html).group(1)
- captcha_code = self.decryptCaptcha("http://linksave.in" + captcha_url, forceUser=True)
- self.html = self.load(self.pyfile.url, post={"id": self.fileid, "hash": captcha_hash, "code": captcha_code})
-
- def getPackageInfo(self):
- name = self.pyfile.package().name
- folder = self.pyfile.package().folder
- self.logDebug("Defaulting to pyfile name [%s] and folder [%s] for package" % (name, folder))
- return name, folder
-
- def handleErrors(self):
- if "The visitorpassword you have entered is wrong" in self.html:
- self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry")
- self.fail("Incorrect password, please set right password on 'Edit package' form and retry")
-
- if self.captcha:
- if "Wrong code. Please retry" in self.html:
- self.logDebug("Invalid captcha, retrying")
- self.invalidCaptcha()
- self.retry()
- else:
- self.correctCaptcha()
-
- def handleLinkSource(self, type_):
- if type_ == 'cnl2':
- return self.handleCNL2()
- elif type_ in ('rsdf', 'ccf', 'dlc'):
- return self.handleContainer(type_)
- elif type_ == 'web':
- return self.handleWebLinks()
- else:
- self.fail('unknown source type "%s" (this is probably a bug)' % type_)
-
- def handleWebLinks(self):
- package_links = []
- self.logDebug("Search for Web links")
- if not self.js:
- self.logDebug("no JS -> skip Web links")
- else:
- #@TODO: Gather paginated web links
- pattern = r'<a href="http://linksave\.in/(\w{43})"'
- ids = re.findall(pattern, self.html)
- self.logDebug("Decrypting %d Web links" % len(ids))
- for i, weblink_id in enumerate(ids):
- try:
- webLink = "http://linksave.in/%s" % weblink_id
- self.logDebug("Decrypting Web link %d, %s" % (i+1, webLink))
- fwLink = "http://linksave.in/fw-%s" % weblink_id
- response = self.load(fwLink)
- jscode = re.findall(r'<script type="text/javascript">(.*)</script>', response)[-1]
- jseval = self.js.eval("document = { write: function(e) { return e; } }; %s" % jscode)
- dlLink = re.search(r'http://linksave\.in/dl-\w+', jseval).group(0)
- self.logDebug("JsEngine returns value [%s] for redirection link" % dlLink)
- response = self.load(dlLink)
- link = unescape(re.search(r'<iframe src="(.+?)"', response).group(1))
- package_links.append(link)
- except Exception, detail:
- self.logDebug("Error decrypting Web link %s, %s" % (webLink, detail))
- return package_links
-
- def handleContainer(self, type_):
- package_links = []
- type_ = type_.lower()
- self.logDebug('Seach for %s Container links' % type_.upper())
- if not type_.isalnum(): # check to prevent broken re-pattern (cnl2,rsdf,ccf,dlc,web are all alpha-numeric)
- self.fail('unknown container type "%s" (this is probably a bug)' % type_)
- pattern = r"\('%s_link'\).href=unescape\('(.*?\.%s)'\)" % (type_, type_)
- containersLinks = re.findall(pattern, self.html)
- self.logDebug("Found %d %s Container links" % (len(containersLinks), type_.upper()))
- for containerLink in containersLinks:
- link = "http://linksave.in/%s" % unescape(containerLink)
- package_links.append(link)
- return package_links
-
- def handleCNL2(self):
- package_links = []
- self.logDebug("Search for CNL2 links")
- if not self.js:
- self.logDebug("no JS -> skip CNL2 links")
- elif 'cnl2_load' in self.html:
- try:
- (vcrypted, vjk) = self._getCipherParams()
- for (crypted, jk) in zip(vcrypted, vjk):
- package_links.extend(self._getLinks(crypted, jk))
- except:
- self.fail("Unable to decrypt CNL2 links")
- return package_links
-
- def _getCipherParams(self):
-
- # Get jk
- jk_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._JK_KEY_
- vjk = re.findall(jk_re, self.html)
-
- # Get crypted
- crypted_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._CRYPTED_KEY_
- vcrypted = re.findall(crypted_re, self.html)
-
- # Log and return
- self.logDebug("Detected %d crypted blocks" % len(vcrypted))
- return vcrypted, vjk
-
- def _getLinks(self, crypted, jk):
-
- # Get key
- jreturn = self.js.eval("%s f()" % jk)
- self.logDebug("JsEngine returns value [%s]" % jreturn)
- key = binascii.unhexlify(jreturn)
-
- # Decode crypted
- crypted = base64.standard_b64decode(crypted)
-
- # Decrypt
- Key = key
- IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
- text = obj.decrypt(crypted)
-
- # Extract links
- text = text.replace("\x00", "").replace("\r", "")
- links = text.split("\n")
- links = filter(lambda x: x != "", links)
-
- # Log and return
- self.logDebug("Package has %d links" % len(links))
- return links
-
+# -*- coding: utf-8 -*- + +# +# v2.01 - hagg +# * cnl2 and web links are skipped if JS is not available (instead of failing the package) +# * only best available link source is used (priority: cnl2>rsdf>ccf>dlc>web +# + +import base64 +import binascii +import re + +from Crypto.Cipher import AES +from module.plugins.Crypter import Crypter +from module.unescape import unescape + + +class LinkSaveIn(Crypter): + __name__ = "LinkSaveIn" + __type__ = "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") + + # Constants + _JK_KEY_ = "jk" + _CRYPTED_KEY_ = "crypted" + HOSTER_DOMAIN = "linksave.in" + + def setup(self): + self.html = None + self.fileid = None + self.captcha = False + self.package = None + self.preferred_sources = ['cnl2', 'rsdf', 'ccf', 'dlc', 'web'] + + def decrypt(self, pyfile): + + # Init + self.package = pyfile.package() + self.fileid = re.match(self.__pattern__, pyfile.url).group('id') + self.req.cj.setCookie(self.HOSTER_DOMAIN, "Linksave_Language", "english") + + # Request package + self.html = self.load(self.pyfile.url) + if not self.isOnline(): + self.offline() + + # Check for protection + if self.isPasswordProtected(): + self.unlockPasswordProtection() + self.handleErrors() + + if self.isCaptchaProtected(): + self.captcha = True + self.unlockCaptchaProtection() + self.handleErrors() + + # Get package name and folder + (package_name, folder_name) = self.getPackageInfo() + + # Extract package links + package_links = [] + for type_ in self.preferred_sources: + package_links.extend(self.handleLinkSource(type_)) + if package_links: # use only first source which provides links + break + package_links = set(package_links) + + # Pack + if package_links: + self.packages = [(package_name, package_links, folder_name)] + else: + self.fail('Could not extract any links') + + def isOnline(self): + if "<big>Error 404 - Folder not found!</big>" in self.html: + self.logDebug("File not found") + return False + return True + + def isPasswordProtected(self): + if re.search(r'''<input.*?type="password"''', self.html): + self.logDebug("Links are password protected") + return True + + def isCaptchaProtected(self): + if "<b>Captcha:</b>" in self.html: + self.logDebug("Links are captcha protected") + return True + return False + + def unlockPasswordProtection(self): + password = self.getPassword() + self.logDebug("Submitting password [%s] for protected links" % password) + post = {"id": self.fileid, "besucherpasswort": password, 'login': 'submit'} + self.html = self.load(self.pyfile.url, post=post) + + def unlockCaptchaProtection(self): + captcha_hash = re.search(r'name="hash" value="([^"]+)', self.html).group(1) + captcha_url = re.search(r'src=".(/captcha/cap.php\?hsh=[^"]+)', self.html).group(1) + captcha_code = self.decryptCaptcha("http://linksave.in" + captcha_url, forceUser=True) + self.html = self.load(self.pyfile.url, post={"id": self.fileid, "hash": captcha_hash, "code": captcha_code}) + + def getPackageInfo(self): + name = self.pyfile.package().name + folder = self.pyfile.package().folder + self.logDebug("Defaulting to pyfile name [%s] and folder [%s] for package" % (name, folder)) + return name, folder + + def handleErrors(self): + if "The visitorpassword you have entered is wrong" in self.html: + self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry") + self.fail("Incorrect password, please set right password on 'Edit package' form and retry") + + if self.captcha: + if "Wrong code. Please retry" in self.html: + self.logDebug("Invalid captcha, retrying") + self.invalidCaptcha() + self.retry() + else: + self.correctCaptcha() + + def handleLinkSource(self, type_): + if type_ == 'cnl2': + return self.handleCNL2() + elif type_ in ('rsdf', 'ccf', 'dlc'): + return self.handleContainer(type_) + elif type_ == 'web': + return self.handleWebLinks() + else: + self.fail('unknown source type "%s" (this is probably a bug)' % type_) + + def handleWebLinks(self): + package_links = [] + self.logDebug("Search for Web links") + if not self.js: + self.logDebug("no JS -> skip Web links") + else: + #@TODO: Gather paginated web links + pattern = r'<a href="http://linksave\.in/(\w{43})"' + ids = re.findall(pattern, self.html) + self.logDebug("Decrypting %d Web links" % len(ids)) + for i, weblink_id in enumerate(ids): + try: + webLink = "http://linksave.in/%s" % weblink_id + self.logDebug("Decrypting Web link %d, %s" % (i + 1, webLink)) + fwLink = "http://linksave.in/fw-%s" % weblink_id + response = self.load(fwLink) + jscode = re.findall(r'<script type="text/javascript">(.*)</script>', response)[-1] + jseval = self.js.eval("document = { write: function(e) { return e; } }; %s" % jscode) + dlLink = re.search(r'http://linksave\.in/dl-\w+', jseval).group(0) + self.logDebug("JsEngine returns value [%s] for redirection link" % dlLink) + response = self.load(dlLink) + link = unescape(re.search(r'<iframe src="(.+?)"', response).group(1)) + package_links.append(link) + except Exception, detail: + self.logDebug("Error decrypting Web link %s, %s" % (webLink, detail)) + return package_links + + def handleContainer(self, type_): + package_links = [] + type_ = type_.lower() + self.logDebug('Seach for %s Container links' % type_.upper()) + if not type_.isalnum(): # check to prevent broken re-pattern (cnl2,rsdf,ccf,dlc,web are all alpha-numeric) + self.fail('unknown container type "%s" (this is probably a bug)' % type_) + pattern = r"\('%s_link'\).href=unescape\('(.*?\.%s)'\)" % (type_, type_) + containersLinks = re.findall(pattern, self.html) + self.logDebug("Found %d %s Container links" % (len(containersLinks), type_.upper())) + for containerLink in containersLinks: + link = "http://linksave.in/%s" % unescape(containerLink) + package_links.append(link) + return package_links + + def handleCNL2(self): + package_links = [] + self.logDebug("Search for CNL2 links") + if not self.js: + self.logDebug("no JS -> skip CNL2 links") + elif 'cnl2_load' in self.html: + try: + (vcrypted, vjk) = self._getCipherParams() + for (crypted, jk) in zip(vcrypted, vjk): + package_links.extend(self._getLinks(crypted, jk)) + except: + self.fail("Unable to decrypt CNL2 links") + return package_links + + def _getCipherParams(self): + + # Get jk + jk_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._JK_KEY_ + vjk = re.findall(jk_re, self.html) + + # Get crypted + crypted_re = r'<INPUT.*?NAME="%s".*?VALUE="(.*?)"' % LinkSaveIn._CRYPTED_KEY_ + vcrypted = re.findall(crypted_re, self.html) + + # Log and return + self.logDebug("Detected %d crypted blocks" % len(vcrypted)) + return vcrypted, vjk + + def _getLinks(self, crypted, jk): + + # Get key + jreturn = self.js.eval("%s f()" % jk) + self.logDebug("JsEngine returns value [%s]" % jreturn) + key = binascii.unhexlify(jreturn) + + # Decode crypted + crypted = base64.standard_b64decode(crypted) + + # Decrypt + Key = key + IV = key + obj = AES.new(Key, AES.MODE_CBC, IV) + text = obj.decrypt(crypted) + + # Extract links + text = text.replace("\x00", "").replace("\r", "") + links = text.split("\n") + links = filter(lambda x: x != "", links) + + # Log and return + self.logDebug("Package has %d links" % len(links)) + return links diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 69d2f8192..6a11c98b0 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -19,6 +19,7 @@ import re from module.plugins.Crypter import Crypter + class LinkdecrypterCom(Crypter): __name__ = "LinkdecrypterCom" __type__ = "crypter" @@ -44,14 +45,16 @@ class LinkdecrypterCom(Crypter): def decryptAPI(self): - get_dict = { "t": "link", "url": self.pyfile.url, "lcache": "1" } - self.html = self.load('http://linkdecrypter.com/api', get = get_dict) - if self.html.startswith('http://'): return self.html.splitlines() + get_dict = {"t": "link", "url": self.pyfile.url, "lcache": "1"} + self.html = self.load('http://linkdecrypter.com/api', get=get_dict) + if self.html.startswith('http://'): + return self.html.splitlines() if self.html == 'INTERRUPTION(PASSWORD)': for get_dict['pass'] in self.passwords: - self.html = self.load('http://linkdecrypter.com/api', get= get_dict) - if self.html.startswith('http://'): return self.html.splitlines() + self.html = self.load('http://linkdecrypter.com/api', get=get_dict) + if self.html.startswith('http://'): + return self.html.splitlines() self.logError('API', self.html) if self.html == 'INTERRUPTION(PASSWORD)': @@ -63,12 +66,13 @@ class LinkdecrypterCom(Crypter): retries = 5 - post_dict = { "link_cache": "on", "pro_links": self.pyfile.url, "modo_links": "text" } + post_dict = {"link_cache": "on", "pro_links": self.pyfile.url, "modo_links": "text"} self.html = self.load('http://linkdecrypter.com/', post=post_dict, cookies=True, decode=True) while self.passwords or retries: found = re.search(self.TEXTAREA_PATTERN, self.html, flags=re.DOTALL) - if found: return [ x for x in found.group(1).splitlines() if '[LINK-ERROR]' not in x ] + if found: + return [x for x in found.group(1).splitlines() if '[LINK-ERROR]' not in x] found = re.search(self.CAPTCHA_PATTERN, self.html) if found: @@ -79,10 +83,10 @@ class LinkdecrypterCom(Crypter): msg = found.group(1) if found else "" self.logInfo("Captcha protected link", result_type, msg) - captcha = self.decryptCaptcha(captcha_url, result_type = result_type) + captcha = self.decryptCaptcha(captcha_url, result_type=result_type) if result_type == "positional": captcha = "%d|%d" % captcha - self.html = self.load('http://linkdecrypter.com/', post={ "captcha": captcha }, decode=True) + self.html = self.load('http://linkdecrypter.com/', post={"captcha": captcha}, decode=True) retries -= 1 elif self.PASSWORD_PATTERN in self.html: diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index e2ee30731..52abe1b3c 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -5,6 +5,7 @@ import re from module.plugins.Crypter import Crypter + class LixIn(Crypter): __name__ = "LixIn" __type__ = "container" @@ -13,25 +14,24 @@ class LixIn(Crypter): __description__ = """Lix.in Container Plugin""" __author_name__ = ("spoob") __author_mail__ = ("spoob@pyload.org") - - CAPTCHA_PATTERN='<img src="(?P<image>captcha_img.php\?.*?)"' - SUBMIT_PATTERN=r"value='continue.*?'" - LINK_PATTERN=r'name="ifram" src="(?P<link>.*?)"' - + + CAPTCHA_PATTERN = '<img src="(?P<image>captcha_img.php\?.*?)"' + SUBMIT_PATTERN = r"value='continue.*?'" + LINK_PATTERN = r'name="ifram" src="(?P<link>.*?)"' def decrypt(self, pyfile): url = pyfile.url - - matches = re.search(self.__pattern__,url) + + matches = re.search(self.__pattern__, url) if not matches: self.fail("couldn't identify file id") - + id = matches.group("id") self.logDebug("File id is %s" % id) - + self.html = self.req.load(url, decode=True) - - matches = re.search(self.SUBMIT_PATTERN,self.html) + + matches = re.search(self.SUBMIT_PATTERN, self.html) if not matches: self.fail("link doesn't seem valid") @@ -41,15 +41,14 @@ class LixIn(Crypter): matches = re.search(self.CAPTCHA_PATTERN, self.html) if matches: self.logDebug("trying captcha") - captcharesult = self.decryptCaptcha("http://lix.in/"+matches.group("image")) - self.html = self.req.load(url, decode=True, post={"capt" : captcharesult, "submit":"submit","tiny":id}) + captcharesult = self.decryptCaptcha("http://lix.in/" + matches.group("image")) + self.html = self.req.load(url, decode=True, + post={"capt": captcharesult, "submit": "submit", "tiny": id}) else: self.logDebug("no captcha/captcha solved") - break else: - self.html = self.req.load(url, decode=True, post={"submit" : "submit", - "tiny" : id}) - + self.html = self.req.load(url, decode=True, post={"submit": "submit", "tiny": id}) + matches = re.search(self.LINK_PATTERN, self.html) if not matches: self.fail("can't find destination url") diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py index 9c98c48a0..ec9cdaac6 100644 --- a/module/plugins/crypter/LofCc.py +++ b/module/plugins/crypter/LofCc.py @@ -2,12 +2,12 @@ # -*- coding: utf-8 -*- import re -from time import sleep from os.path import join from module.plugins.Crypter import Crypter from module.plugins.ReCaptcha import ReCaptcha + class LofCc(Crypter): __name__ = "LofCc" __type__ = "container" @@ -19,31 +19,33 @@ class LofCc(Crypter): def setup(self): self.multiDL = False - + def decrypt(self, pyfile): html = self.req.load(self.pyfile.url, cookies=True) - + m = re.search(r"src=\"http://www.google.com/recaptcha/api/challenge\?k=(.*?)\"></script>", html) if not m: self.offline() - + recaptcha = ReCaptcha(self) challenge, code = recaptcha.challenge(m.group(1)) - - resultHTML = self.req.load(self.pyfile.url, post={"recaptcha_challenge_field":challenge, "recaptcha_response_field":code}, cookies=True) - + + resultHTML = self.req.load(self.pyfile.url, + post={"recaptcha_challenge_field": challenge, "recaptcha_response_field": code}, + cookies=True) + if re.search("class=\"error\"", resultHTML): self.retry() - + self.correctCaptcha() - - dlc = self.req.load(self.pyfile.url+"/dlc", cookies=True) - - name = re.search(self.__pattern__, self.pyfile.url).group(1)+".dlc" - + + dlc = self.req.load(self.pyfile.url + "/dlc", cookies=True) + + name = re.search(self.__pattern__, self.pyfile.url).group(1) + ".dlc" + dlcFile = join(self.config["general"]["download_folder"], name) f = open(dlcFile, "wb") f.write(dlc) f.close() - + self.packages.append((self.pyfile.package().name, [dlcFile], self.pyfile.package().folder)) diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index ddd61379c..3709d3349 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -5,6 +5,7 @@ from module.plugins.Crypter import Crypter from module.plugins.hoster.MediafireCom import checkHTMLHeader from module.common.json_layer import json_loads + class MediafireComFolder(Crypter): __name__ = "MediafireComFolder" __type__ = "crypter" @@ -19,10 +20,10 @@ class MediafireComFolder(Crypter): def decrypt(self, pyfile): new_links = [] - + url, result = checkHTMLHeader(pyfile.url) self.logDebug('Location (%d): %s' % (result, url)) - + if result == 0: # load and parse html html = self.load(pyfile.url) @@ -33,23 +34,24 @@ class MediafireComFolder(Crypter): else: # folder page found = re.search(self.FOLDER_KEY_PATTERN, html) - if found: + if found: folder_key = found.group(1) self.logDebug("FOLDER KEY: %s" % folder_key) - - json_resp = json_loads(self.load("http://www.mediafire.com/api/folder/get_info.php?folder_key=%s&response_format=json&version=1" % folder_key)) + + json_resp = json_loads(self.load( + "http://www.mediafire.com/api/folder/get_info.php?folder_key=%s&response_format=json&version=1" % folder_key)) #self.logInfo(json_resp) if json_resp['response']['result'] == "Success": for link in json_resp['response']['folder_info']['files']: - new_links.append("http://www.mediafire.com/file/%s" % link['quickkey']) + new_links.append("http://www.mediafire.com/file/%s" % link['quickkey']) else: self.fail(json_resp['response']['message']) elif result == 1: - self.offline() + self.offline() else: new_links.append(url) - + if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py index 097cb702e..92ec7211a 100644 --- a/module/plugins/crypter/Movie2kTo.py +++ b/module/plugins/crypter/Movie2kTo.py @@ -2,150 +2,159 @@ # -*- coding: utf-8 -*- import re -from module.plugins.Crypter import Crypter from collections import defaultdict +from module.plugins.Crypter import Crypter + + class Movie2kTo(Crypter): - __name__ = 'Movie2kTo' - __type__ = 'container' - __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html' - __version__ = '0.5' - __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '), - ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'), - ('whole_season', 'bool', 'Download whole season', 'False'), - ('everything', 'bool', 'Download everything', 'False'), - ('firstN', 'int', 'Download the first N files for each episode (the first file is probably all you will need)', '1')] - __description__ = """Movie2k.to Container Plugin""" - __author_name__ = ('4Christopher') - __author_mail__ = ('4Christopher@gmx.de') - BASE_URL_PATTERN = r'http://(?:www\.)?movie2k\.to/' - TVSHOW_URL_PATH_PATTERN = r'tvshows-(?P<id>\d+?)-(?P<name>.+)' - FILM_URL_PATH_PATTERN = r'(?P<name>.+?)-(?:online-film|watch-movie)-(?P<id>\d+)' - SEASON_PATTERN = r'<div id="episodediv(\d+?)" style="display:(inline|none)">(.*?)</div>' - EP_PATTERN = r'<option value="(.+?)"( selected)?>Episode\s*?(\d+?)</option>' - BASE_URL = 'http://www.movie2k.to' + __name__ = 'Movie2kTo' + __type__ = 'container' + __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html' + __version__ = '0.5' + __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '), + ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'), + ('whole_season', 'bool', 'Download whole season', 'False'), + ('everything', 'bool', 'Download everything', 'False'), + ('firstN', 'int', + 'Download the first N files for each episode (the first file is probably all you will need)', '1')] + __description__ = """Movie2k.to Container Plugin""" + __author_name__ = ('4Christopher') + __author_mail__ = ('4Christopher@gmx.de') + BASE_URL_PATTERN = r'http://(?:www\.)?movie2k\.to/' + TVSHOW_URL_PATH_PATTERN = r'tvshows-(?P<id>\d+?)-(?P<name>.+)' + FILM_URL_PATH_PATTERN = r'(?P<name>.+?)-(?:online-film|watch-movie)-(?P<id>\d+)' + SEASON_PATTERN = r'<div id="episodediv(\d+?)" style="display:(inline|none)">(.*?)</div>' + EP_PATTERN = r'<option value="(.+?)"( selected)?>Episode\s*?(\d+?)</option>' + BASE_URL = 'http://www.movie2k.to' - def decrypt(self, pyfile): - self.package = pyfile.package() - self.folder = self.package.folder - self.qStatReset() - whole_season = self.getConfig('whole_season') - everything = self.getConfig('everything') - self.getInfo(pyfile.url) + def decrypt(self, pyfile): + self.package = pyfile.package() + self.folder = self.package.folder + self.qStatReset() + whole_season = self.getConfig('whole_season') + everything = self.getConfig('everything') + self.getInfo(pyfile.url) - if (whole_season or everything) and self.format == 'tvshow': - self.logDebug('Downloading the whole season') - for season, season_sel, html in re.findall(self.SEASON_PATTERN, self.html, re.DOTALL | re.I): - if (season_sel == 'inline') or everything: - season_links = [] - for url_path, ep_sel, ep in re.findall(self.EP_PATTERN, html, re.I): - season_name = self.name_tvshow(season, ep) - self.logDebug('%s: %s' % (season_name, url_path)) - if ep_sel and (season_sel == 'inline'): - self.logDebug('%s selected (in the start URL: %s)' % (season_name, pyfile.url)) - season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path)) - elif (whole_season and (season_sel == 'inline')) or everything: - season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path)) + if (whole_season or everything) and self.format == 'tvshow': + self.logDebug('Downloading the whole season') + for season, season_sel, html in re.findall(self.SEASON_PATTERN, self.html, re.DOTALL | re.I): + if (season_sel == 'inline') or everything: + season_links = [] + for url_path, ep_sel, ep in re.findall(self.EP_PATTERN, html, re.I): + season_name = self.name_tvshow(season, ep) + self.logDebug('%s: %s' % (season_name, url_path)) + if ep_sel and (season_sel == 'inline'): + self.logDebug('%s selected (in the start URL: %s)' % (season_name, pyfile.url)) + season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path)) + elif (whole_season and (season_sel == 'inline')) or everything: + season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path)) - self.logDebug(season_links) - folder = '%s: Season %s' % (self.name, season) - name = '%s%s' % (folder, self.qStat()) - self.packages.append((name, season_links, folder)) - self.qStatReset() - else: - links = self.getLinks() - name = '%s%s' % (self.package.name, self.qStat()) - self.packages.append((name, links , self.package.folder)) + self.logDebug(season_links) + folder = '%s: Season %s' % (self.name, season) + name = '%s%s' % (folder, self.qStat()) + self.packages.append((name, season_links, folder)) + self.qStatReset() + else: + links = self.getLinks() + name = '%s%s' % (self.package.name, self.qStat()) + self.packages.append((name, links, self.package.folder)) - def qStat(self): - if len(self.q) == 0: return '' - if not self.getConfig('dir_quality'): return '' - if len(self.q) == 1: return (' (Quality: %d, max (all hosters): %d)' % (self.q[0], self.max_q)) - return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)' - % (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q)) + def qStat(self): + if len(self.q) == 0: + return '' + if not self.getConfig('dir_quality'): + return '' + if len(self.q) == 1: + return ' (Quality: %d, max (all hosters): %d)' % (self.q[0], self.max_q) + return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)' + % (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q)) - def qStatReset(self): - self.q = [] ## to calculate the average, min and max of the quality - self.max_q = None ## maximum quality of all hosters + def qStatReset(self): + self.q = [] # to calculate the average, min and max of the quality + self.max_q = None # maximum quality of all hosters - def tvshow_number(self, number): - if int(number) < 10: - return '0%s' % number - else: - return number + def tvshow_number(self, number): + if int(number) < 10: + return '0%s' % number + else: + return number - def name_tvshow(self, season, ep): - return '%s S%sE%s' % (self.name, self.tvshow_number(season), self.tvshow_number(ep)) + def name_tvshow(self, season, ep): + return '%s S%sE%s' % (self.name, self.tvshow_number(season), self.tvshow_number(ep)) - def getInfo(self, url): - self.html = self.load(url) - self.url_path = re.match(self.__pattern__, url).group(1) - self.format = pattern_re = None - if re.match(r'tvshows', self.url_path): - self.format = 'tvshow' - pattern_re = re.search(self.TVSHOW_URL_PATH_PATTERN, self.url_path) - elif re.search(self.FILM_URL_PATH_PATTERN, self.url_path): - self.format = 'film' - pattern_re = re.search(self.FILM_URL_PATH_PATTERN, self.url_path) - self.name = pattern_re.group('name') - self.id = pattern_re.group('id') - self.logDebug('URL Path: %s (ID: %s, Name: %s, Format: %s)' - % (self.url_path, self.id, self.name, self.format)) + def getInfo(self, url): + self.html = self.load(url) + self.url_path = re.match(self.__pattern__, url).group(1) + self.format = pattern_re = None + if re.match(r'tvshows', self.url_path): + self.format = 'tvshow' + pattern_re = re.search(self.TVSHOW_URL_PATH_PATTERN, self.url_path) + elif re.search(self.FILM_URL_PATH_PATTERN, self.url_path): + self.format = 'film' + pattern_re = re.search(self.FILM_URL_PATH_PATTERN, self.url_path) + self.name = pattern_re.group('name') + self.id = pattern_re.group('id') + self.logDebug('URL Path: %s (ID: %s, Name: %s, Format: %s)' + % (self.url_path, self.id, self.name, self.format)) - def getInfoAndLinks(self, url): - self.getInfo(url) - return self.getLinks() + def getInfoAndLinks(self, url): + self.getInfo(url) + return self.getLinks() - ## This function returns the links for one episode as list - def getLinks(self): - accepted_hosters = re.findall(r'\b(\w+?)\b', self.getConfig('accepted_hosters')) - firstN = self.getConfig('firstN') - links = [] - re_quality = re.compile(r'.+?Quality:.+?smileys/(\d)\.gif') - ## The quality is one digit. 0 is the worst and 5 is the best. - ## Is not always there … - re_hoster_id_js = re.compile(r'links\[(\d+?)\].+ (.+?)</a>(.+?)</tr>') - re_hoster_id_html = re.compile(r'(?:<td height|<tr id).+?<a href=".*?(\d{7}).*?".+? ([^<>]+?)</a>(.+?)</tr>') - ## I assume that the ID is 7 digits longs - count = defaultdict(int) - matches = re_hoster_id_html.findall(self.html) - matches += re_hoster_id_js.findall(self.html) - # self.logDebug(matches) - ## h_id: hoster_id of a possible hoster - for h_id, hoster, q_html in matches: - match_q = re_quality.search(q_html) - if match_q: - quality = int(match_q.group(1)) - if self.max_q == None: - self.max_q = quality - else: - if self.max_q < quality: self.max_q = quality - q_s = ', Quality: %d' % quality - else: - q_s = ', unknown quality' - if hoster in accepted_hosters: - self.logDebug('Accepted: %s, ID: %s%s' % (hoster, h_id, q_s)) - count[hoster] += 1 - if count[hoster] <= firstN: - if match_q: self.q.append(quality) - if h_id != self.id: - self.html = self.load('%s/tvshows-%s-%s.html' % (self.BASE_URL, h_id, self.name)) - else: - self.logDebug('This is already the right ID') - # The iframe tag must continue with a width. There where - # two iframes in the site and I try to make sure that it - # matches the right one. This is not (yet) nessesary - # because the right iframe happens to be the first iframe. - for pattern in (r'<a target="_blank" href="(http://[^"]*?)"', r'<iframe src="(http://[^"]*?)" width'): - try: - url = re.search(pattern, self.html).group(1) - except: - self.logDebug('Failed to find the URL (pattern %s)' % pattern) - else: - self.logDebug('id: %s, %s: %s' % (h_id, hoster, url)) - links.append(url) - break - else: - self.logDebug('Not accepted: %s, ID: %s%s' % (hoster, h_id, q_s)) - # self.logDebug(links) - return links + ## This function returns the links for one episode as list + def getLinks(self): + accepted_hosters = re.findall(r'\b(\w+?)\b', self.getConfig('accepted_hosters')) + firstN = self.getConfig('firstN') + links = [] + re_quality = re.compile(r'.+?Quality:.+?smileys/(\d)\.gif') + ## The quality is one digit. 0 is the worst and 5 is the best. + ## Is not always there … + re_hoster_id_js = re.compile(r'links\[(\d+?)\].+ (.+?)</a>(.+?)</tr>') + re_hoster_id_html = re.compile( + r'(?:<td height|<tr id).+?<a href=".*?(\d{7}).*?".+? ([^<>]+?)</a>(.+?)</tr>') + ## I assume that the ID is 7 digits longs + count = defaultdict(int) + matches = re_hoster_id_html.findall(self.html) + matches += re_hoster_id_js.findall(self.html) + # self.logDebug(matches) + ## h_id: hoster_id of a possible hoster + for h_id, hoster, q_html in matches: + match_q = re_quality.search(q_html) + if match_q: + quality = int(match_q.group(1)) + if self.max_q == None: + self.max_q = quality + else: + if self.max_q < quality: + self.max_q = quality + q_s = ', Quality: %d' % quality + else: + q_s = ', unknown quality' + if hoster in accepted_hosters: + self.logDebug('Accepted: %s, ID: %s%s' % (hoster, h_id, q_s)) + count[hoster] += 1 + if count[hoster] <= firstN: + if match_q: self.q.append(quality) + if h_id != self.id: + self.html = self.load('%s/tvshows-%s-%s.html' % (self.BASE_URL, h_id, self.name)) + else: + self.logDebug('This is already the right ID') + # The iframe tag must continue with a width. There where + # two iframes in the site and I try to make sure that it + # matches the right one. This is not (yet) nessesary + # because the right iframe happens to be the first iframe. + for pattern in (r'<a target="_blank" href="(http://[^"]*?)"', + r'<iframe src="(http://[^"]*?)" width'): + try: + url = re.search(pattern, self.html).group(1) + except: + self.logDebug('Failed to find the URL (pattern %s)' % pattern) + else: + self.logDebug('id: %s, %s: %s' % (h_id, hoster, url)) + links.append(url) + break + else: + self.logDebug('Not accepted: %s, ID: %s%s' % (hoster, h_id, q_s)) + # self.logDebug(links) + return links diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 2c71b8fea..055d72375 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -3,6 +3,7 @@ import re from module.plugins.Crypter import Crypter + class MultiloadCz(Crypter): __name__ = "MultiloadCz" __type__ = "crypter" @@ -10,7 +11,7 @@ class MultiloadCz(Crypter): __version__ = "0.4" __description__ = """multiload.cz""" __config__ = [("usedHoster", "str", "Prefered hoster list (bar-separated) ", ""), - ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] + ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") @@ -38,4 +39,4 @@ class MultiloadCz(Crypter): if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py index bf5540982..111ecdf6c 100644 --- a/module/plugins/crypter/MultiuploadCom.py +++ b/module/plugins/crypter/MultiuploadCom.py @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- import re +from time import time + from module.plugins.Crypter import Crypter from module.common.json_layer import json_loads -from time import time + class MultiuploadCom(Crypter): __name__ = "MultiuploadCom" @@ -12,7 +14,7 @@ class MultiuploadCom(Crypter): __version__ = "0.01" __description__ = """MultiUpload.com crypter""" __config__ = [("preferedHoster", "str", "Prefered hoster list (bar-separated) ", "multiupload"), - ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] + ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")] __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") @@ -22,37 +24,41 @@ class MultiuploadCom(Crypter): self.html = self.load(pyfile.url) found = re.search(self.ML_LINK_PATTERN, self.html) ml_url = found.group(1) if found else None - - json_list = json_loads(self.load("http://multiupload.com/progress/", get = { + + json_list = json_loads(self.load("http://multiupload.com/progress/", get={ "d": re.search(self.__pattern__, pyfile.url).group(1), - "r": str(int(time()*1000)) - })) + "r": str(int(time() * 1000)) + })) new_links = [] - - prefered_set = map(lambda s: s.lower().split('.')[0], set(self.getConfig("preferedHoster").split('|'))) - - if ml_url and 'multiupload' in prefered_set: new_links.append(ml_url) - - for link in json_list: + + prefered_set = map(lambda s: s.lower().split('.')[0], set(self.getConfig("preferedHoster").split('|'))) + + if ml_url and 'multiupload' in prefered_set: + new_links.append(ml_url) + + for link in json_list: if link['service'].lower() in prefered_set and int(link['status']) and not int(link['deleted']): url = self.getLocation(link['url']) - if url: new_links.append(url) + if url: + new_links.append(url) - if not new_links: + if not new_links: ignored_set = map(lambda s: s.lower().split('.')[0], set(self.getConfig("ignoredHoster").split('|'))) - - if 'multiupload' not in ignored_set: new_links.append(ml_url) - - for link in json_list: + + if 'multiupload' not in ignored_set: + new_links.append(ml_url) + + for link in json_list: if link['service'].lower() not in ignored_set and int(link['status']) and not int(link['deleted']): url = self.getLocation(link['url']) - if url: new_links.append(url) + if url: + new_links.append(url) if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: self.fail('Could not extract any links') - + def getLocation(self, url): - header = self.load(url, just_header = True) - return header['location'] if "location" in header else None
\ No newline at end of file + header = self.load(url, just_header=True) + return header['location'] if "location" in header else None diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index e1cd30475..6e0c35e92 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -1,251 +1,252 @@ -# -*- coding: utf-8 -*-
-
-from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
-from module.plugins.ReCaptcha import ReCaptcha
-import base64
-import binascii
-import re
-
-class NCryptIn(Crypter):
- __name__ = "NCryptIn"
- __type__ = "crypter"
- __pattern__ = r"http://(?:www\.)?ncrypt.in/folder-([^/\?]+)"
- __version__ = "1.22"
- __description__ = """NCrypt.in Crypter Plugin"""
- __author_name__ = ("fragonib")
- __author_mail__ = ("fragonib[AT]yahoo[DOT]es")
-
- # Constants
- _JK_KEY_ = "jk"
- _CRYPTED_KEY_ = "crypted"
-
- def setup(self):
- self.html = None
- self.cleanedHtml = None
- self.captcha = False
- self.package = None
-
- def decrypt(self, pyfile):
-
- # Init
- self.package = pyfile.package()
-
- # Request package
- self.html = self.load(self.pyfile.url)
- self.cleanedHtml = self.removeCrap(self.html)
- if not self.isOnline():
- self.offline()
-
- # Check for protection
- if self.isProtected():
- self.html = self.unlockProtection()
- self.cleanedHtml = self.removeCrap(self.html)
- self.handleErrors()
-
- # Get package name and folder
- (package_name, folder_name) = self.getPackageInfo()
-
- # Extract package links
- package_links = []
- package_links.extend(self.handleWebLinks())
- package_links.extend(self.handleContainers())
- package_links.extend(self.handleCNL2())
- package_links = self.removeContainers(package_links)
- package_links = set(package_links)
-
- # Pack
- self.packages = [(package_name, package_links, folder_name)]
-
- def removeCrap(self, content):
- patterns = (r'(type="hidden".*?(name=".*?")?.*?value=".*?")',
- r'display:none;">(.*?)</(div|span)>',
- r'<div\s+class="jdownloader"(.*?)</div>',
- r'<iframe\s+style="display:none(.*?)</iframe>')
- for pattern in patterns:
- rexpr = re.compile(pattern, re.DOTALL)
- content = re.sub(rexpr, "", content)
- return content
-
- def removeContainers(self,package_links):
- tmp_package_links = package_links[:]
- for link in tmp_package_links:
- self.logDebug(link)
- if ".dlc" in link or ".ccf" in link or ".rsdf" in link:
- self.logDebug("Removing [%s] from package_links" % link)
- package_links.remove(link)
-
- if len(package_links) > 0:
- return package_links
- else:
- return tmp_package_links
-
- def isOnline(self):
- if "Your folder does not exist" in self.cleanedHtml:
- self.logDebug("File not found")
- return False
- return True
-
- def isProtected(self):
- if re.search(r'''<form.*?name.*?protected.*?>''', self.cleanedHtml):
- self.logDebug("Links are protected")
- return True
- return False
-
- def getPackageInfo(self):
- title_re = r'<h2><span.*?class="arrow".*?>(?P<title>[^<]+).*?</span>.*?</h2>'
- m = re.findall(title_re, self.html, re.DOTALL)
- if m is not None:
- title = m[-1].strip()
- name = folder = title
- self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
- else:
- name = self.package.name
- folder = self.package.folder
- self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))
- return name, folder
-
- def unlockProtection(self):
-
- postData = {}
-
- form = re.search(r'''<form\ name="protected"(.*?)</form>''', self.cleanedHtml, re.DOTALL).group(1)
-
- # Submit package password
- if "password" in form:
- password = self.getPassword()
- self.logDebug("Submitting password [%s] for protected links" % password)
- postData['password'] = password
-
- # Resolve anicaptcha
- if "anicaptcha" in form:
- self.captcha = True
- self.logDebug("Captcha protected, resolving captcha")
- captchaUri = re.search(r'src="(/temp/anicaptcha/[^"]+)', form).group(1)
- captcha = self.decryptCaptcha("http://ncrypt.in" + captchaUri)
- self.logDebug("Captcha resolved [%s]" % captcha)
- postData['captcha'] = captcha
-
- # Resolve recaptcha
- if "recaptcha" in form:
- self.captcha = True
- id = re.search(r'\?k=(.*?)"', form).group(1)
- self.logDebug("Resolving ReCaptcha with key [%s]" % id)
- recaptcha = ReCaptcha(self)
- challenge, code = recaptcha.challenge(id)
- postData['recaptcha_challenge_field'] = challenge
- postData['recaptcha_response_field'] = code
-
- # Resolve circlecaptcha
- if "circlecaptcha" in form:
- self.captcha = True
- self.logDebug("Captcha protected")
- captcha_img_url = "http://ncrypt.in/classes/captcha/circlecaptcha.php"
- coords = self.decryptCaptcha(captcha_img_url, forceUser=True, imgtype="png", result_type='positional')
- self.logDebug("Captcha resolved, coords [%s]" % str(coords))
- self.captcha_post_url = self.pyfile.url
-
- postData['circle.x'] = coords[0]
- postData['circle.y'] = coords[1]
-
-
- # Unlock protection
- postData['submit_protected'] = 'Continue to folder '
- return self.load(self.pyfile.url, post=postData)
-
- def handleErrors(self):
-
- if "This password is invalid!" in self.cleanedHtml:
- self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry")
- self.fail("Incorrect password, please set right password on 'Edit package' form and retry")
-
- if self.captcha:
- if "The securitycheck was wrong!" in self.cleanedHtml:
- self.logDebug("Invalid captcha, retrying")
- self.invalidCaptcha()
- self.retry()
- else:
- self.correctCaptcha()
-
- def handleWebLinks(self):
- package_links = []
- self.logDebug("Handling Web links")
-
- pattern = r"(http://ncrypt\.in/link-.*?=)"
- links = re.findall(pattern, self.html)
- self.logDebug("Decrypting %d Web links" % len(links))
- for i, link in enumerate(links):
- self.logDebug("Decrypting Web link %d, %s" % (i+1, link))
- try:
- url = link.replace("link-", "frame-")
- link = self.load(url, just_header=True)['location']
- package_links.append(link)
- except Exception, detail:
- self.logDebug("Error decrypting Web link %s, %s" % (link, detail))
- return package_links
-
- def handleContainers(self):
- package_links = []
- self.logDebug("Handling Container links")
-
- pattern = r"/container/(rsdf|dlc|ccf)/([a-z0-9]+)"
- containersLinks = re.findall(pattern, self.html)
- self.logDebug("Decrypting %d Container links" % len(containersLinks))
- for containerLink in containersLinks:
- link = "http://ncrypt.in/container/%s/%s.%s" % (containerLink[0], containerLink[1], containerLink[0])
- package_links.append(link)
- return package_links
-
- def handleCNL2(self):
- package_links = []
- self.logDebug("Handling CNL2 links")
-
- if 'cnl2_output' in self.cleanedHtml:
- try:
- (vcrypted, vjk) = self._getCipherParams()
- for (crypted, jk) in zip(vcrypted, vjk):
- package_links.extend(self._getLinks(crypted, jk))
- except:
- self.fail("Unable to decrypt CNL2 links")
- return package_links
-
- def _getCipherParams(self):
-
- pattern = r'<input.*?name="%s".*?value="(.*?)"'
-
- # Get jk
- jk_re = pattern % NCryptIn._JK_KEY_
- vjk = re.findall(jk_re, self.html)
-
- # Get crypted
- crypted_re = pattern % NCryptIn._CRYPTED_KEY_
- vcrypted = re.findall(crypted_re, self.html)
-
- # Log and return
- self.logDebug("Detected %d crypted blocks" % len(vcrypted))
- return vcrypted, vjk
-
- def _getLinks(self, crypted, jk):
-
- # Get key
- jreturn = self.js.eval("%s f()" % jk)
- self.logDebug("JsEngine returns value [%s]" % jreturn)
- key = binascii.unhexlify(jreturn)
-
- # Decode crypted
- crypted = base64.standard_b64decode(crypted)
-
- # Decrypt
- Key = key
- IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
- text = obj.decrypt(crypted)
-
- # Extract links
- text = text.replace("\x00", "").replace("\r", "")
- links = text.split("\n")
- links = filter(lambda x: x != "", links)
-
- # Log and return
- self.logDebug("Block has %d links" % len(links))
- return links
+# -*- coding: utf-8 -*- + +import base64 +import binascii +import re + +from Crypto.Cipher import AES +from module.plugins.Crypter import Crypter +from module.plugins.ReCaptcha import ReCaptcha + + +class NCryptIn(Crypter): + __name__ = "NCryptIn" + __type__ = "crypter" + __pattern__ = r"http://(?:www\.)?ncrypt.in/folder-([^/\?]+)" + __version__ = "1.23" + __description__ = """NCrypt.in Crypter Plugin""" + __author_name__ = ("fragonib") + __author_mail__ = ("fragonib[AT]yahoo[DOT]es") + + # Constants + _JK_KEY_ = "jk" + _CRYPTED_KEY_ = "crypted" + + def setup(self): + self.html = None + self.cleanedHtml = None + self.captcha = False + self.package = None + + def decrypt(self, pyfile): + + # Init + self.package = pyfile.package() + + # Request package + self.html = self.load(self.pyfile.url) + self.cleanedHtml = self.removeCrap(self.html) + if not self.isOnline(): + self.offline() + + # Check for protection + if self.isProtected(): + self.html = self.unlockProtection() + self.cleanedHtml = self.removeCrap(self.html) + self.handleErrors() + + # Get package name and folder + (package_name, folder_name) = self.getPackageInfo() + + # Extract package links + package_links = [] + package_links.extend(self.handleWebLinks()) + package_links.extend(self.handleContainers()) + package_links.extend(self.handleCNL2()) + package_links = self.removeContainers(package_links) + package_links = set(package_links) + + # Pack + self.packages = [(package_name, package_links, folder_name)] + + def removeCrap(self, content): + patterns = (r'(type="hidden".*?(name=".*?")?.*?value=".*?")', + r'display:none;">(.*?)</(div|span)>', + r'<div\s+class="jdownloader"(.*?)</div>', + r'<iframe\s+style="display:none(.*?)</iframe>') + for pattern in patterns: + rexpr = re.compile(pattern, re.DOTALL) + content = re.sub(rexpr, "", content) + return content + + def removeContainers(self, package_links): + tmp_package_links = package_links[:] + for link in tmp_package_links: + self.logDebug(link) + if ".dlc" in link or ".ccf" in link or ".rsdf" in link: + self.logDebug("Removing [%s] from package_links" % link) + package_links.remove(link) + + if len(package_links) > 0: + return package_links + else: + return tmp_package_links + + def isOnline(self): + if "Your folder does not exist" in self.cleanedHtml: + self.logDebug("File not found") + return False + return True + + def isProtected(self): + if re.search(r'''<form.*?name.*?protected.*?>''', self.cleanedHtml): + self.logDebug("Links are protected") + return True + return False + + def getPackageInfo(self): + title_re = r'<h2><span.*?class="arrow".*?>(?P<title>[^<]+).*?</span>.*?</h2>' + m = re.findall(title_re, self.html, re.DOTALL) + if m is not None: + title = m[-1].strip() + name = folder = title + self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder)) + else: + name = self.package.name + folder = self.package.folder + self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) + return name, folder + + def unlockProtection(self): + + postData = {} + + form = re.search(r'<form name="protected"(.*?)</form>', self.cleanedHtml, re.DOTALL).group(1) + + # Submit package password + if "password" in form: + password = self.getPassword() + self.logDebug("Submitting password [%s] for protected links" % password) + postData['password'] = password + + # Resolve anicaptcha + if "anicaptcha" in form: + self.captcha = True + self.logDebug("Captcha protected, resolving captcha") + captchaUri = re.search(r'src="(/temp/anicaptcha/[^"]+)', form).group(1) + captcha = self.decryptCaptcha("http://ncrypt.in" + captchaUri) + self.logDebug("Captcha resolved [%s]" % captcha) + postData['captcha'] = captcha + + # Resolve recaptcha + if "recaptcha" in form: + self.captcha = True + id = re.search(r'\?k=(.*?)"', form).group(1) + self.logDebug("Resolving ReCaptcha with key [%s]" % id) + recaptcha = ReCaptcha(self) + challenge, code = recaptcha.challenge(id) + postData['recaptcha_challenge_field'] = challenge + postData['recaptcha_response_field'] = code + + # Resolve circlecaptcha + if "circlecaptcha" in form: + self.captcha = True + self.logDebug("Captcha protected") + captcha_img_url = "http://ncrypt.in/classes/captcha/circlecaptcha.php" + coords = self.decryptCaptcha(captcha_img_url, forceUser=True, imgtype="png", result_type='positional') + self.logDebug("Captcha resolved, coords [%s]" % str(coords)) + self.captcha_post_url = self.pyfile.url + + postData['circle.x'] = coords[0] + postData['circle.y'] = coords[1] + + # Unlock protection + postData['submit_protected'] = 'Continue to folder ' + return self.load(self.pyfile.url, post=postData) + + def handleErrors(self): + + if "This password is invalid!" in self.cleanedHtml: + self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry") + self.fail("Incorrect password, please set right password on 'Edit package' form and retry") + + if self.captcha: + if "The securitycheck was wrong!" in self.cleanedHtml: + self.logDebug("Invalid captcha, retrying") + self.invalidCaptcha() + self.retry() + else: + self.correctCaptcha() + + def handleWebLinks(self): + package_links = [] + self.logDebug("Handling Web links") + + pattern = r"(http://ncrypt\.in/link-.*?=)" + links = re.findall(pattern, self.html) + self.logDebug("Decrypting %d Web links" % len(links)) + for i, link in enumerate(links): + self.logDebug("Decrypting Web link %d, %s" % (i + 1, link)) + try: + url = link.replace("link-", "frame-") + link = self.load(url, just_header=True)['location'] + package_links.append(link) + except Exception, detail: + self.logDebug("Error decrypting Web link %s, %s" % (link, detail)) + return package_links + + def handleContainers(self): + package_links = [] + self.logDebug("Handling Container links") + + pattern = r"/container/(rsdf|dlc|ccf)/([a-z0-9]+)" + containersLinks = re.findall(pattern, self.html) + self.logDebug("Decrypting %d Container links" % len(containersLinks)) + for containerLink in containersLinks: + link = "http://ncrypt.in/container/%s/%s.%s" % (containerLink[0], containerLink[1], containerLink[0]) + package_links.append(link) + return package_links + + def handleCNL2(self): + package_links = [] + self.logDebug("Handling CNL2 links") + + if 'cnl2_output' in self.cleanedHtml: + try: + (vcrypted, vjk) = self._getCipherParams() + for (crypted, jk) in zip(vcrypted, vjk): + package_links.extend(self._getLinks(crypted, jk)) + except: + self.fail("Unable to decrypt CNL2 links") + return package_links + + def _getCipherParams(self): + + pattern = r'<input.*?name="%s".*?value="(.*?)"' + + # Get jk + jk_re = pattern % NCryptIn._JK_KEY_ + vjk = re.findall(jk_re, self.html) + + # Get crypted + crypted_re = pattern % NCryptIn._CRYPTED_KEY_ + vcrypted = re.findall(crypted_re, self.html) + + # Log and return + self.logDebug("Detected %d crypted blocks" % len(vcrypted)) + return vcrypted, vjk + + def _getLinks(self, crypted, jk): + + # Get key + jreturn = self.js.eval("%s f()" % jk) + self.logDebug("JsEngine returns value [%s]" % jreturn) + key = binascii.unhexlify(jreturn) + + # Decode crypted + crypted = base64.standard_b64decode(crypted) + + # Decrypt + Key = key + IV = key + obj = AES.new(Key, AES.MODE_CBC, IV) + text = obj.decrypt(crypted) + + # Extract links + text = text.replace("\x00", "").replace("\r", "") + links = text.split("\n") + links = filter(lambda x: x != "", links) + + # Log and return + self.logDebug("Block has %d links" % len(links)) + return links diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py index c77203187..a2e6d039e 100644 --- a/module/plugins/crypter/OneKhDe.py +++ b/module/plugins/crypter/OneKhDe.py @@ -6,6 +6,7 @@ import re from module.unescape import unescape from module.plugins.Crypter import Crypter + class OneKhDe(Crypter): __name__ = "OneKhDe" __type__ = "container" @@ -31,6 +32,7 @@ class OneKhDe(Crypter): temp_links = [] link_ids = re.findall(r"<a id=\"DownloadLink_(\d*)\" href=\"http://1kh.de/", self.html) for id in link_ids: - new_link = unescape(re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.req.load("http://1kh.de/l/" + id)).group(1)) + new_link = unescape( + re.search("width=\"100%\" src=\"(.*)\"></iframe>", self.req.load("http://1kh.de/l/" + id)).group(1)) temp_links.append(new_link) self.links = temp_links diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py index 57b273163..f6637033b 100755 --- a/module/plugins/crypter/OronComFolder.py +++ b/module/plugins/crypter/OronComFolder.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- -import re +import re from module.plugins.Crypter import Crypter + class OronComFolder(Crypter): __name__ = "OronComFolder" __type__ = "crypter" @@ -22,10 +23,11 @@ class OronComFolder(Crypter): new_links = [] folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL) - if folder is None: self.fail("Parse error (FOLDER)") - + if folder is None: + self.fail("Parse error (FOLDER)") + new_links.extend(re.findall(self.LINK_PATTERN, folder.group(0))) - + if new_links: self.core.files.addLinks(new_links, self.pyfile.package().id) else: diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 6cb049935..18ac68eec 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -3,6 +3,7 @@ import re from module.plugins.Crypter import Crypter + class QuickshareCzFolder(Crypter): __name__ = "QuickshareCzFolder" __type__ = "crypter" @@ -12,16 +13,16 @@ class QuickshareCzFolder(Crypter): __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>' LINK_PATTERN = r'(http://www.quickshare.cz/\S+)' def decrypt(self, pyfile): html = self.load(self.pyfile.url) - new_links = [] + new_links = [] found = re.search(self.FOLDER_PATTERN, html, re.DOTALL) - if found is None: self.fail("Parse error (FOLDER)") + if found is None: + self.fail("Parse error (FOLDER)") new_links.extend(re.findall(self.LINK_PATTERN, found.group(1))) if new_links: diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py index 6e4266f2e..6a1f86657 100644 --- a/module/plugins/crypter/RSLayerCom.py +++ b/module/plugins/crypter/RSLayerCom.py @@ -7,6 +7,7 @@ from module.plugins.Crypter import Crypter from module.lib.BeautifulSoup import BeautifulSoup from module.unescape import unescape + class RSLayerCom(Crypter): __name__ = "RSLayerCom" __type__ = "container" diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 8f29a9158..104968e06 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- -from Crypto.Cipher import AES -from module.plugins.Crypter import Crypter import base64 import binascii import re import os +from Crypto.Cipher import AES +from module.plugins.Crypter import Crypter + class RelinkUs(Crypter): __name__ = "RelinkUs" @@ -27,45 +28,44 @@ class RelinkUs(Crypter): CAPTCHA_TOKEN = "container_captcha.php" CAPTCHA_ERROR_ROKEN = "You have solved the captcha wrong" CAPTCHA_IMG_URL = "http://www.relink.us/core/captcha/circlecaptcha.php" - CAPTCHA_SUBMIT_URL = "http://www.relink.us/container_captcha.php" + CAPTCHA_SUBMIT_URL = "http://www.relink.us/container_captcha.php" FILE_TITLE_REGEX = r"<th>Title</th><td><i>(.*)</i></td></tr>" FILE_NOTITLE = 'No title' - + CNL2_FORM_REGEX = r'<form id="cnl_form-(.*?)</form>' CNL2_FORMINPUT_REGEX = r'<input.*?name="%s".*?value="(.*?)"' CNL2_JK_KEY = "jk" CNL2_CRYPTED_KEY = "crypted" DLC_LINK_REGEX = r'<a href=".*?" class="dlc_button" target="_blank">' - DLC_DOWNLOAD_URL = "http://www.relink.us/download.php" - WEB_FORWARD_REGEX = r"getFile\('(?P<link>.+)'\)"; - WEB_FORWARD_URL = "http://www.relink.us/frame.php" + DLC_DOWNLOAD_URL = "http://www.relink.us/download.php" + WEB_FORWARD_REGEX = r"getFile\('(?P<link>.+)'\)" + WEB_FORWARD_URL = "http://www.relink.us/frame.php" WEB_LINK_REGEX = r'<iframe name="Container" height="100%" frameborder="no" width="100%" src="(?P<link>.+)"></iframe>' - - + def setup(self): self.fileid = None self.package = None self.password = None self.html = None self.captcha = False - + def decrypt(self, pyfile): # Init self.initPackage(pyfile) - + # Request package self.requestPackage() - + # Check for online if not self.isOnline(): self.offline() - + # Check for protection if self.isPasswordProtected(): self.unlockPasswordProtection() self.handleErrors() - + if self.isCaptchaProtected(): self.captcha = True self.unlockCaptchaProtection() @@ -95,38 +95,38 @@ class RelinkUs(Crypter): self.url = pyfile.url def requestPackage(self): - self.html = self.load(self.url, decode = True) + self.html = self.load(self.url, decode=True) def isOnline(self): if self.OFFLINE_TOKEN in self.html: self.logDebug("File not found") return False return True - + def isPasswordProtected(self): if self.PASSWORD_TOKEN in self.html: self.logDebug("Links are password protected") return True - + def isCaptchaProtected(self): if self.CAPTCHA_TOKEN in self.html: self.logDebug("Links are captcha protected") return True return False - + def unlockPasswordProtection(self): self.logDebug("Submitting password [%s] for protected links" % self.password) passwd_url = self.PASSWORD_SUBMIT_URL + "?id=%s" % self.fileid - passwd_data = { 'id': self.fileid, 'password': self.password, 'pw': 'submit' } + passwd_data = {'id': self.fileid, 'password': self.password, 'pw': 'submit'} self.html = self.load(passwd_url, post=passwd_data, decode=True) - + def unlockCaptchaProtection(self): self.logDebug("Request user positional captcha resolving") captcha_img_url = self.CAPTCHA_IMG_URL + "?id=%s" % self.fileid coords = self.decryptCaptcha(captcha_img_url, forceUser=True, imgtype="png", result_type='positional') self.logDebug("Captcha resolved, coords [%s]" % str(coords)) captcha_post_url = self.CAPTCHA_SUBMIT_URL + "?id=%s" % self.fileid - captcha_post_data = { 'button.x': coords[0], 'button.y': coords[1], 'captcha': 'submit' } + captcha_post_data = {'button.x': coords[0], 'button.y': coords[1], 'captcha': 'submit'} self.html = self.load(captcha_post_url, post=captcha_post_data, decode=True) def getPackageInfo(self): @@ -139,30 +139,30 @@ class RelinkUs(Crypter): if not self.FILE_NOTITLE in title: name = folder = title self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder)) - + # Fallback to defaults if not name or not folder: name = self.package.name folder = self.package.folder self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) - + # Return package info - return name, folder - - def handleErrors(self): + return name, folder + + def handleErrors(self): if self.PASSWORD_ERROR_ROKEN in self.html: msg = "Incorrect password, please set right password on 'Edit package' form and retry" self.logDebug(msg) - self.fail(msg) + self.fail(msg) - if self.captcha: + if self.captcha: if self.CAPTCHA_ERROR_ROKEN in self.html: self.logDebug("Invalid captcha, retrying") self.invalidCaptcha() self.retry() else: self.correctCaptcha() - + def handleLinkSource(self, source): if source == 'cnl2': return self.handleCNL2Links() @@ -172,7 +172,7 @@ class RelinkUs(Crypter): return self.handleWEBLinks() else: self.fail('Unknown source [%s] (this is probably a bug)' % source) - + def handleCNL2Links(self): self.logDebug("Search for CNL2 links") package_links = [] @@ -186,13 +186,13 @@ class RelinkUs(Crypter): except: self.logDebug("Unable to decrypt CNL2 links") return package_links - + def handleDLCLinks(self): self.logDebug('Search for DLC links') package_links = [] m = re.search(self.DLC_LINK_REGEX, self.html) if m is not None: - container_url = self.DLC_DOWNLOAD_URL + "?id=%s&dlc=1" % self.fileid + container_url = self.DLC_DOWNLOAD_URL + "?id=%s&dlc=1" % self.fileid self.logDebug("Downloading DLC container link [%s]" % container_url) try: dlc = self.load(container_url) @@ -203,7 +203,7 @@ class RelinkUs(Crypter): f.close() package_links.append(dlc_filepath) except: - self.logDebug("Unable to download DLC container") + self.logDebug("Unable to download DLC container") return package_links def handleWEBLinks(self): @@ -214,7 +214,7 @@ class RelinkUs(Crypter): for index, fw_param in enumerate(fw_params): try: fw_url = self.WEB_FORWARD_URL + "?%s" % fw_param - self.logDebug("Decrypting Web link %d, %s" % (index+1, fw_url)) + self.logDebug("Decrypting Web link %d, %s" % (index + 1, fw_url)) fw_response = self.load(fw_url, decode=True) dl_link = re.search(self.WEB_LINK_REGEX, fw_response).group('link') package_links.append(dl_link) @@ -223,15 +223,15 @@ class RelinkUs(Crypter): self.setWait(4) self.wait() return package_links - + def _getCipherParams(self, cnl2_form): - + # Get jk - jk_re = self.CNL2_FORMINPUT_REGEX % self.CNL2_JK_KEY + jk_re = self.CNL2_FORMINPUT_REGEX % self.CNL2_JK_KEY vjk = re.findall(jk_re, cnl2_form, re.IGNORECASE) - + # Get crypted - crypted_re = self.CNL2_FORMINPUT_REGEX % RelinkUs.CNL2_CRYPTED_KEY + crypted_re = self.CNL2_FORMINPUT_REGEX % RelinkUs.CNL2_CRYPTED_KEY vcrypted = re.findall(crypted_re, cnl2_form, re.IGNORECASE) # Log and return diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py index e41896c5f..9bce390ac 100644 --- a/module/plugins/crypter/SecuredIn.py +++ b/module/plugins/crypter/SecuredIn.py @@ -1,53 +1,54 @@ # -*- coding: utf-8 -*- import re +from math import ceil from module.plugins.Crypter import Crypter from module.lib.BeautifulSoup import BeautifulSoup -from math import ceil class SecuredIn(Crypter): __name__ = "SecuredIn" __type__ = "container" __pattern__ = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html" - __version__ = "0.1" + __version__ = "0.2" __description__ = """secured.in Container Plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") - + def __init__(self, parent): Crypter.__init__(self, parent) self.parent = parent self.html = None self.multi_dl = False - + def file_exists(self): return True - + def proceed(self, url, location): links = [] ajaxUrl = "http://secured.in/ajax-handler.php" src = self.req.load(url, cookies=True) soup = BeautifulSoup(src) - img = soup.find("img", attrs={"id":"captcha_img"}) - for i in range(3): - form = soup.find("form", attrs={"id":"frm_captcha"}) - captchaHash = form.find("input", attrs={"id":"captcha_hash"})["value"] + img = soup.find("img", attrs={"id": "captcha_img"}) + for _ in range(3): + form = soup.find("form", attrs={"id": "frm_captcha"}) + captchaHash = form.find("input", attrs={"id": "captcha_hash"})["value"] captchaUrl = "http://secured.in/%s" % img["src"] captchaData = self.req.load(str(captchaUrl), cookies=True) result = self.waitForCaptcha(captchaData, "jpg") - src = self.req.load(url, cookies=True, post={"captcha_key":result, "captcha_hash":captchaHash}) + src = self.req.load(url, cookies=True, post={"captcha_key": result, "captcha_hash": captchaHash}) soup = BeautifulSoup(src) - img = soup.find("img", attrs={"id":"captcha_img"}) + img = soup.find("img", attrs={"id": "captcha_img"}) if not img: - files = soup.findAll("tr", attrs={"id":re.compile("file-\d+")}) - dlIDPattern = re.compile("accessDownload\(\d, \d+, '(.*?)', \d\)") + files = soup.findAll("tr", attrs={"id": re.compile(r"file-\d+")}) + dlIDPattern = re.compile(r"accessDownload\(\d, \d+, '(.*?)', \d\)") cypher = self.Cypher() for cfile in files: m = dlIDPattern.search(cfile["onclick"]) if m: - crypted = self.req.load(ajaxUrl, cookies=True, post={"cmd":"download", "download_id":m.group(1)}) + crypted = self.req.load(ajaxUrl, cookies=True, + post={"cmd": "download", "download_id": m.group(1)}) cypher.reset() link = cypher.cypher(crypted) links.append(link) @@ -57,37 +58,61 @@ class SecuredIn(Crypter): class Cypher(): def __init__(self): self.reset() - + def reset(self): self.iatwbfrd = [ - 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, - 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, - 0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, - 0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, - 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381, - 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1, - 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, - 0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, - 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f, - 0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, - 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, 0x68fb6faf, - 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, - 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, - 0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, - 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, - 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, - 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, - 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, - 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, - 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, - 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, - 0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4, - 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, + 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, + 0x24a19947, 0xb3916cf7, 0x0801f2e2, + 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58, + 0x82154aee, 0x7b54a41d, 0xc25a59b5, + 0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, + 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, + 0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, + 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, + 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, + 0xafd6ba33, 0x6c24cf5c, 0x7a325381, + 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, + 0x5dec8032, 0xef845d5d, 0xe98575b1, + 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, + 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, + 0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, + 0x137a3be4, 0xba3bf050, 0x7efb2a98, + 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, + 0xe06f75d8, 0x85c12073, 0x401a449f, + 0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, + 0x49f1c09b, 0x075372c9, 0x80991b7b, + 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, + 0x5e5c9ec2, 0x196a2463, 0x68fb6faf, + 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, + 0xde334afd, 0x660f2807, 0x192e4bb3, + 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, + 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, + 0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, + 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, + 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, + 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, + 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, + 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, + 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, + 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, + 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, + 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, + 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, + 0x7cc43b81, 0xd2ada8d9, 0x165fa266, + 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, + 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, + 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, + 0x78c14389, 0xd95a537f, 0x207d5ba2, + 0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, + 0x9a532915, 0xd60f573f, 0xbc9bc6e4, + 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, + 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a ] self.olkemfjq = [ - 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, + 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, + 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b ] @@ -98,88 +123,157 @@ class SecuredIn(Crypter): self.ldiwkqly = 0 self.plkodnyq = [ - 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, - 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, - 0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, - 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, - 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, - 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6, - 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, - 0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, - 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, 0x379d5862, - 0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, - 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e, - 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, - 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, - 0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, - 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, - 0xc6913667, 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, - 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, - 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, - 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, - 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, - 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, - 0xcd769c2b, 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8, - 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132, + 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, + 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, + 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, 0xc6a376d2, + 0x6549c2c8, 0x530ff8ee, 0x468dde7d, + 0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, + 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, + 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, + 0xa73a3ae1, 0x4ba99586, 0xef5562e9, + 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, + 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, + 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, + 0x5a88f54c, 0xe029ac71, 0xe019a5e6, + 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, + 0xf7960e44, 0xe3d35e8c, 0x15056dd4, + 0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, + 0x1e6321f5, 0xf59c66fb, 0x26dcf319, + 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, + 0x4de81751, 0x3830dc8e, 0x379d5862, + 0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, + 0x6413e680, 0xa2ae0810, 0xdd6db224, + 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, + 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e, + 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, + 0x542f5d9e, 0xaec2771b, 0xf64e6370, + 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, + 0xe1b00428, 0x95983a1d, 0x06b89fb4, + 0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, + 0x344525bd, 0xa08839e1, 0x51ce794b, + 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, + 0xd0dadecb, 0xd50ada38, 0x0339c32a, + 0xc6913667, 0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, + 0x15e6fc2a, 0x0f91fc71, 0x9b941525, + 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, + 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, + 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, + 0xc37632d8, 0xdf359f8d, 0x9b992f2e, + 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, + 0x848fd2c5, 0xf6fb2299, 0xf523f357, + 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292, + 0x81b949d0, 0x4c50901b, 0x71c65614, + 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, + 0x71126905, 0xb2040222, 0xb6cbcf7c, + 0xcd769c2b, 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, + 0x20756060, 0x85cbfe4e, 0x8ae88dd8, + 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, + 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 ] self.pnjzokye = None self.thdlpsmy = [ - 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, - 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, - 0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, 0x68dc1462, - 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, - 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, - 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58, - 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, - 0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, - 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1, 0x3b240b62, - 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, - 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, 0xc67b5510, - 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, - 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, - 0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, - 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346, - 0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61, - 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, - 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, - 0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, - 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, - 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, - 0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5, - 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, + 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, + 0xd4082471, 0x3320f46a, 0x43b7d4b7, + 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, + 0x66a02f45, 0xbfbc09ec, 0x03bd9785, + 0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, + 0x0a2c86da, 0xe9b66dfb, 0x68dc1462, + 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, + 0xd3375fec, 0xce78a399, 0x406b2a42, + 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, + 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, + 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, + 0xd096954b, 0x55a867bc, 0xa1159a58, + 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, + 0x80bb155c, 0x05282ce3, 0x95c11548, + 0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, + 0xd59bc0d1, 0xf2bcc18f, 0x41113564, + 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, + 0x6b2395e0, 0x333e92e1, 0x3b240b62, + 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, + 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, + 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, + 0x991be14c, 0xdb6e6b0d, 0xc67b5510, + 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, 0x667b9ffb, + 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, + 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, + 0x6842ada7, 0xc66a2b3b, 0x12754ccc, + 0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, + 0xe2e1c3c9, 0x44421659, 0x0a121386, + 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, + 0x60787bf8, 0x6003604d, 0xd1fd8346, + 0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, + 0xbde8ae24, 0x55464299, 0xbf582e61, + 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, + 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, + 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248, + 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, + 0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, + 0xa186f20f, 0x2868f169, 0xdcb7da83, + 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, + 0x773f8641, 0xc3604c06, 0x61a806b5, + 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, + 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, + 0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, + 0xd39eb8fc, 0xed545578, 0x08fca5b5, + 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, + 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0 ] self.ybghjtik = [ - 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, - 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, - 0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, 0x687f3584, - 0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, - 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634, - 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908, - 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, - 0x2e6b7124, 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, - 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, 0x71dff89e, 0x10314e55, 0x81ac77d6, - 0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1, - 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, 0xc6150eba, - 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, - 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, - 0x5b6e2f84, 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, - 0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32, - 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281, - 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, 0x8fd948e4, - 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, - 0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, - 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, - 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7, - 0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, 0x9e447a2e, 0xc3453484, - 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, + 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, + 0xecaa8c71, 0x699a17ff, 0x5664526c, + 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, + 0x99f73fd6, 0xa1d29c07, 0xefe830f5, + 0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, + 0x3c971814, 0x6b6a70a1, 0x687f3584, + 0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, + 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, + 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, + 0x3ae5e581, 0x37c2dadc, 0xc8b57634, + 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, + 0x183eb331, 0x4e548b38, 0x4f6db908, + 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810, + 0xb38bae12, 0xdccf3f2e, 0x5512721f, + 0x2e6b7124, 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, + 0xdb851dfa, 0x63094366, 0xc464c3d2, + 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, + 0x71dff89e, 0x10314e55, 0x81ac77d6, + 0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, + 0x1e153c6e, 0x86e34570, 0xeae96fb1, + 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, + 0x2e4cc978, 0x9c10b36a, 0xc6150eba, + 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 0x5223a708, + 0xf71312b6, 0xebadfe6e, 0xeac31f66, + 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, + 0xeecea50f, 0xdb2f953b, 0x2aef7dad, + 0x5b6e2f84, 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, + 0xaa0363cf, 0xb5735c90, 0x4c70a239, + 0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, + 0xa02369b9, 0x655abb50, 0x40685a32, + 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, + 0x97e32d77, 0x11ed935f, 0x16681281, + 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, + 0xcdb30aeb, 0x532e3054, 0x8fd948e4, + 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3, 0x42105d14, + 0x203e13e0, 0x45eee2b6, 0xa3aaabea, + 0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, + 0xe44b476a, 0x3d816250, 0xcf62a1f2, + 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00, + 0xad19489d, 0x1462b174, 0x23820e00, + 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, + 0x7cde3759, 0xcbee7460, 0x4085f2a7, + 0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, + 0x800bcadc, 0x9e447a2e, 0xc3453484, + 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, + 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7 ] - + def cypher(self, code): return self.lskdqpyr(code, "") @@ -195,7 +289,7 @@ class SecuredIn(Crypter): tzghbndf = lokimyas[1] awsedrft = [None, None] for kiujzhqa in range(8, alokijuh, 8): - lokimyas = self.ylomiktb(alokfmth[kiujzhqa:kiujzhqa+8]) + lokimyas = self.ylomiktb(alokfmth[kiujzhqa:kiujzhqa + 8]) awsedrft[0] = lokimyas[0] awsedrft[1] = lokimyas[1] lokimyas = self.okaqnhlp(lokimyas[0], lokimyas[1]) @@ -210,7 +304,9 @@ class SecuredIn(Crypter): ujhaqylw = 0 for yalmhopr in range(17, 1, -1): lahgrnvp ^= self.ldiwkqly[yalmhopr] - trenlpys ^= (self.oqlaoymh[lahgrnvp >> 24 & 0xff] + self.oqmykrna[lahgrnvp >> 16 & 0xff] ^ self.pqmyzkid[lahgrnvp >> 8 & 0xff]) + self.pldmjnde[lahgrnvp & 0xff] + trenlpys ^= ( + self.oqlaoymh[lahgrnvp >> 24 & 0xff] + self.oqmykrna[lahgrnvp >> 16 & 0xff] ^ self.pqmyzkid[ + lahgrnvp >> 8 & 0xff]) + self.pldmjnde[lahgrnvp & 0xff] ujhaqylw = lahgrnvp lahgrnvp = trenlpys trenlpys = ujhaqylw @@ -263,7 +359,9 @@ class SecuredIn(Crypter): dolizmvw = 0 for iumswkya in range(0, 16): oqlamykt ^= self.ldiwkqly[iumswkya] - yalkionj ^= (self.oqlaoymh[oqlamykt >> 24 & 0xff] + self.oqmykrna[oqlamykt >> 16 & 0xff] ^ self.pqmyzkid[oqlamykt >> 8 & 0xff]) + self.pldmjnde[oqlamykt & 0xff] + yalkionj ^= ( + self.oqlaoymh[oqlamykt >> 24 & 0xff] + self.oqmykrna[oqlamykt >> 16 & 0xff] ^ self.pqmyzkid[ + oqlamykt >> 8 & 0xff]) + self.pldmjnde[oqlamykt & 0xff] dolizmvw = oqlamykt oqlamykt = yalkionj yalkionj = dolizmvw @@ -278,7 +376,8 @@ class SecuredIn(Crypter): loipamyu = len(yoirlkqw) yoirlkqwchar = [] for ymujtnbq in range(0, loipamyu): - yoir = [yoirlkqw[ymujtnbq] >> 24 & 0xff, yoirlkqw[ymujtnbq] >> 16 & 0xff, yoirlkqw[ymujtnbq] >> 8 & 0xff, yoirlkqw[ymujtnbq] & 0xff] + yoir = [yoirlkqw[ymujtnbq] >> 24 & 0xff, yoirlkqw[ymujtnbq] >> 16 & 0xff, + yoirlkqw[ymujtnbq] >> 8 & 0xff, yoirlkqw[ymujtnbq] & 0xff] for c in yoir: yoirlkqwchar.append(chr(c)) return "".join(yoirlkqwchar) @@ -287,7 +386,8 @@ class SecuredIn(Crypter): plokimqw = int(ceil(len(lofiuzmq) / 4.0)) lopkisdq = [] for ypoqlktz in range(0, plokimqw): - lopkisdq.append(ord(lofiuzmq[(ypoqlktz << 2) + 3]) + (ord(lofiuzmq[(ypoqlktz << 2) + 2]) << 8) + (ord(lofiuzmq[(ypoqlktz << 2) + 1]) << 16) + (ord(lofiuzmq[(ypoqlktz << 2)]) << 24)) + lopkisdq.append(ord(lofiuzmq[(ypoqlktz << 2) + 3]) + (ord(lofiuzmq[(ypoqlktz << 2) + 2]) << 8) + ( + ord(lofiuzmq[(ypoqlktz << 2) + 1]) << 16) + (ord(lofiuzmq[(ypoqlktz << 2)]) << 24)) return lopkisdq def yoliukev(self, kaiumylq): @@ -296,13 +396,13 @@ class SecuredIn(Crypter): self.pqmyzkid = self.thdlpsmy self.pldmjnde = self.plkodnyq - yaqpolft = [0 for i in range(len(kaiumylq))] + yaqpolft = [0] * len(kaiumylq) yaqwsedr = 0 btzqwsay = 0 while yaqwsedr < len(kaiumylq): wlqoakmy = 0 - for lopiuztr in range(0, 4): + for _ in range(0, 4): wlqoakmy = wlqoakmy << 8 | ord(kaiumylq[yaqwsedr % len(kaiumylq)]) yaqwsedr += 1 yaqpolft[btzqwsay] = wlqoakmy @@ -331,4 +431,3 @@ class SecuredIn(Crypter): yalopiuq = self.qmyjuila(yalopiuq[0], yalopiuq[1]) self.pldmjnde[btzqwsay] = yalopiuq[0] self.pldmjnde[btzqwsay + 1] = yalopiuq[1] - diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index 3fcc12e36..e0eb7e240 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -7,24 +7,26 @@ from module.plugins.Crypter import Crypter from module.lib.BeautifulSoup import BeautifulSoup from module.unescape import unescape + class SerienjunkiesOrg(Crypter): __name__ = "SerienjunkiesOrg" __type__ = "container" __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?" - __version__ = "0.38" + __version__ = "0.39" __config__ = [ ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), ("randomPreferred", "bool", "Randomize Preferred-List", False), - ("hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", "Use for hosters (if supported)", "All"), - ("hosterList", "str", "Preferred Hoster list (comma separated)", "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), + ("hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", + "Use for hosters (if supported)", "All"), + ("hosterList", "str", "Preferred Hoster list (comma separated)", + "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), ("ignoreList", "str", "Ignored Hoster list (comma separated)", "MegauploadCom") - ] + ] __description__ = """serienjunkies.org Container Plugin""" __author_name__ = ("mkaay", "godofdream") __author_mail__ = ("mkaay@mkaay.de", "soilfiction@gmail.com") - def setup(self): self.multiDL = False @@ -44,7 +46,7 @@ class SerienjunkiesOrg(Crypter): if self.getConfig("changeNameSJ") == "Show": found = unescape(soup.find("h2").find("a").string.split(' –')[0]) if found: - packageName = found + packageName = found nav = soup.find("div", attrs={"id": "scb"}) @@ -58,7 +60,6 @@ class SerienjunkiesOrg(Crypter): self.packages.append((packageName, package_links, packageName)) else: self.core.files.addLinks(package_links, self.pyfile.package().id) - def handleSeason(self, url): src = self.getSJSrc(url) @@ -91,15 +92,16 @@ class SerienjunkiesOrg(Crypter): elif re.search("<strong>Download:", str(p)): parts = str(p).split("<br />") if re.search("<strong>", parts[0]): - ename = re.search('<strong>(.*?)</strong>',parts[0]).group(1).strip().decode("utf-8").replace("–", "-") + ename = re.search('<strong>(.*?)</strong>', parts[0]).group(1).strip().decode("utf-8").replace( + "–", "-") groups[gid]["ep"][ename] = {} parts.remove(parts[0]) for part in parts: - hostername = re.search(" \| ([-a-zA-Z0-9]+\.\w+)",part) + hostername = re.search(r" \| ([-a-zA-Z0-9]+\.\w+)", part) if hostername: hostername = hostername.group(1) groups[gid]["ep"][ename][hostername] = [] - links = re.findall('href="(.*?)"',part) + links = re.findall('href="(.*?)"', part) for link in links: groups[gid]["ep"][ename][hostername].append(link + "#hasName") @@ -122,7 +124,7 @@ class SerienjunkiesOrg(Crypter): def handleEpisode(self, url): src = self.getSJSrc(url) if not src.find( - "Du hast das Download-Limit überschritten! Bitte versuche es später nocheinmal.") == -1: + "Du hast das Download-Limit überschritten! Bitte versuche es später nocheinmal.") == -1: self.fail(_("Downloadlimit reached")) else: soup = BeautifulSoup(src) @@ -156,7 +158,8 @@ class SerienjunkiesOrg(Crypter): for link in rawLinks: frameUrl = link["action"].replace("/go-", "/frame/go-") links.append(self.handleFrame(frameUrl)) - if re.search("#hasName", url) or ((self.getConfig("changeNameSJ") == "Packagename") and (self.getConfig("changeNameDJ") == "Packagename")): + if re.search("#hasName", url) or ((self.getConfig("changeNameSJ") == "Packagename") and + (self.getConfig("changeNameDJ") == "Packagename")): self.core.files.addLinks(links, self.pyfile.package().id) else: if h1.text[2] == "_": @@ -164,7 +167,6 @@ class SerienjunkiesOrg(Crypter): else: eName = h1.text self.packages.append((eName, links, eName)) - def handleOldStyleLink(self, url): sj = self.req.load(str(url)) @@ -177,7 +179,7 @@ class SerienjunkiesOrg(Crypter): sinp = form.find(attrs={"name": "s"}) self.req.load(str(url), post={'s': sinp["value"], 'c': result, 'dl.start': "Download"}, cookies=False, - just_header=True) + just_header=True) decrypted = self.req.lastEffectiveURL if decrypted == str(url): self.retry() @@ -220,15 +222,16 @@ class SerienjunkiesOrg(Crypter): elif re.search("<strong>Download:", str(p)): parts = str(p).split("<br />") if re.search("<strong>", parts[0]): - ename = re.search('<strong>(.*?)</strong>',parts[0]).group(1).strip().decode("utf-8").replace("–", "-") + ename = re.search('<strong>(.*?)</strong>', parts[0]).group(1).strip().decode("utf-8").replace( + "–", "-") groups[gid]["ep"][ename] = {} parts.remove(parts[0]) for part in parts: - hostername = re.search(" \| ([-a-zA-Z0-9]+\.\w+)",part) + hostername = re.search(r" \| ([-a-zA-Z0-9]+\.\w+)", part) if hostername: hostername = hostername.group(1) groups[gid]["ep"][ename][hostername] = [] - links = re.findall('href="(.*?)"',part) + links = re.findall('href="(.*?)"', part) for link in links: groups[gid]["ep"][ename][hostername].append(link + "#hasName") @@ -248,12 +251,6 @@ class SerienjunkiesOrg(Crypter): elif (self.getConfig("changeNameDJ") == "Show") or not re.search("#hasName", url): self.packages.append((seasonName, links, seasonName)) - - - - - - def handleCategoryDJ(self, url): package_links = [] src = self.getSJSrc(url) @@ -269,7 +266,7 @@ class SerienjunkiesOrg(Crypter): episodePattern = re.compile("^http://download.serienjunkies.org/f-.*?.html(#hasName)?$") oldStyleLink = re.compile("^http://serienjunkies.org/safe/(.*)$") categoryPatternDJ = re.compile("^http://dokujunkies.org/.*?(.*)$") - showPatternDJ = re.compile("^http://dokujunkies.org/.*?/(.*)\.html(#hasName)?$") + showPatternDJ = re.compile(r"^http://dokujunkies.org/.*?/(.*)\.html(#hasName)?$") framePattern = re.compile("^http://download.(serienjunkies.org|dokujunkies.org)/frame/go-.*?/$") url = pyfile.url if framePattern.match(url): @@ -289,33 +286,35 @@ class SerienjunkiesOrg(Crypter): #selects the preferred hoster, after that selects any hoster (ignoring the one to ignore) def getpreferred(self, hosterlist): - + result = [] - preferredList = self.getConfig("hosterList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',') - if (self.getConfig("randomPreferred") == True) and (self.getConfig("hosterListMode") in ["OnlyOne","OnlyPreferred(One)"]) : + preferredList = self.getConfig("hosterList").strip().lower().replace( + '|', ',').replace('.', '').replace(';', ',').split(',') + if (self.getConfig("randomPreferred") is True) and ( + self.getConfig("hosterListMode") in ["OnlyOne", "OnlyPreferred(One)"]): random.shuffle(preferredList) - # we don't want hosters be read two times + # we don't want hosters be read two times hosterlist2 = hosterlist.copy() - + for preferred in preferredList: for Hoster in hosterlist: - if preferred == Hoster.lower().replace('.',''): + if preferred == Hoster.lower().replace('.', ''): for Part in hosterlist[Hoster]: self.logDebug("selected " + Part) result.append(str(Part)) - del(hosterlist2[Hoster]) - if (self.getConfig("hosterListMode") in ["OnlyOne","OnlyPreferred(One)"]): + del (hosterlist2[Hoster]) + if self.getConfig("hosterListMode") in ["OnlyOne", "OnlyPreferred(One)"]: return result - - - ignorelist = self.getConfig("ignoreList").strip().lower().replace('|',',').replace('.','').replace(';',',').split(',') - if self.getConfig('hosterListMode') in ["OnlyOne","All"]: + + ignorelist = self.getConfig("ignoreList").strip().lower().replace( + '|', ',').replace('.', '').replace(';', ',').split(',') + if self.getConfig('hosterListMode') in ["OnlyOne", "All"]: for Hoster in hosterlist2: - if Hoster.strip().lower().replace('.','') not in ignorelist: + if Hoster.strip().lower().replace('.', '') not in ignorelist: for Part in hosterlist2[Hoster]: self.logDebug("selected2 " + Part) result.append(str(Part)) - + if self.getConfig('hosterListMode') == "OnlyOne": return result return result diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index 1ffa5d41a..09ac21873 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -1,269 +1,269 @@ -# -*- coding: utf-8 -*-
-
-from Crypto.Cipher import AES
-from module.plugins.Crypter import Crypter
-from module.plugins.ReCaptcha import ReCaptcha
-import base64
-import binascii
-import re
-
-
-class ShareLinksBiz(Crypter):
- __name__ = "ShareLinksBiz"
- __type__ = "crypter"
- __pattern__ = r"(?P<base>http://[\w\.]*?(share-links|s2l)\.biz)/(?P<id>_?[0-9a-z]+)(/.*)?"
- __version__ = "1.12"
- __description__ = """Share-Links.biz Crypter"""
- __author_name__ = ("fragonib")
- __author_mail__ = ("fragonib[AT]yahoo[DOT]es")
-
-
- def setup(self):
- self.baseUrl = None
- self.fileId = None
- self.package = None
- self.html = None
- self.captcha = False
-
- def decrypt(self, pyfile):
-
- # Init
- self.initFile(pyfile)
-
- # Request package
- url = self.baseUrl + '/' + self.fileId
- self.html = self.load(url, decode=True)
-
- # Unblock server (load all images)
- self.unblockServer()
-
- # Check for protection
- if self.isPasswordProtected():
- self.unlockPasswordProtection()
- self.handleErrors()
-
- if self.isCaptchaProtected():
- self.captcha = True
- self.unlockCaptchaProtection()
- self.handleErrors()
-
- # Extract package links
- package_links = []
- package_links.extend(self.handleWebLinks())
- package_links.extend(self.handleContainers())
- package_links.extend(self.handleCNL2())
- package_links = set(package_links)
-
- # Get package info
- package_name, package_folder = self.getPackageInfo()
-
- # Pack
- self.packages = [(package_name, package_links, package_folder)]
-
- def initFile(self, pyfile):
- url = pyfile.url
- if 's2l.biz' in url:
- url = self.load(url, just_header=True)['location']
- self.baseUrl = re.search(self.__pattern__, url).group(1)
- self.fileId = re.match(self.__pattern__, url).group('id')
- self.package = pyfile.package()
-
- def isOnline(self):
- if "No usable content was found" in self.html:
- self.logDebug("File not found")
- return False
- return True
-
- def isPasswordProtected(self):
- if re.search(r'''<form.*?id="passwordForm".*?>''', self.html):
- self.logDebug("Links are protected")
- return True
- return False
-
- def isCaptchaProtected(self):
- if '<map id="captchamap"' in self.html:
- self.logDebug("Links are captcha protected")
- return True
- return False
-
- def unblockServer(self):
- imgs = re.findall("(/template/images/.*?\.gif)", self.html)
- for img in imgs:
- self.load(self.baseUrl + img)
-
- def unlockPasswordProtection(self):
- password = self.getPassword()
- self.logDebug("Submitting password [%s] for protected links" % password)
- post = {"password": password, 'login': 'Submit form'}
- url = self.baseUrl + '/' + self.fileId
- self.html = self.load(url, post=post, decode=True)
-
- def unlockCaptchaProtection(self):
- # Get captcha map
- captchaMap = self._getCaptchaMap()
- self.logDebug("Captcha map with [%d] positions" % len(captchaMap.keys()))
-
- # Request user for captcha coords
- m = re.search(r'<img src="/captcha.gif\?d=(.*?)&PHPSESSID=(.*?)&legend=1"', self.html)
- captchaUrl = self.baseUrl + '/captcha.gif?d=%s&PHPSESSID=%s' % (m.group(1), m.group(2))
- self.logDebug("Waiting user for correct position")
- coords = self.decryptCaptcha(captchaUrl, forceUser=True, imgtype="gif", result_type='positional')
- self.logDebug("Captcha resolved, coords [%s]" % str(coords))
-
- # Resolve captcha
- href = self._resolveCoords(coords, captchaMap)
- if href is None:
- self.logDebug("Invalid captcha resolving, retrying")
- self.invalidCaptcha()
- self.setWait(5, False)
- self.wait()
- self.retry()
- url = self.baseUrl + href
- self.html = self.load(url, decode=True)
-
- def _getCaptchaMap(self):
- map = {}
- for m in re.finditer(r'<area shape="rect" coords="(.*?)" href="(.*?)"', self.html):
- rect = eval('(' + m.group(1) + ')')
- href = m.group(2)
- map[rect] = href
- return map
-
- def _resolveCoords(self, coords, captchaMap):
- x, y = coords
- for rect, href in captchaMap.items():
- x1, y1, x2, y2 = rect
- if (x>=x1 and x<=x2) and (y>=y1 and y<=y2):
- return href
-
- def handleErrors(self):
- if "The inserted password was wrong" in self.html:
- self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry")
- self.fail("Incorrect password, please set right password on 'Edit package' form and retry")
-
- if self.captcha:
- if "Your choice was wrong" in self.html:
- self.logDebug("Invalid captcha, retrying")
- self.invalidCaptcha()
- self.setWait(5)
- self.wait()
- self.retry()
- else:
- self.correctCaptcha()
-
- def getPackageInfo(self):
- name = folder = None
-
- # Extract from web package header
- title_re = r'<h2><img.*?/>(.*)</h2>'
- m = re.search(title_re, self.html, re.DOTALL)
- if m is not None:
- title = m.group(1).strip()
- if 'unnamed' not in title:
- name = folder = title
- self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
-
- # Fallback to defaults
- if not name or not folder:
- name = self.package.name
- folder = self.package.folder
- self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))
-
- # Return package info
- return name, folder
-
- def handleWebLinks(self):
- package_links = []
- self.logDebug("Handling Web links")
-
- #@TODO: Gather paginated web links
- pattern = r"javascript:_get\('(.*?)', \d+, ''\)"
- ids = re.findall(pattern, self.html)
- self.logDebug("Decrypting %d Web links" % len(ids))
- for i, id in enumerate(ids):
- try:
- self.logDebug("Decrypting Web link %d, [%s]" % (i+1, id))
- dwLink = self.baseUrl + "/get/lnk/" + id
- response = self.load(dwLink)
- code = re.search(r'frm/(\d+)', response).group(1)
- fwLink = self.baseUrl + "/get/frm/" + code
- response = self.load(fwLink)
- jscode = re.search(r'<script language="javascript">\s*eval\((.*)\)\s*</script>', response, re.DOTALL).group(1)
- jscode = self.js.eval("f = %s" % jscode)
- jslauncher = "window=''; parent={frames:{Main:{location:{href:''}}},location:''}; %s; parent.frames.Main.location.href"
- dlLink = self.js.eval(jslauncher % jscode)
- self.logDebug("JsEngine returns value [%s] for redirection link" % dlLink)
- package_links.append(dlLink)
- except Exception, detail:
- self.logDebug("Error decrypting Web link [%s], %s" % (id, detail))
- return package_links
-
- def handleContainers(self):
- package_links = []
- self.logDebug("Handling Container links")
-
- pattern = r"javascript:_get\('(.*?)', 0, '(rsdf|ccf|dlc)'\)"
- containersLinks = re.findall(pattern, self.html)
- self.logDebug("Decrypting %d Container links" % len(containersLinks))
- for containerLink in containersLinks:
- link = "%s/get/%s/%s" % (self.baseUrl, containerLink[1], containerLink[0])
- package_links.append(link)
- return package_links
-
- def handleCNL2(self):
- package_links = []
- self.logDebug("Handling CNL2 links")
-
- if '/lib/cnl2/ClicknLoad.swf' in self.html:
- try:
- (crypted, jk) = self._getCipherParams()
- package_links.extend(self._getLinks(crypted, jk))
- except:
- self.fail("Unable to decrypt CNL2 links")
- return package_links
-
- def _getCipherParams(self):
-
- # Request CNL2
- code = re.search(r'ClicknLoad.swf\?code=(.*?)"', self.html).group(1)
- url = "%s/get/cnl2/%s" % (self.baseUrl, code)
- response = self.load(url)
- params = response.split(";;")
-
- # Get jk
- strlist = list(base64.standard_b64decode(params[1]))
- strlist.reverse()
- jk = ''.join(strlist)
-
- # Get crypted
- strlist = list(base64.standard_b64decode(params[2]))
- strlist.reverse()
- crypted = ''.join(strlist)
-
- # Log and return
- return crypted, jk
-
- def _getLinks(self, crypted, jk):
-
- # Get key
- jreturn = self.js.eval("%s f()" % jk)
- self.logDebug("JsEngine returns value [%s]" % jreturn)
- key = binascii.unhexlify(jreturn)
-
- # Decode crypted
- crypted = base64.standard_b64decode(crypted)
-
- # Decrypt
- Key = key
- IV = key
- obj = AES.new(Key, AES.MODE_CBC, IV)
- text = obj.decrypt(crypted)
-
- # Extract links
- text = text.replace("\x00", "").replace("\r", "")
- links = text.split("\n")
- links = filter(lambda x: x != "", links)
-
- # Log and return
- self.logDebug("Block has %d links" % len(links))
- return links
\ No newline at end of file +# -*- coding: utf-8 -*- + +import base64 +import binascii +import re + +from Crypto.Cipher import AES +from module.plugins.Crypter import Crypter + + +class ShareLinksBiz(Crypter): + __name__ = "ShareLinksBiz" + __type__ = "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") + + def setup(self): + self.baseUrl = None + self.fileId = None + self.package = None + self.html = None + self.captcha = False + + def decrypt(self, pyfile): + + # Init + self.initFile(pyfile) + + # Request package + url = self.baseUrl + '/' + self.fileId + self.html = self.load(url, decode=True) + + # Unblock server (load all images) + self.unblockServer() + + # Check for protection + if self.isPasswordProtected(): + self.unlockPasswordProtection() + self.handleErrors() + + if self.isCaptchaProtected(): + self.captcha = True + self.unlockCaptchaProtection() + self.handleErrors() + + # Extract package links + package_links = [] + package_links.extend(self.handleWebLinks()) + package_links.extend(self.handleContainers()) + package_links.extend(self.handleCNL2()) + package_links = set(package_links) + + # Get package info + package_name, package_folder = self.getPackageInfo() + + # Pack + self.packages = [(package_name, package_links, package_folder)] + + def initFile(self, pyfile): + url = pyfile.url + if 's2l.biz' in url: + url = self.load(url, just_header=True)['location'] + self.baseUrl = re.search(self.__pattern__, url).group(1) + self.fileId = re.match(self.__pattern__, url).group('id') + self.package = pyfile.package() + + def isOnline(self): + if "No usable content was found" in self.html: + self.logDebug("File not found") + return False + return True + + def isPasswordProtected(self): + if re.search(r'''<form.*?id="passwordForm".*?>''', self.html): + self.logDebug("Links are protected") + return True + return False + + def isCaptchaProtected(self): + if '<map id="captchamap"' in self.html: + self.logDebug("Links are captcha protected") + return True + return False + + def unblockServer(self): + imgs = re.findall(r"(/template/images/.*?\.gif)", self.html) + for img in imgs: + self.load(self.baseUrl + img) + + def unlockPasswordProtection(self): + password = self.getPassword() + self.logDebug("Submitting password [%s] for protected links" % password) + post = {"password": password, 'login': 'Submit form'} + url = self.baseUrl + '/' + self.fileId + self.html = self.load(url, post=post, decode=True) + + def unlockCaptchaProtection(self): + # Get captcha map + captchaMap = self._getCaptchaMap() + self.logDebug("Captcha map with [%d] positions" % len(captchaMap.keys())) + + # Request user for captcha coords + m = re.search(r'<img src="/captcha.gif\?d=(.*?)&PHPSESSID=(.*?)&legend=1"', self.html) + captchaUrl = self.baseUrl + '/captcha.gif?d=%s&PHPSESSID=%s' % (m.group(1), m.group(2)) + self.logDebug("Waiting user for correct position") + coords = self.decryptCaptcha(captchaUrl, forceUser=True, imgtype="gif", result_type='positional') + self.logDebug("Captcha resolved, coords [%s]" % str(coords)) + + # Resolve captcha + href = self._resolveCoords(coords, captchaMap) + if href is None: + self.logDebug("Invalid captcha resolving, retrying") + self.invalidCaptcha() + self.setWait(5, False) + self.wait() + self.retry() + url = self.baseUrl + href + self.html = self.load(url, decode=True) + + def _getCaptchaMap(self): + mapp = {} + for m in re.finditer(r'<area shape="rect" coords="(.*?)" href="(.*?)"', self.html): + rect = eval('(' + m.group(1) + ')') + href = m.group(2) + mapp[rect] = href + return mapp + + def _resolveCoords(self, coords, captchaMap): + x, y = coords + for rect, href in captchaMap.items(): + x1, y1, x2, y2 = rect + if (x >= x1 and x <= x2) and (y >= y1 and y <= y2): + return href + + def handleErrors(self): + if "The inserted password was wrong" in self.html: + self.logDebug("Incorrect password, please set right password on 'Edit package' form and retry") + self.fail("Incorrect password, please set right password on 'Edit package' form and retry") + + if self.captcha: + if "Your choice was wrong" in self.html: + self.logDebug("Invalid captcha, retrying") + self.invalidCaptcha() + self.setWait(5) + self.wait() + self.retry() + else: + self.correctCaptcha() + + def getPackageInfo(self): + name = folder = None + + # Extract from web package header + title_re = r'<h2><img.*?/>(.*)</h2>' + m = re.search(title_re, self.html, re.DOTALL) + if m is not None: + title = m.group(1).strip() + if 'unnamed' not in title: + name = folder = title + self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder)) + + # Fallback to defaults + if not name or not folder: + name = self.package.name + folder = self.package.folder + self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) + + # Return package info + return name, folder + + def handleWebLinks(self): + package_links = [] + self.logDebug("Handling Web links") + + #@TODO: Gather paginated web links + pattern = r"javascript:_get\('(.*?)', \d+, ''\)" + ids = re.findall(pattern, self.html) + self.logDebug("Decrypting %d Web links" % len(ids)) + for i, ID in enumerate(ids): + try: + self.logDebug("Decrypting Web link %d, [%s]" % (i + 1, ID)) + dwLink = self.baseUrl + "/get/lnk/" + ID + response = self.load(dwLink) + code = re.search(r'frm/(\d+)', response).group(1) + fwLink = self.baseUrl + "/get/frm/" + code + response = self.load(fwLink) + jscode = re.search(r'<script language="javascript">\s*eval\((.*)\)\s*</script>', response, + re.DOTALL).group(1) + jscode = self.js.eval("f = %s" % jscode) + jslauncher = "window=''; parent={frames:{Main:{location:{href:''}}},location:''}; %s; parent.frames.Main.location.href" + dlLink = self.js.eval(jslauncher % jscode) + self.logDebug("JsEngine returns value [%s] for redirection link" % dlLink) + package_links.append(dlLink) + except Exception, detail: + self.logDebug("Error decrypting Web link [%s], %s" % (ID, detail)) + return package_links + + def handleContainers(self): + package_links = [] + self.logDebug("Handling Container links") + + pattern = r"javascript:_get\('(.*?)', 0, '(rsdf|ccf|dlc)'\)" + containersLinks = re.findall(pattern, self.html) + self.logDebug("Decrypting %d Container links" % len(containersLinks)) + for containerLink in containersLinks: + link = "%s/get/%s/%s" % (self.baseUrl, containerLink[1], containerLink[0]) + package_links.append(link) + return package_links + + def handleCNL2(self): + package_links = [] + self.logDebug("Handling CNL2 links") + + if '/lib/cnl2/ClicknLoad.swf' in self.html: + try: + (crypted, jk) = self._getCipherParams() + package_links.extend(self._getLinks(crypted, jk)) + except: + self.fail("Unable to decrypt CNL2 links") + return package_links + + def _getCipherParams(self): + + # Request CNL2 + code = re.search(r'ClicknLoad.swf\?code=(.*?)"', self.html).group(1) + url = "%s/get/cnl2/%s" % (self.baseUrl, code) + response = self.load(url) + params = response.split(";;") + + # Get jk + strlist = list(base64.standard_b64decode(params[1])) + strlist.reverse() + jk = ''.join(strlist) + + # Get crypted + strlist = list(base64.standard_b64decode(params[2])) + strlist.reverse() + crypted = ''.join(strlist) + + # Log and return + return crypted, jk + + def _getLinks(self, crypted, jk): + + # Get key + jreturn = self.js.eval("%s f()" % jk) + self.logDebug("JsEngine returns value [%s]" % jreturn) + key = binascii.unhexlify(jreturn) + + # Decode crypted + crypted = base64.standard_b64decode(crypted) + + # Decrypt + Key = key + IV = key + obj = AES.new(Key, AES.MODE_CBC, IV) + text = obj.decrypt(crypted) + + # Extract links + text = text.replace("\x00", "").replace("\r", "") + links = text.split("\n") + links = filter(lambda x: x != "", links) + + # Log and return + self.logDebug("Block has %d links" % len(links)) + return links diff --git a/module/plugins/crypter/ShareRapidComFolder.py b/module/plugins/crypter/ShareRapidComFolder.py index cb7f37525..951c09d45 100644 --- a/module/plugins/crypter/ShareRapidComFolder.py +++ b/module/plugins/crypter/ShareRapidComFolder.py @@ -2,13 +2,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter + class ShareRapidComFolder(SimpleCrypter): __name__ = "ShareRapidComFolder" __type__ = "crypter" - __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/.+)" + __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") - LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
\ No newline at end of file + LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">' diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py index f85ede6f3..8223eb7b9 100644 --- a/module/plugins/crypter/SpeedLoadOrgFolder.py +++ b/module/plugins/crypter/SpeedLoadOrgFolder.py @@ -17,6 +17,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter + class SpeedLoadOrgFolder(SimpleCrypter): __name__ = "SpeedLoadOrgFolder" __type__ = "crypter" diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py index cf7a79e9b..45a14f5a2 100644 --- a/module/plugins/crypter/StealthTo.py +++ b/module/plugins/crypter/StealthTo.py @@ -5,6 +5,7 @@ import re from module.plugins.Crypter import Crypter + class StealthTo(Crypter): __name__ = "StealthTo" __type__ = "container" @@ -29,17 +30,20 @@ class StealthTo(Crypter): self.html = self.req.load(url, cookies=True) temp_links = [] ids = [] - ats = [] # authenticity_token + ats = [] # authenticity_token inputs = re.findall(r"(<(input|form)[^>]+)", self.html) for input in inputs: - if re.search(r"name=\"authenticity_token\"",input[0]): + if re.search(r"name=\"authenticity_token\"", input[0]): ats.append(re.search(r"value=\"([^\"]+)", input[0]).group(1)) - if re.search(r"name=\"id\"",input[0]): + if re.search(r"name=\"id\"", input[0]): ids.append(re.search(r"value=\"([^\"]+)", input[0]).group(1)) - + for i in range(0, len(ids)): - self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": ("download_" + str(ids[i]))}, cookies=True) - new_html = self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": "1"}, cookies=True) + self.req.load(url + "/web", + post={"authenticity_token": ats[i], "id": str(ids[i]), "link": ("download_" + str(ids[i]))}, + cookies=True) + new_html = self.req.load(url + "/web", post={"authenticity_token": ats[i], "id": str(ids[i]), "link": "1"}, + cookies=True) temp_links.append(re.search(r"iframe src=\"(.*)\" frameborder", new_html).group(1)) self.links = temp_links diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py index 43a4fcce5..b55c8d219 100644 --- a/module/plugins/crypter/TrailerzoneInfo.py +++ b/module/plugins/crypter/TrailerzoneInfo.py @@ -3,6 +3,7 @@ import re from module.plugins.Crypter import Crypter + class TrailerzoneInfo(Crypter): __name__ = "TrailerzoneInfo" __type__ = "crypter" @@ -24,22 +25,22 @@ class TrailerzoneInfo(Crypter): self.handleGo(url) def handleProtect(self, url): - self.handleGo("http://trailerzone.info/go.html#:::" + url.split("#:::",1)[1]) + self.handleGo("http://trailerzone.info/go.html#:::" + url.split("#:::", 1)[1]) def handleGo(self, url): - + src = self.req.load(str(url)) pattern = re.compile(self.JS_KEY_PATTERN, re.DOTALL) found = re.search(pattern, src) - + # Get package info - package_links = [] + package_links = [] try: - result = self.js.eval(found.group(1) + " decodeLink('" + url.split("#:::",1)[1] + "');") + result = self.js.eval(found.group(1) + " decodeLink('" + url.split("#:::", 1)[1] + "');") result = str(result) self.logDebug("RESULT: %s" % result) package_links.append(result) self.core.files.addLinks(package_links, self.pyfile.package().id) except Exception, e: - self.logDebug(e) + self.logDebug(e) self.fail('Could not extract any links by javascript') diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index 814d5240d..a5ccfc753 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -3,6 +3,7 @@ import re from module.plugins.Crypter import Crypter + class UlozToFolder(Crypter): __name__ = "UlozToFolder" __type__ = "crypter" @@ -20,10 +21,11 @@ class UlozToFolder(Crypter): html = self.load(self.pyfile.url) new_links = [] - for i in range(1,100): + for i in range(1, 100): self.logInfo("Fetching links from page %i" % i) found = re.search(self.FOLDER_PATTERN, html, re.DOTALL) - if found is None: self.fail("Parse error (FOLDER)") + if found is None: + self.fail("Parse error (FOLDER)") new_links.extend(re.findall(self.LINK_PATTERN, found.group(1))) found = re.search(self.NEXT_PAGE_PATTERN, html) @@ -35,6 +37,6 @@ class UlozToFolder(Crypter): self.logInfo("Limit of 99 pages reached, aborting") if new_links: - self.core.files.addLinks(map(lambda s:"http://ulozto.net/%s" % s, new_links), self.pyfile.package().id) + self.core.files.addLinks(map(lambda s: "http://ulozto.net/%s" % s, new_links), self.pyfile.package().id) else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py index c514f23d0..88d4e04e8 100644 --- a/module/plugins/crypter/UploadedToFolder.py +++ b/module/plugins/crypter/UploadedToFolder.py @@ -1,50 +1,50 @@ -# -*- 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/>. #
-############################################################################
-
-import re
-
-from module.plugins.internal.SimpleCrypter import SimpleCrypter
-
-
-class UploadedToFolder(SimpleCrypter):
- __name__ = "UploadedToFolder"
- __type__ = "crypter"
- __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)"
- __version__ = "0.3"
- __description__ = """UploadedTo Crypter Plugin"""
- __author_name__ = ("stickell")
- __author_mail__ = ("l.stickell@yahoo.it")
-
- PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick='
- TITLE_PATTERN = r'<title>(?P<title>[^<]+)</title>'
-
- def decrypt(self, pyfile):
- self.html = self.load(pyfile.url)
-
- package_name, folder_name = self.getPackageNameAndFolder()
-
- m = re.search(self.PLAIN_PATTERN, self.html)
- if m:
- plain_link = 'http://uploaded.net/' + m.group('plain')
- else:
- self.fail('Parse error - Unable to find plain url list')
-
- self.html = self.load(plain_link)
- package_links = self.html.split('\n')[:-1]
- self.logDebug('Package has %d links' % len(package_links))
-
- self.packages = [(package_name, package_links, folder_name)]
+# -*- 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/>. # +############################################################################ + +import re + +from module.plugins.internal.SimpleCrypter import SimpleCrypter + + +class UploadedToFolder(SimpleCrypter): + __name__ = "UploadedToFolder" + __type__ = "crypter" + __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)" + __version__ = "0.3" + __description__ = """UploadedTo Crypter Plugin""" + __author_name__ = ("stickell") + __author_mail__ = ("l.stickell@yahoo.it") + + PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick=' + TITLE_PATTERN = r'<title>(?P<title>[^<]+)</title>' + + def decrypt(self, pyfile): + self.html = self.load(pyfile.url) + + package_name, folder_name = self.getPackageNameAndFolder() + + m = re.search(self.PLAIN_PATTERN, self.html) + if m: + plain_link = 'http://uploaded.net/' + m.group('plain') + else: + self.fail('Parse error - Unable to find plain url list') + + self.html = self.load(plain_link) + package_links = self.html.split('\n')[:-1] + self.logDebug('Package has %d links' % len(package_links)) + + self.packages = [(package_name, package_links, folder_name)] diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py index 574a147c4..31c041bf0 100644 --- a/module/plugins/crypter/WiiReloadedOrg.py +++ b/module/plugins/crypter/WiiReloadedOrg.py @@ -1,52 +1,51 @@ -
-import re
-
-from module.plugins.Crypter import Crypter
-
-class WiiReloadedOrg(Crypter):
- __name__ = "WiiReloadedOrg"
- __type__ = "crypter"
- __pattern__ = r"http://www\.wii-reloaded\.org/protect/get\.php\?i=.+"
- __config__ = [("changeName", "bool", "Use Wii-Reloaded.org folder name", "True")]
- __version__ = "0.1"
- __description__ = """Wii-Reloaded.org Crypter Plugin"""
- __author_name__ = ("hzpz")
- __author_mail__ = ("none")
-
-
- def decrypt(self, pyfile):
- url = pyfile.url
- src = self.req.load(str(url))
-
- ids = re.findall(r"onClick=\"popup_dl\((.+)\)\"", src)
- if len(ids) == 0:
- self.fail("Unable to decrypt links, this plugin probably needs to be updated")
-
- packageName = self.pyfile.package().name
- if self.getConfig("changeName"):
- packageNameMatch = re.search(r"<div id=\"foldername\">(.+)</div>", src)
- if not packageNameMatch:
- self.logWarning("Unable to get folder name, this plugin probably needs to be updated")
- else:
- packageName = packageNameMatch.group(1)
-
- self.pyfile.package().password = "wii-reloaded.info"
-
- self.logDebug("Processing %d links" % len(ids))
- links = []
- for id in ids:
- self.req.lastURL = str(url)
- header = self.req.load("http://www.wii-reloaded.org/protect/hastesosiehtsaus.php?i=" + id, just_header=True)
- self.logDebug("Header:\n" + header)
- redirectLocationMatch = re.search(r"^Location: (.+)$", header, flags=re.MULTILINE)
- if not redirectLocationMatch:
- self.offline()
- redirectLocation = redirectLocationMatch.group(1)
- self.logDebug(len(redirectLocation))
- if not redirectLocation.startswith("http"):
- self.offline()
- self.logDebug("Decrypted link: %s" % redirectLocation)
- links.append(redirectLocation)
-
- self.logDebug("Decrypted %d links" % len(links))
- self.packages.append((packageName, links, packageName))
\ No newline at end of file +import re + +from module.plugins.Crypter import Crypter + + +class WiiReloadedOrg(Crypter): + __name__ = "WiiReloadedOrg" + __type__ = "crypter" + __pattern__ = r"http://www\.wii-reloaded\.org/protect/get\.php\?i=.+" + __config__ = [("changeName", "bool", "Use Wii-Reloaded.org folder name", "True")] + __version__ = "0.1" + __description__ = """Wii-Reloaded.org Crypter Plugin""" + __author_name__ = ("hzpz") + __author_mail__ = ("none") + + def decrypt(self, pyfile): + url = pyfile.url + src = self.req.load(str(url)) + + ids = re.findall(r"onClick=\"popup_dl\((.+)\)\"", src) + if len(ids) == 0: + self.fail("Unable to decrypt links, this plugin probably needs to be updated") + + packageName = self.pyfile.package().name + if self.getConfig("changeName"): + packageNameMatch = re.search(r"<div id=\"foldername\">(.+)</div>", src) + if not packageNameMatch: + self.logWarning("Unable to get folder name, this plugin probably needs to be updated") + else: + packageName = packageNameMatch.group(1) + + self.pyfile.package().password = "wii-reloaded.info" + + self.logDebug("Processing %d links" % len(ids)) + links = [] + for id in ids: + self.req.lastURL = str(url) + header = self.req.load("http://www.wii-reloaded.org/protect/hastesosiehtsaus.php?i=" + id, just_header=True) + self.logDebug("Header:\n" + header) + redirectLocationMatch = re.search(r"^Location: (.+)$", header, flags=re.MULTILINE) + if not redirectLocationMatch: + self.offline() + redirectLocation = redirectLocationMatch.group(1) + self.logDebug(len(redirectLocation)) + if not redirectLocation.startswith("http"): + self.offline() + self.logDebug("Decrypted link: %s" % redirectLocation) + links.append(redirectLocation) + + self.logDebug("Decrypted %d links" % len(links)) + self.packages.append((packageName, links, packageName)) diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py index 72b72aab7..b6178448d 100644 --- a/module/plugins/crypter/YoutubeBatch.py +++ b/module/plugins/crypter/YoutubeBatch.py @@ -8,6 +8,7 @@ from module.plugins.Crypter import Crypter API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" + class YoutubeBatch(Crypter): __name__ = "YoutubeBatch" __type__ = "container" @@ -18,7 +19,8 @@ class YoutubeBatch(Crypter): __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org", "zoidberg@mujmail.cz", "roland@enkore.de") def get_videos(self, playlist_id, token=None): - url = "https://www.googleapis.com/youtube/v3/playlistItems?playlistId=%s&part=snippet&key=%s&maxResults=50" % (playlist_id, API_KEY) + url = "https://www.googleapis.com/youtube/v3/playlistItems?playlistId=%s&part=snippet&key=%s&maxResults=50" % ( + playlist_id, API_KEY) if token: url += "&pageToken=" + token diff --git a/module/plugins/hooks/AlldebridCom.py b/module/plugins/hooks/AlldebridCom.py index 6818b8c43..d0e9b1f77 100644 --- a/module/plugins/hooks/AlldebridCom.py +++ b/module/plugins/hooks/AlldebridCom.py @@ -5,6 +5,7 @@ from module.network.RequestFactory import getURL from module.plugins.internal.MultiHoster import MultiHoster + class AlldebridCom(MultiHoster): __name__ = "AlldebridCom" __version__ = "0.13" @@ -23,6 +24,6 @@ class AlldebridCom(MultiHoster): def getHoster(self): https = "https" if self.getConfig("https") else "http" - page = getURL(https + "://www.alldebrid.com/api.php?action=get_host").replace("\"","").strip() - + page = getURL(https + "://www.alldebrid.com/api.php?action=get_host").replace("\"", "").strip() + return [x.strip() for x in page.split(",") if x.strip()] diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py index e24a439af..bd718ea7e 100644 --- a/module/plugins/hooks/BypassCaptcha.py +++ b/module/plugins/hooks/BypassCaptcha.py @@ -26,6 +26,7 @@ from module.plugins.Hook import Hook PYLOAD_KEY = "4f771155b640970d5607f919a615bdefc67e7d32" + class BypassCaptchaException(Exception): def __init__(self, err): self.err = err @@ -39,6 +40,7 @@ class BypassCaptchaException(Exception): def __repr__(self): return "<BypassCaptchaException %s>" % self.err + class BypassCaptcha(Hook): __name__ = "BypassCaptcha" __version__ = "0.04" @@ -57,13 +59,10 @@ class BypassCaptcha(Hook): self.info = {} def getCredits(self): - response = getURL(self.GETCREDITS_URL, - post = {"key": self.getConfig("passkey")} - ) - - data = dict([x.split(' ',1) for x in response.splitlines()]) + response = getURL(self.GETCREDITS_URL, post={"key": self.getConfig("passkey")}) + + data = dict([x.split(' ', 1) for x in response.splitlines()]) return int(data['Left']) - def submit(self, captcha, captchaType="file", match=None): req = getRequest() @@ -72,39 +71,36 @@ class BypassCaptcha(Hook): req.c.setopt(LOW_SPEED_TIME, 80) try: - response = req.load(self.SUBMIT_URL, - post={"vendor_key": PYLOAD_KEY, - "key": self.getConfig("passkey"), - "gen_task_id": "1", - "file": (FORM_FILE, captcha)}, - multipart=True) + response = req.load(self.SUBMIT_URL, + post={"vendor_key": PYLOAD_KEY, + "key": self.getConfig("passkey"), + "gen_task_id": "1", + "file": (FORM_FILE, captcha)}, + multipart=True) finally: req.close() - data = dict([x.split(' ',1) for x in response.splitlines()]) + data = dict([x.split(' ', 1) for x in response.splitlines()]) if not data or "Value" not in data: raise BypassCaptchaException(response) - + result = data['Value'] ticket = data['TaskId'] - self.logDebug("result %s : %s" % (ticket,result)) + self.logDebug("result %s : %s" % (ticket, result)) return ticket, result def respond(self, ticket, success): try: - response = getURL(self.RESPOND_URL, - post={"task_id": ticket, - "key": self.getConfig("passkey"), - "cv": 1 if success else 0} - ) + response = getURL(self.RESPOND_URL, post={"task_id": ticket, "key": self.getConfig("passkey"), + "cv": 1 if success else 0}) except BadHeader, e: self.logError("Could not send response.", str(e)) def newCaptchaTask(self, task): if "service" in task.data: return False - + if not task.isTextual(): return False @@ -140,4 +136,4 @@ class BypassCaptcha(Hook): return task.data["ticket"] = ticket - task.setResult(result)
\ No newline at end of file + task.setResult(result) diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py index 755e2519a..e13f93dec 100755 --- a/module/plugins/hooks/Captcha9kw.py +++ b/module/plugins/hooks/Captcha9kw.py @@ -1,163 +1,165 @@ -# -*- 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: mkaay, RaNaN, zoidberg
-"""
-from __future__ import with_statement
-
-from thread import start_new_thread
-from base64 import b64encode
-import cStringIO
-import pycurl
-import time
-
-from module.network.RequestFactory import getURL, getRequest
-from module.network.HTTPRequest import BadHeader
-
-from module.plugins.Hook import Hook
-
-class Captcha9kw(Hook):
- __name__ = "Captcha9kw"
- __version__ = "0.06"
- __description__ = """send captchas to 9kw.eu"""
- __config__ = [("activated", "bool", "Activated", False),
- ("force", "bool", "Force CT even if client is connected", True),
- ("https", "bool", "Enable HTTPS", "False"),
- ("confirm", "bool", "Confirm Captcha (Cost +6)", "False"),
- ("captchaperhour", "int", "Captcha per hour (max. 9999)", "9999"),
- ("prio", "int", "Prio 1-10 (Cost +1-10)", "0"),
- ("timeout", "int", "Timeout (max. 300)", "220"),
- ("passkey", "password", "API key", ""),]
- __author_name__ = ("RaNaN")
- __author_mail__ = ("RaNaN@pyload.org")
-
- API_URL = "://www.9kw.eu/index.cgi"
-
- def setup(self):
- self.API_URL = "https"+self.API_URL if self.getConfig("https") else "http"+self.API_URL
- self.info = {}
-
- def getCredits(self):
- response = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "pyload": "1", "source": "pyload", "action": "usercaptchaguthaben" })
-
- if response.isdigit():
- self.logInfo(_("%s credits left") % response)
- self.info["credits"] = credits = int(response)
- return credits
- else:
- self.logError(response)
- return 0
-
- def processCaptcha(self, task):
- result = None
-
- with open(task.captchaFile, 'rb') as f:
- data = f.read()
- data = b64encode(data)
- self.logDebug("%s : %s" % (task.captchaFile, data))
- if task.isPositional():
- mouse = 1
- else:
- mouse = 0
-
- response = getURL(self.API_URL, post = {
- "apikey": self.getConfig("passkey"),
- "prio": self.getConfig("prio"),
- "confirm": self.getConfig("confirm"),
- "captchaperhour": self.getConfig("captchaperhour"),
- "maxtimeout": self.getConfig("timeout"),
- "pyload": "1",
- "source": "pyload",
- "base64": "1",
- "mouse": mouse,
- "file-upload-01": data,
- "action": "usercaptchaupload" })
-
- if response.isdigit():
- self.logInfo(_("NewCaptchaID from upload: %s : %s" % (response,task.captchaFile)))
-
- for i in range(1, 100, 1):
- response2 = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "id": response,"pyload": "1","source": "pyload", "action": "usercaptchacorrectdata" })
-
- if(response2 != ""):
- break;
-
- time.sleep(3)
-
- result = response2
- task.data["ticket"] = response
- self.logInfo("result %s : %s" % (response, result))
- task.setResult(result)
- else:
- self.logError("Bad upload: %s" % response)
- return False
-
- def newCaptchaTask(self, task):
- if not task.isTextual() and not task.isPositional():
- return False
-
- if not self.getConfig("passkey"):
- return False
-
- if self.core.isClientConnected() and not self.getConfig("force"):
- return False
-
- if self.getCredits() > 0:
- task.handler.append(self)
- task.setWaiting(self.getConfig("timeout"))
- start_new_thread(self.processCaptcha, (task,))
-
- else:
- self.logError(_("Your Captcha 9kw.eu Account has not enough credits"))
-
- def captchaCorrect(self, task):
- if "ticket" in task.data:
-
- try:
- response = getURL(self.API_URL,
- post={ "action": "usercaptchacorrectback",
- "apikey": self.getConfig("passkey"),
- "api_key": self.getConfig("passkey"),
- "correct": "1",
- "pyload": "1",
- "source": "pyload",
- "id": task.data["ticket"] }
- )
- self.logInfo("Request correct: %s" % response)
-
- except BadHeader, e:
- self.logError("Could not send correct request.", str(e))
- else:
- self.logError("No CaptchaID for correct request (task %s) found." % task)
-
- def captchaInvalid(self, task):
- if "ticket" in task.data:
-
- try:
- response = getURL(self.API_URL,
- post={ "action": "usercaptchacorrectback",
- "apikey": self.getConfig("passkey"),
- "api_key": self.getConfig("passkey"),
- "correct": "2",
- "pyload": "1",
- "source": "pyload",
- "id": task.data["ticket"] }
- )
- self.logInfo("Request refund: %s" % response)
-
- except BadHeader, e:
- self.logError("Could not send refund request.", str(e))
- else:
- self.logError("No CaptchaID for not correct request (task %s) found." % task)
+# -*- 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: mkaay, RaNaN, zoidberg +""" +from __future__ import with_statement + +from thread import start_new_thread +from base64 import b64encode +import cStringIO +import pycurl +import time + +from module.network.RequestFactory import getURL, getRequest +from module.network.HTTPRequest import BadHeader + +from module.plugins.Hook import Hook + + +class Captcha9kw(Hook): + __name__ = "Captcha9kw" + __version__ = "0.07" + __description__ = """send captchas to 9kw.eu""" + __config__ = [("activated", "bool", "Activated", False), + ("force", "bool", "Force CT even if client is connected", True), + ("https", "bool", "Enable HTTPS", "False"), + ("confirm", "bool", "Confirm Captcha (Cost +6)", "False"), + ("captchaperhour", "int", "Captcha per hour (max. 9999)", "9999"), + ("prio", "int", "Prio 1-10 (Cost +1-10)", "0"), + ("timeout", "int", "Timeout (max. 300)", "220"), + ("passkey", "password", "API key", ""), ] + __author_name__ = ("RaNaN") + __author_mail__ = ("RaNaN@pyload.org") + + API_URL = "://www.9kw.eu/index.cgi" + + def setup(self): + self.API_URL = "https" + self.API_URL if self.getConfig("https") else "http" + self.API_URL + self.info = {} + + def getCredits(self): + response = getURL(self.API_URL, get={"apikey": self.getConfig("passkey"), "pyload": "1", "source": "pyload", + "action": "usercaptchaguthaben"}) + + if response.isdigit(): + self.logInfo(_("%s credits left") % response) + self.info["credits"] = credits = int(response) + return credits + else: + self.logError(response) + return 0 + + def processCaptcha(self, task): + result = None + + with open(task.captchaFile, 'rb') as f: + data = f.read() + data = b64encode(data) + self.logDebug("%s : %s" % (task.captchaFile, data)) + if task.isPositional(): + mouse = 1 + else: + mouse = 0 + + response = getURL(self.API_URL, post={ + "apikey": self.getConfig("passkey"), + "prio": self.getConfig("prio"), + "confirm": self.getConfig("confirm"), + "captchaperhour": self.getConfig("captchaperhour"), + "maxtimeout": self.getConfig("timeout"), + "pyload": "1", + "source": "pyload", + "base64": "1", + "mouse": mouse, + "file-upload-01": data, + "action": "usercaptchaupload"}) + + if response.isdigit(): + self.logInfo(_("New CaptchaID from upload: %s : %s") % (response, task.captchaFile)) + + for i in range(1, 100, 1): + response2 = getURL(self.API_URL, get={"apikey": self.getConfig("passkey"), "id": response, + "pyload": "1", "source": "pyload", + "action": "usercaptchacorrectdata"}) + + if response2 != "": + break + + time.sleep(3) + + result = response2 + task.data["ticket"] = response + self.logInfo("result %s : %s" % (response, result)) + task.setResult(result) + else: + self.logError("Bad upload: %s" % response) + return False + + def newCaptchaTask(self, task): + if not task.isTextual() and not task.isPositional(): + return False + + if not self.getConfig("passkey"): + return False + + if self.core.isClientConnected() and not self.getConfig("force"): + return False + + if self.getCredits() > 0: + task.handler.append(self) + task.setWaiting(self.getConfig("timeout")) + start_new_thread(self.processCaptcha, (task,)) + + else: + self.logError(_("Your Captcha 9kw.eu Account has not enough credits")) + + def captchaCorrect(self, task): + if "ticket" in task.data: + + try: + response = getURL(self.API_URL, + post={"action": "usercaptchacorrectback", + "apikey": self.getConfig("passkey"), + "api_key": self.getConfig("passkey"), + "correct": "1", + "pyload": "1", + "source": "pyload", + "id": task.data["ticket"]}) + self.logInfo("Request correct: %s" % response) + + except BadHeader, e: + self.logError("Could not send correct request.", str(e)) + else: + self.logError("No CaptchaID for correct request (task %s) found." % task) + + def captchaInvalid(self, task): + if "ticket" in task.data: + + try: + response = getURL(self.API_URL, + post={"action": "usercaptchacorrectback", + "apikey": self.getConfig("passkey"), + "api_key": self.getConfig("passkey"), + "correct": "2", + "pyload": "1", + "source": "pyload", + "id": task.data["ticket"]}) + self.logInfo("Request refund: %s" % response) + + except BadHeader, e: + self.logError("Could not send refund request.", str(e)) + else: + self.logError("No CaptchaID for not correct request (task %s) found." % task) diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py index bdf547827..69af96705 100644 --- a/module/plugins/hooks/CaptchaBrotherhood.py +++ b/module/plugins/hooks/CaptchaBrotherhood.py @@ -26,9 +26,9 @@ from time import sleep import Image from module.network.RequestFactory import getURL, getRequest -from module.network.HTTPRequest import BadHeader from module.plugins.Hook import Hook + class CaptchaBrotherhoodException(Exception): def __init__(self, err): self.err = err @@ -42,6 +42,7 @@ class CaptchaBrotherhoodException(Exception): def __repr__(self): return "<CaptchaBrotherhoodException %s>" % self.err + class CaptchaBrotherhood(Hook): __name__ = "CaptchaBrotherhood" __version__ = "0.04" @@ -49,10 +50,10 @@ class CaptchaBrotherhood(Hook): __config__ = [("activated", "bool", "Activated", False), ("username", "str", "Username", ""), ("force", "bool", "Force CT even if client is connected", False), - ("passkey", "password", "Password", ""),] + ("passkey", "password", "Password", "")] __author_name__ = ("RaNaN", "zoidberg") __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz") - + API_URL = "http://www.captchabrotherhood.com/" def setup(self): @@ -60,8 +61,7 @@ class CaptchaBrotherhood(Hook): def getCredits(self): response = getURL(self.API_URL + "askCredits.aspx", - get = {"username": self.getConfig("username"), - "password": self.getConfig("passkey")}) + get={"username": self.getConfig("username"), "password": self.getConfig("passkey")}) if not response.startswith("OK"): raise CaptchaBrotherhoodException(response) else: @@ -70,14 +70,14 @@ class CaptchaBrotherhood(Hook): self.info["credits"] = credits return credits - def submit(self, captcha, captchaType="file", match=None): + def submit(self, captcha, captchaType="file", match=None): try: img = Image.open(captcha) output = StringIO.StringIO() self.logDebug("CAPTCHA IMAGE", img, img.format, img.mode) if img.format in ("GIF", "JPEG"): img.save(output, img.format) - else: + else: if img.mode != "RGB": img = img.convert("RGB") img.save(output, "JPEG") @@ -85,57 +85,55 @@ class CaptchaBrotherhood(Hook): output.close() except Exception, e: raise CaptchaBrotherhoodException("Reading or converting captcha image failed: %s" % e) - + req = getRequest() - url = "%ssendNewCaptcha.aspx?%s" % (self.API_URL, - urlencode({"username": self.getConfig("username"), - "password": self.getConfig("passkey"), - "captchaSource": "pyLoad", - "timeout": "80"}) - ) + url = "%ssendNewCaptcha.aspx?%s" % (self.API_URL, + urlencode({"username": self.getConfig("username"), + "password": self.getConfig("passkey"), + "captchaSource": "pyLoad", + "timeout": "80"})) req.c.setopt(pycurl.URL, url) req.c.setopt(pycurl.POST, 1) req.c.setopt(pycurl.POSTFIELDS, data) - req.c.setopt(pycurl.HTTPHEADER, [ "Content-Type: text/html" ]) + req.c.setopt(pycurl.HTTPHEADER, ["Content-Type: text/html"]) try: req.c.perform() response = req.getResponse() except Exception, e: raise CaptchaBrotherhoodException("Submit captcha image failed") - + req.close() if not response.startswith("OK"): raise CaptchaBrotherhoodException(response[1]) - + ticket = response[3:] - + for i in range(15): sleep(5) response = self.get_api("askCaptchaResult", ticket) if response.startswith("OK-answered"): - return ticket, response[12:] + return ticket, response[12:] raise CaptchaBrotherhoodException("No solution received in time") def get_api(self, api, ticket): - response = getURL("%s%s.aspx" % (self.API_URL, api), + response = getURL("%s%s.aspx" % (self.API_URL, api), get={"username": self.getConfig("username"), "password": self.getConfig("passkey"), - "captchaID": ticket} - ) + "captchaID": ticket}) if not response.startswith("OK"): raise CaptchaBrotherhoodException("Unknown response: %s" % response) - + return response def newCaptchaTask(self, task): if "service" in task.data: return False - + if not task.isTextual(): return False @@ -166,4 +164,4 @@ class CaptchaBrotherhood(Hook): return task.data["ticket"] = ticket - task.setResult(result)
\ No newline at end of file + task.setResult(result) diff --git a/module/plugins/hooks/CaptchaTrader.py b/module/plugins/hooks/CaptchaTrader.py index c648c0bd8..51bb75a17 100644 --- a/module/plugins/hooks/CaptchaTrader.py +++ b/module/plugins/hooks/CaptchaTrader.py @@ -16,21 +16,17 @@ @author: mkaay, RaNaN """ -try: - from json import loads -except ImportError: - from simplejson import loads - from thread import start_new_thread from pycurl import FORM_FILE, LOW_SPEED_TIME +from module.common.json_layer import json_loads from module.network.RequestFactory import getURL, getRequest from module.network.HTTPRequest import BadHeader - from module.plugins.Hook import Hook PYLOAD_KEY = "9f65e7f381c3af2b076ea680ae96b0b7" + class CaptchaTraderException(Exception): def __init__(self, err): self.err = err @@ -44,14 +40,15 @@ class CaptchaTraderException(Exception): def __repr__(self): return "<CaptchaTraderException %s>" % self.err + class CaptchaTrader(Hook): __name__ = "CaptchaTrader" - __version__ = "0.15" + __version__ = "0.16" __description__ = """send captchas to captchatrader.com""" __config__ = [("activated", "bool", "Activated", False), ("username", "str", "Username", ""), ("force", "bool", "Force CT even if client is connected", False), - ("passkey", "password", "Password", ""),] + ("passkey", "password", "Password", ""), ] __author_name__ = ("RaNaN") __author_mail__ = ("RaNaN@pyload.org") @@ -64,8 +61,8 @@ class CaptchaTrader(Hook): def getCredits(self): json = getURL(CaptchaTrader.GETCREDITS_URL % {"user": self.getConfig("username"), - "password": self.getConfig("passkey")}) - response = loads(json) + "password": self.getConfig("passkey")}) + response = json_loads(json) if response[0] < 0: raise CaptchaTraderException(response[1]) else: @@ -88,31 +85,31 @@ class CaptchaTrader(Hook): try: json = req.load(CaptchaTrader.SUBMIT_URL, post={"api_key": PYLOAD_KEY, - "username": self.getConfig("username"), - "password": self.getConfig("passkey"), - "value": (FORM_FILE, captcha), - "type": captchaType}, multipart=True) + "username": self.getConfig("username"), + "password": self.getConfig("passkey"), + "value": (FORM_FILE, captcha), + "type": captchaType}, multipart=True) finally: req.close() - response = loads(json) + response = json_loads(json) if response[0] < 0: raise CaptchaTraderException(response[1]) ticket = response[0] result = response[1] - self.logDebug("result %s : %s" % (ticket,result)) + self.logDebug("result %s : %s" % (ticket, result)) return ticket, result def respond(self, ticket, success): try: json = getURL(CaptchaTrader.RESPOND_URL, post={"is_correct": 1 if success else 0, - "username": self.getConfig("username"), - "password": self.getConfig("passkey"), - "ticket": ticket}) + "username": self.getConfig("username"), + "password": self.getConfig("passkey"), + "ticket": ticket}) - response = loads(json) + response = json_loads(json) if response[0] < 0: raise CaptchaTraderException(response[1]) diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py index b290838bb..fa95d1065 100644 --- a/module/plugins/hooks/Checksum.py +++ b/module/plugins/hooks/Checksum.py @@ -17,7 +17,8 @@ @author: zoidberg """ from __future__ import with_statement -import hashlib, zlib +import hashlib +import zlib from os import remove from os.path import getsize, isfile, splitext import re @@ -25,29 +26,31 @@ import re from module.utils import save_join, fs_encode from module.plugins.Hook import Hook -def computeChecksum(local_file, algorithm): + +def computeChecksum(local_file, algorithm): if algorithm in getattr(hashlib, "algorithms", ("md5", "sha1", "sha224", "sha256", "sha384", "sha512")): h = getattr(hashlib, algorithm)() chunk_size = 128 * h.block_size - - with open(local_file, 'rb') as f: - for chunk in iter(lambda: f.read(chunk_size), ''): - h.update(chunk) - + + with open(local_file, 'rb') as f: + for chunk in iter(lambda: f.read(chunk_size), ''): + h.update(chunk) + return h.hexdigest() - + elif algorithm in ("adler32", "crc32"): hf = getattr(zlib, algorithm) last = 0 - - with open(local_file, 'rb') as f: - for chunk in iter(lambda: f.read(8192), ''): + + with open(local_file, 'rb') as f: + for chunk in iter(lambda: f.read(8192), ''): last = hf(chunk, last) - + return "%x" % last - + else: - return None + return None + class Checksum(Hook): __name__ = "Checksum" @@ -58,48 +61,49 @@ class Checksum(Hook): ("max_tries", "int", "Number of retries", 2)] __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - - methods = { 'sfv':'crc32', 'crc': 'crc32', 'hash': 'md5'} - regexps = { 'sfv': r'^(?P<name>[^;].+)\s+(?P<hash>[0-9A-Fa-f]{8})$', - 'md5': r'^(?P<name>[0-9A-Fa-f]{32}) (?P<file>.+)$', - 'crc': r'filename=(?P<name>.+)\nsize=(?P<size>\d+)\ncrc32=(?P<hash>[0-9A-Fa-f]{8})$', - 'default': r'^(?P<hash>[0-9A-Fa-f]+)\s+\*?(?P<name>.+)$' } - - def setup(self): + + methods = {'sfv': 'crc32', 'crc': 'crc32', 'hash': 'md5'} + regexps = {'sfv': r'^(?P<name>[^;].+)\s+(?P<hash>[0-9A-Fa-f]{8})$', + 'md5': r'^(?P<name>[0-9A-Fa-f]{32}) (?P<file>.+)$', + 'crc': r'filename=(?P<name>.+)\nsize=(?P<size>\d+)\ncrc32=(?P<hash>[0-9A-Fa-f]{8})$', + 'default': r'^(?P<hash>[0-9A-Fa-f]+)\s+\*?(?P<name>.+)$'} + + def setup(self): if not self.config['general']['checksum']: self.logInfo("Checksum validation is disabled in general configuration") - self.algorithms = sorted(getattr(hashlib, "algorithms", ("md5", "sha1", "sha224", "sha256", "sha384", "sha512")), reverse = True) - self.algorithms.extend(["crc32", "adler32"]) - self.formats = self.algorithms + ['sfv', 'crc', 'hash'] - + self.algorithms = sorted( + getattr(hashlib, "algorithms", ("md5", "sha1", "sha224", "sha256", "sha384", "sha512")), reverse=True) + self.algorithms.extend(["crc32", "adler32"]) + self.formats = self.algorithms + ['sfv', 'crc', 'hash'] + def downloadFinished(self, pyfile): """ Compute checksum for the downloaded file and compare it with the hash provided by the hoster. pyfile.plugin.check_data should be a dictionary which can contain: a) if known, the exact filesize in bytes (e.g. "size": 123456789) b) hexadecimal hash string with algorithm name as key (e.g. "md5": "d76505d0869f9f928a17d42d66326307") - """ + """ if hasattr(pyfile.plugin, "check_data") and (isinstance(pyfile.plugin.check_data, dict)): - data = pyfile.plugin.check_data.copy() + data = pyfile.plugin.check_data.copy() elif hasattr(pyfile.plugin, "api_data") and (isinstance(pyfile.plugin.api_data, dict)): - data = pyfile.plugin.api_data.copy() + data = pyfile.plugin.api_data.copy() else: - return - - self.logDebug(data) - + return + + self.logDebug(data) + if not pyfile.plugin.lastDownload: - self.checkFailed(pyfile, None, "No file downloaded") - + self.checkFailed(pyfile, None, "No file downloaded") + local_file = fs_encode(pyfile.plugin.lastDownload) #download_folder = self.config['general']['download_folder'] #local_file = fs_encode(save_join(download_folder, pyfile.package().folder, pyfile.name)) - + if not isfile(local_file): - self.checkFailed(pyfile, None, "File does not exist") - - # validate file size + self.checkFailed(pyfile, None, "File does not exist") + + # validate file size if "size" in data: api_size = int(data['size']) file_size = getsize(local_file) @@ -107,63 +111,72 @@ class Checksum(Hook): self.logWarning("File %s has incorrect size: %d B (%d expected)" % (pyfile.name, file_size, api_size)) self.checkFailed(pyfile, local_file, "Incorrect file size") del data['size'] - + # validate checksum - if data and self.config['general']['checksum']: + if data and self.config['general']['checksum']: if "checksum" in data: data['md5'] = data['checksum'] - + for key in self.algorithms: - if key in data: - checksum = computeChecksum(local_file, key.replace("-","").lower()) + if key in data: + checksum = computeChecksum(local_file, key.replace("-", "").lower()) if checksum: if checksum == data[key]: - self.logInfo('File integrity of "%s" verified by %s checksum (%s).' % (pyfile.name, key.upper(), checksum)) + self.logInfo('File integrity of "%s" verified by %s checksum (%s).' % (pyfile.name, + key.upper(), + checksum)) return else: - self.logWarning("%s checksum for file %s does not match (%s != %s)" % (key.upper(), pyfile.name, checksum, data[key])) + self.logWarning("%s checksum for file %s does not match (%s != %s)" % (key.upper(), + pyfile.name, + checksum, + data[key])) self.checkFailed(pyfile, local_file, "Checksums do not match") else: - self.logWarning("Unsupported hashing algorithm: %s" % key.upper()) + self.logWarning("Unsupported hashing algorithm: %s" % key.upper()) else: - self.logWarning("Unable to validate checksum for file %s" % (pyfile.name)) - + self.logWarning("Unable to validate checksum for file %s" % pyfile.name) + def checkFailed(self, pyfile, local_file, msg): action = self.getConfig("action") if action == "fail": - pyfile.plugin.fail(reason = msg) + pyfile.plugin.fail(reason=msg) elif action == "retry": if local_file: remove(local_file) - pyfile.plugin.retry(reason = msg, max_tries = self.getConfig("max_tries")) + pyfile.plugin.retry(reason=msg, max_tries=self.getConfig("max_tries")) - def packageFinished(self, pypack): download_folder = save_join(self.config['general']['download_folder'], pypack.folder, "") - + for link in pypack.getChildren().itervalues(): file_type = splitext(link["name"])[1][1:].lower() #self.logDebug(link, file_type) - + if file_type not in self.formats: continue - - hash_file = fs_encode(save_join(download_folder, link["name"])) + + hash_file = fs_encode(save_join(download_folder, link["name"])) if not isfile(hash_file): self.logWarning("File not found: %s" % link["name"]) continue - + with open(hash_file) as f: text = f.read() - + for m in re.finditer(self.regexps.get(file_type, self.regexps['default']), text): - data = m.groupdict() + data = m.groupdict() self.logDebug(link["name"], data) - + local_file = fs_encode(save_join(download_folder, data["name"])) algorithm = self.methods.get(file_type, file_type) checksum = computeChecksum(local_file, algorithm) if checksum == data["hash"]: - self.logInfo('File integrity of "%s" verified by %s checksum (%s).' % (data["name"], algorithm, checksum)) + self.logInfo('File integrity of "%s" verified by %s checksum (%s).' % (data["name"], + algorithm, + checksum)) else: - self.logWarning("%s checksum for file %s does not match (%s != %s)" % (algorithm, data["name"], checksum, data["hash"]))
\ No newline at end of file + self.logWarning("%s checksum for file %s does not match (%s != %s)" % (algorithm, + data["name"], + checksum, + data["hash"])) diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py index 97e5cd57d..94185251f 100644 --- a/module/plugins/hooks/ClickAndLoad.py +++ b/module/plugins/hooks/ClickAndLoad.py @@ -23,9 +23,10 @@ import thread from module.plugins.Hook import Hook + class ClickAndLoad(Hook): __name__ = "ClickAndLoad" - __version__ = "0.2" + __version__ = "0.21" __description__ = """Gives abillity to use jd's click and load. depends on webinterface""" __config__ = [("activated", "bool", "Activated", "True"), ("extern", "bool", "Allow external link adding", "False")] @@ -43,7 +44,7 @@ class ClickAndLoad(Hook): thread.start_new_thread(proxy, (self, ip, self.port, 9666)) except: - self.log.error("ClickAndLoad port already in use.") + self.logError("ClickAndLoad port already in use.") def proxy(self, *settings): @@ -71,7 +72,7 @@ def server(self, *settings): errno = e.args[0] if errno == 98: - self.core.log.warning(_("Click'N'Load: Port 9666 already in use")) + self.logWarning(_("Click'N'Load: Port 9666 already in use")) return thread.start_new_thread(server, (self,) + settings) except: diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py index 59ff40ded..7de4f4f2c 100644 --- a/module/plugins/hooks/DeathByCaptcha.py +++ b/module/plugins/hooks/DeathByCaptcha.py @@ -18,16 +18,17 @@ from __future__ import with_statement from thread import start_new_thread -from pycurl import FORM_FILE, HTTPHEADER, RESPONSE_CODE +from pycurl import FORM_FILE, HTTPHEADER from time import sleep from base64 import b64encode import re -from module.network.RequestFactory import getURL, getRequest +from module.network.RequestFactory import getRequest from module.network.HTTPRequest import BadHeader from module.plugins.Hook import Hook from module.common.json_layer import json_loads + class DeathByCaptchaException(Exception): DBC_ERRORS = {'not-logged-in': 'Access denied, check your credentials', 'invalid-credentials': 'Access denied, check your credentials', @@ -36,14 +37,14 @@ class DeathByCaptchaException(Exception): 'invalid-captcha': 'CAPTCHA is not a valid image', 'service-overload': 'CAPTCHA was rejected due to service overload, try again later', 'invalid-request': 'Invalid request', - 'timed-out': 'No CAPTCHA solution received in time' } - + 'timed-out': 'No CAPTCHA solution received in time'} + def __init__(self, err): self.err = err def getCode(self): return self.err - + def getDesc(self): if self.err in self.DBC_ERRORS.keys(): return self.DBC_ERRORS[self.err] @@ -56,6 +57,7 @@ class DeathByCaptchaException(Exception): def __repr__(self): return "<DeathByCaptchaException %s>" % self.err + class DeathByCaptcha(Hook): __name__ = "DeathByCaptcha" __version__ = "0.03" @@ -74,31 +76,30 @@ class DeathByCaptcha(Hook): def call_api(self, api="captcha", post=False, multipart=False): req = getRequest() - req.c.setopt(HTTPHEADER, ["Accept: application/json", - "User-Agent: pyLoad %s" % self.core.version]) - + req.c.setopt(HTTPHEADER, ["Accept: application/json", "User-Agent: pyLoad %s" % self.core.version]) + if post: if not isinstance(post, dict): post = {} post.update({"username": self.getConfig("username"), - "password": self.getConfig("passkey")}) - + "password": self.getConfig("passkey")}) + response = None try: - json = req.load("%s%s" % (self.API_URL, api), - post = post, + json = req.load("%s%s" % (self.API_URL, api), + post=post, multipart=multipart) - self.logDebug(json) + self.logDebug(json) response = json_loads(json) - + if "error" in response: raise DeathByCaptchaException(response['error']) elif "status" not in response: raise DeathByCaptchaException(str(response)) - + except BadHeader, e: if 403 == e.code: - raise DeathByCaptchaException('not-logged-in') + raise DeathByCaptchaException('not-logged-in') elif 413 == e.code: raise DeathByCaptchaException('invalid-captcha') elif 503 == e.code: @@ -107,12 +108,12 @@ class DeathByCaptcha(Hook): raise DeathByCaptchaException('invalid-request') else: raise - + finally: req.close() - + return response - + def getCredits(self): response = self.call_api("user", True) @@ -122,7 +123,7 @@ class DeathByCaptcha(Hook): self.info.update(response) else: raise DeathByCaptchaException(response) - + def getStatus(self): response = self.call_api("status", False) @@ -138,31 +139,31 @@ class DeathByCaptcha(Hook): multipart = False with open(captcha, 'rb') as f: data = f.read() - data = "base64:" + b64encode(data) - + data = "base64:" + b64encode(data) + response = self.call_api("captcha", {"captchafile": data}, multipart) - + if "captcha" not in response: raise DeathByCaptchaException(response) ticket = response['captcha'] - + for i in range(24): sleep(5) - response = self.call_api("captcha/%d" % ticket, False) + response = self.call_api("captcha/%d" % ticket, False) if response['text'] and response['is_correct']: break else: - raise DeathByCaptchaException('timed-out') - + raise DeathByCaptchaException('timed-out') + result = response['text'] - self.logDebug("result %s : %s" % (ticket,result)) + self.logDebug("result %s : %s" % (ticket, result)) return ticket, result def newCaptchaTask(self, task): if "service" in task.data: return False - + if not task.isTextual(): return False @@ -171,22 +172,23 @@ class DeathByCaptcha(Hook): if self.core.isClientConnected() and not self.getConfig("force"): return False - + try: self.getStatus() - self.getCredits() + self.getCredits() except DeathByCaptchaException, e: self.logError(e.getDesc()) return False - + balance, rate = self.info["balance"], self.info["rate"] - self.logInfo("Account balance: US$%.3f (%d captchas left at %.2f cents each)" % (balance / 100, balance // rate, rate)) - - if balance > rate: + self.logInfo("Account balance: US$%.3f (%d captchas left at %.2f cents each)" % (balance / 100, + balance // rate, rate)) + + if balance > rate: task.handler.append(self) task.data['service'] = self.__name__ task.setWaiting(180) - start_new_thread(self.processCaptcha, (task,)) + start_new_thread(self.processCaptcha, (task,)) def captchaInvalid(self, task): if task.data['service'] == self.__name__ and "ticket" in task.data: @@ -207,4 +209,4 @@ class DeathByCaptcha(Hook): return task.data["ticket"] = ticket - task.setResult(result)
\ No newline at end of file + task.setResult(result) diff --git a/module/plugins/hooks/DebridItaliaCom.py b/module/plugins/hooks/DebridItaliaCom.py index 99b2dd626..71ebac85c 100644 --- a/module/plugins/hooks/DebridItaliaCom.py +++ b/module/plugins/hooks/DebridItaliaCom.py @@ -20,7 +20,7 @@ from module.plugins.internal.MultiHoster import MultiHoster class DebridItaliaCom(MultiHoster): __name__ = "DebridItaliaCom" - __version__ = "0.06" + __version__ = "0.07" __type__ = "hook" __config__ = [("activated", "bool", "Activated", "False"), ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), @@ -39,4 +39,4 @@ class DebridItaliaCom(MultiHoster): "speedload.org", "rapidgator.net", "likeupload.net", "cyberlocker.ch", "depositfiles.com", "extabit.com", "filefactory.com", "sharefiles.co", "ryushare.com", "tusfiles.net", "nowvideo.co", "cloudzer.net", "letitbit.net", - "easybytez.com"] + "easybytez.com", "uptobox.com", "ddlstorage.com"] diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py index 01cb1b8e1..3bc98a7b3 100644 --- a/module/plugins/hooks/DeleteFinished.py +++ b/module/plugins/hooks/DeleteFinished.py @@ -1,4 +1,4 @@ - # -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- """ This program is free software; you can redistribute it and/or modify @@ -22,72 +22,63 @@ from module.plugins.Hook import Hook class DeleteFinished(Hook): - __name__ = "DeleteFinished" - __version__ = "1.02" - __description__ = "Automatically delete finished packages from queue" + __name__ = 'DeleteFinished' + __version__ = '1.09' + __description__ = 'Automatically delete all finished packages from queue' __config__ = [ - ("activated", "bool", "Activated", "False"), - ("interval", "int", "Delete every (hours)", "72") + ('activated', 'bool', 'Activated', 'False'), + ('interval', 'int', 'Delete every (hours)', '72'), + ('deloffline', 'bool', 'Delete packages with offline links', 'False') ] - __author_name__ = ("Walter Purcaro") - __author_mail__ = ("vuolter@gmail.com") + __author_name__ = ('Walter Purcaro') + __author_mail__ = ('vuolter@gmail.com') ## overwritten methods ## def periodical(self): - # self.logDebug("self.periodical") - if not self.info["sleep"]: - self.logInfo("self.deleteFinished") - self.deleteFinished() - self.info["sleep"] = True - self.addEvent("packageFinished", self.wakeup) + if not self.info['sleep']: + deloffline = self.getConfig('deloffline') + mode = '0,1,4' if deloffline else '0,4' + msg = 'delete all finished packages in queue list (%s packages with offline links)' + self.logInfo(msg % ('including' if deloffline else 'excluding')) + self.deleteFinished(mode) + self.info['sleep'] = True + self.addEvent('packageFinished', self.wakeup) def pluginConfigChanged(self, plugin, name, value): - # self.logDebug("self.pluginConfigChanged") - if name == "interval" and value != self.interval: - self.interval = value + if name == 'interval' and value != self.interval: + self.interval = value * 3600 self.initPeriodical() def unload(self): - # self.logDebug("self.unload") - self.removeEvent("packageFinished", self.wakeup) + self.removeEvent('packageFinished', self.wakeup) def coreReady(self): - # self.logDebug("self.coreReady") - self.info = {"sleep": True} - interval = self.getConfig("interval") * 3600 - self.pluginConfigChanged("DeleteFinished", "interval", interval) - self.addEvent("packageFinished", self.wakeup) + self.info = {'sleep': True} + interval = self.getConfig('interval') + self.pluginConfigChanged('DeleteFinished', 'interval', interval) + self.addEvent('packageFinished', self.wakeup) ## own methods ## @style.queue - def deleteFinished(self): - self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,4))") - self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)") + def deleteFinished(self, mode): + self.c.execute('DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (%s))' % mode) + self.c.execute('DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)') def wakeup(self, pypack): - # self.logDebug("self.wakeup") - self.removeEvent("packageFinished", self.wakeup) - self.info["sleep"] = False + self.removeEvent('packageFinished', self.wakeup) + self.info['sleep'] = False ## event managing ## - def addEvent(self, event, handler): - if event in self.manager.events: - if handler not in self.manager.events[event]: - self.manager.events[event].append(handler) - # self.logDebug("self.addEvent: " + event + ": added handler") + def addEvent(self, event, func): + """Adds an event listener for event name""" + if event in self.m.events: + if func in self.m.events[event]: + self.logDebug('Function already registered %s' % func) else: - # self.logDebug("self.addEvent: " + event + ": NOT added handler") - return False + self.m.events[event].append(func) else: - self.manager.events[event] = [handler] - # self.logDebug("self.addEvent: " + event + ": added event and handler") - return True + self.m.events[event] = [func] - def removeEvent(self, event, handler): - if event in self.manager.events and handler in self.manager.events[event]: - self.manager.events[event].remove(handler) - # self.logDebug("self.removeEvent: " + event + ": removed handler") - return True - else: - # self.logDebug("self.removeEvent: " + event + ": NOT removed handler") - return False + def setup(self): + self.m = self.manager + self.removeEvent = self.m.removeEvent diff --git a/module/plugins/hooks/EasybytezCom.py b/module/plugins/hooks/EasybytezCom.py index 6a4ded85b..cc55da9c0 100644 --- a/module/plugins/hooks/EasybytezCom.py +++ b/module/plugins/hooks/EasybytezCom.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- -from module.network.RequestFactory import getURL -from module.plugins.internal.MultiHoster import MultiHoster import re +from module.plugins.internal.MultiHoster import MultiHoster + + class EasybytezCom(MultiHoster): __name__ = "EasybytezCom" __version__ = "0.03" @@ -18,14 +19,16 @@ class EasybytezCom(MultiHoster): def getHoster(self): self.account = self.core.accountManager.getAccountPlugin(self.__name__) user = self.account.selectAccount()[0] - + try: req = self.account.getAccountRequest(user) page = req.load("http://www.easybytez.com") - + found = re.search(r'</textarea>\s*Supported sites:(.*)', page) return found.group(1).split(',') except Exception, e: self.logDebug(e) self.logWarning("Unable to load supported hoster list, using last known") - return ['bitshare.com', 'crocko.com', 'ddlstorage.com', 'depositfiles.com', 'extabit.com', 'hotfile.com', 'mediafire.com', 'netload.in', 'rapidgator.net', 'rapidshare.com', 'uploading.com', 'uload.to', 'uploaded.to']
\ No newline at end of file + return ['bitshare.com', 'crocko.com', 'ddlstorage.com', 'depositfiles.com', 'extabit.com', 'hotfile.com', + 'mediafire.com', 'netload.in', 'rapidgator.net', 'rapidshare.com', 'uploading.com', 'uload.to', + 'uploaded.to'] diff --git a/module/plugins/hooks/Ev0InFetcher.py b/module/plugins/hooks/Ev0InFetcher.py index 5941cf38c..912cb5964 100644 --- a/module/plugins/hooks/Ev0InFetcher.py +++ b/module/plugins/hooks/Ev0InFetcher.py @@ -15,21 +15,23 @@ @author: mkaay """ -from module.lib import feedparser from time import mktime, time +from module.lib import feedparser from module.plugins.Hook import Hook + class Ev0InFetcher(Hook): __name__ = "Ev0InFetcher" - __version__ = "0.2" + __version__ = "0.21" __description__ = """checks rss feeds for ev0.in""" __config__ = [("activated", "bool", "Activated", "False"), ("interval", "int", "Check interval in minutes", "10"), ("queue", "bool", "Move new shows directly to Queue", False), ("shows", "str", "Shows to check for (comma seperated)", ""), ("quality", "xvid;x264;rmvb", "Video Format", "xvid"), - ("hoster", "str", "Hoster to use (comma seperated)", "NetloadIn,RapidshareCom,MegauploadCom,HotfileCom")] + ("hoster", "str", "Hoster to use (comma seperated)", + "NetloadIn,RapidshareCom,MegauploadCom,HotfileCom")] __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") @@ -39,49 +41,49 @@ class Ev0InFetcher(Hook): def filterLinks(self, links): results = self.core.pluginManager.parseUrls(links) sortedLinks = {} - + for url, hoster in results: if hoster not in sortedLinks: sortedLinks[hoster] = [] sortedLinks[hoster].append(url) - + for h in self.getConfig("hoster").split(","): try: return sortedLinks[h.strip()] except: continue return [] - + def periodical(self): def normalizefiletitle(filename): filename = filename.replace('.', ' ') filename = filename.replace('_', ' ') filename = filename.lower() return filename - + shows = [s.strip() for s in self.getConfig("shows").split(",")] - + feed = feedparser.parse("http://feeds.feedburner.com/ev0in/%s?format=xml" % self.getConfig("quality")) showStorage = {} for show in shows: showStorage[show] = int(self.getStorage("show_%s_lastfound" % show, 0)) - + found = False for item in feed['items']: for show, lastfound in showStorage.iteritems(): if show.lower() in normalizefiletitle(item['title']) and lastfound < int(mktime(item.date_parsed)): links = self.filterLinks(item['description'].split("<br />")) packagename = item['title'].encode("utf-8") - self.core.log.info("Ev0InFetcher: new episode '%s' (matched '%s')" % (packagename, show)) + self.logInfo("Ev0InFetcher: new episode '%s' (matched '%s')" % (packagename, show)) self.core.api.addPackage(packagename, links, 1 if self.getConfig("queue") else 0) self.setStorage("show_%s_lastfound" % show, int(mktime(item.date_parsed))) found = True if not found: - #self.core.log.debug("Ev0InFetcher: no new episodes found") + #self.logDebug("Ev0InFetcher: no new episodes found") pass for show, lastfound in self.getStorage().iteritems(): - if int(lastfound) > 0 and int(lastfound) + (3600*24*30) < int(time()): + if int(lastfound) > 0 and int(lastfound) + (3600 * 24 * 30) < int(time()): self.delStorage("show_%s_lastfound" % show) - self.core.log.debug("Ev0InFetcher: cleaned '%s' record" % show) + self.logDebug("Ev0InFetcher: cleaned '%s' record" % show) diff --git a/module/plugins/hooks/ExpertDecoders.py b/module/plugins/hooks/ExpertDecoders.py index 2e66e49ca..f1b7ea352 100644 --- a/module/plugins/hooks/ExpertDecoders.py +++ b/module/plugins/hooks/ExpertDecoders.py @@ -18,7 +18,7 @@ from __future__ import with_statement from thread import start_new_thread -from pycurl import FORM_FILE, LOW_SPEED_TIME +from pycurl import LOW_SPEED_TIME from uuid import uuid4 from base64 import b64encode @@ -27,13 +27,14 @@ from module.network.HTTPRequest import BadHeader from module.plugins.Hook import Hook + class ExpertDecoders(Hook): __name__ = "ExpertDecoders" __version__ = "0.01" __description__ = """send captchas to expertdecoders.com""" __config__ = [("activated", "bool", "Activated", False), ("force", "bool", "Force CT even if client is connected", False), - ("passkey", "password", "Access key", ""),] + ("passkey", "password", "Access key", ""), ] __author_name__ = ("RaNaN", "zoidberg") __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz") @@ -42,37 +43,33 @@ class ExpertDecoders(Hook): def setup(self): self.info = {} - def getCredits(self): - response = getURL(self.API_URL, post = { "key": self.getConfig("passkey"), "action": "balance" }) - - if response.isdigit(): + def getCredits(self): + response = getURL(self.API_URL, post={"key": self.getConfig("passkey"), "action": "balance"}) + + if response.isdigit(): self.logInfo(_("%s credits left") % response) self.info["credits"] = credits = int(response) - return credits + return credits else: self.logError(response) return 0 - - def processCaptcha(self, task): + + def processCaptcha(self, task): task.data["ticket"] = ticket = uuid4() result = None - + with open(task.captchaFile, 'rb') as f: - data = f.read() - data = b64encode(data) + data = f.read() + data = b64encode(data) #self.logDebug("%s: %s : %s" % (ticket, task.captchaFile, data)) req = getRequest() #raise timeout threshold req.c.setopt(LOW_SPEED_TIME, 80) - + try: - result = req.load(self.API_URL, - post={ "action": "upload", - "key": self.getConfig("passkey"), - "file": data, - "gen_task_id": ticket } - ) + result = req.load(self.API_URL, post={"action": "upload", "key": self.getConfig("passkey"), + "file": data, "gen_task_id": ticket}) finally: req.close() @@ -99,14 +96,11 @@ class ExpertDecoders(Hook): def captchaInvalid(self, task): if "ticket" in task.data: - + try: - response = getURL(self.API_URL, - post={ "action": "refund", - "key": self.getConfig("passkey"), - "gen_task_id": task.data["ticket"] } - ) + response = getURL(self.API_URL, post={"action": "refund", "key": self.getConfig("passkey"), + "gen_task_id": task.data["ticket"]}) self.logInfo("Request refund: %s" % response) except BadHeader, e: - self.logError("Could not send refund request.", str(e))
\ No newline at end of file + self.logError("Could not send refund request.", str(e)) diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index f46f290c0..5b7aade94 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -25,6 +25,7 @@ from os.path import join, exists, basename from module.plugins.Hook import Hook from module.utils import save_join + class ExternalScripts(Hook): __name__ = "ExternalScripts" __version__ = "0.22" @@ -43,7 +44,6 @@ class ExternalScripts(Hook): 'all_dls_finished', 'all_dls_processed'] for folder in folders: - self.scripts[folder] = [] self.initPluginType(folder, join(pypath, 'scripts', folder)) @@ -53,12 +53,11 @@ class ExternalScripts(Hook): if names: self.logInfo((_("Installed scripts for %s: ") % script_type ) + ", ".join([basename(x) for x in names])) - def initPluginType(self, folder, path): if not exists(path): try: makedirs(path) - except : + except: self.logDebug("Script folder %s not created" % folder) return @@ -66,7 +65,7 @@ class ExternalScripts(Hook): if f.startswith("#") or f.startswith(".") or f.startswith("_") or f.endswith("~") or f.endswith(".swp"): continue - if not access(join(path,f), X_OK): + if not access(join(path, f), X_OK): self.logWarning(_("Script not executable:") + " %s/%s" % (folder, f)) self.scripts[folder].append(join(path, f)) @@ -77,7 +76,7 @@ class ExternalScripts(Hook): #output goes to pyload subprocess.Popen(cmd, bufsize=-1) except Exception, e: - self.logError(_("Error in %(script)s: %(error)s") % { "script" :basename(script), "error": str(e)}) + self.logError(_("Error in %(script)s: %(error)s") % {"script": basename(script), "error": str(e)}) def downloadPreparing(self, pyfile): for script in self.scripts['download_preparing']: @@ -86,9 +85,8 @@ class ExternalScripts(Hook): def downloadFinished(self, pyfile): for script in self.scripts['download_finished']: self.callScript(script, pyfile.pluginname, pyfile.url, pyfile.name, - save_join(self.core.config['general']['download_folder'], pyfile.package().folder, pyfile.name), - pyfile.id) - + save_join(self.core.config['general']['download_folder'], + pyfile.package().folder, pyfile.name), pyfile.id) def packageFinished(self, pypack): for script in self.scripts['package_finished']: @@ -116,4 +114,3 @@ class ExternalScripts(Hook): def allDownloadsProcessed(self): for script in self.scripts["all_dls_processed"]: self.callScript(script) - diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index f55589fec..346c37021 100644 --- a/module/plugins/hooks/ExtractArchive.py +++ b/module/plugins/hooks/ExtractArchive.py @@ -53,23 +53,24 @@ from module.utils import save_join, fs_encode from module.plugins.Hook import Hook, threaded, Expose from module.plugins.internal.AbstractExtractor import ArchiveError, CRCError, WrongPassword + class ExtractArchive(Hook): """ Provides: unrarFinished (folder, filename) """ __name__ = "ExtractArchive" - __version__ = "0.13" + __version__ = "0.14" __description__ = "Extract different kind of archives" __config__ = [("activated", "bool", "Activated", True), - ("fullpath", "bool", "Extract full path", True), - ("overwrite", "bool", "Overwrite files", True), - ("passwordfile", "file", "password file", "unrar_passwords.txt"), - ("deletearchive", "bool", "Delete archives when done", False), - ("subfolder", "bool", "Create subfolder for each package", False), - ("destination", "folder", "Extract files to", ""), - ("recursive", "bool", "Extract archives in archvies", True), - ("queue", "bool", "Wait for all downloads to be finished", True), - ("renice", "int", "CPU Priority", 0), ] + ("fullpath", "bool", "Extract full path", True), + ("overwrite", "bool", "Overwrite files", True), + ("passwordfile", "file", "password file", "unrar_passwords.txt"), + ("deletearchive", "bool", "Delete archives when done", False), + ("subfolder", "bool", "Create subfolder for each package", False), + ("destination", "folder", "Extract files to", ""), + ("recursive", "bool", "Extract archives in archvies", True), + ("queue", "bool", "Wait for all downloads to be finished", True), + ("renice", "int", "CPU Priority", 0)] __author_name__ = ("pyload Team") __author_mail__ = ("admin<at>pyload.org") @@ -121,14 +122,12 @@ class ExtractArchive(Hook): else: self.manager.startThread(self.extract, [pypack.id]) - @threaded def allDownloadsProcessed(self, thread): local = copy(self.queue) del self.queue[:] self.extract(local, thread) - def extract(self, ids, thread=None): # reload from txt file self.reloadPasswords() @@ -142,7 +141,8 @@ class ExtractArchive(Hook): for pid in ids: p = self.core.files.getPackage(pid) self.logInfo(_("Check package %s") % p.name) - if not p: continue + if not p: + continue # determine output folder out = save_join(dl, p.folder, "") @@ -175,10 +175,10 @@ class ExtractArchive(Hook): if target in extracted: self.logDebug(basename(target), "skipped") continue - extracted.append(target) #prevent extracting same file twice + extracted.append(target) # prevent extracting same file twice klass = plugin(self, target, out, self.getConfig("fullpath"), self.getConfig("overwrite"), - self.getConfig("renice")) + self.getConfig("renice")) klass.init() self.logInfo(basename(target), _("Extract to %s") % out) @@ -191,18 +191,20 @@ class ExtractArchive(Hook): self.logDebug("new file %s does not exists" % file) continue if self.getConfig("recursive") and isfile(file): - new_files_ids.append((file, fid)) #append as new target + new_files_ids.append((file, fid)) # append as new target - files_ids = new_files_ids # also check extracted files + files_ids = new_files_ids # also check extracted files - if not matched: self.logInfo(_("No files found to extract")) + if not matched: + self.logInfo(_("No files found to extract")) def startExtracting(self, plugin, fid, passwords, thread): pyfile = self.core.files.getFile(fid) - if not pyfile: return [] + if not pyfile: + return [] pyfile.setCustomStatus(_("extracting")) - thread.addActive(pyfile) #keep this file until everything is done + thread.addActive(pyfile) # keep this file until everything is done try: progress = lambda x: pyfile.setProgress(x) @@ -218,7 +220,8 @@ class ExtractArchive(Hook): pwlist = copy(self.getPasswords()) #remove already supplied pws from list (only local) for pw in passwords: - if pw in pwlist: pwlist.remove(pw) + if pw in pwlist: + pwlist.remove(pw) for pw in passwords + pwlist: try: @@ -242,15 +245,16 @@ class ExtractArchive(Hook): files = plugin.getDeleteFiles() self.logInfo(_("Deleting %s files") % len(files)) for f in files: - if exists(f): remove(f) - else: self.logDebug("%s does not exists" % f) + if exists(f): + remove(f) + else: + self.logDebug("%s does not exists" % f) self.logInfo(basename(plugin.file), _("Extracting finished")) self.manager.dispatchEvent("unrarFinished", plugin.out, plugin.file) return plugin.getExtractedFiles() - except ArchiveError, e: self.logError(basename(plugin.file), _("Archive Error"), str(e)) except CRCError: @@ -267,7 +271,6 @@ class ExtractArchive(Hook): """ List of saved passwords """ return self.passwords - def reloadPasswords(self): pwfile = self.getConfig("passwordfile") if not exists(pwfile): @@ -281,13 +284,13 @@ class ExtractArchive(Hook): self.passwords = passwords - @Expose def addPassword(self, pw): """ Adds a password to saved list""" pwfile = self.getConfig("passwordfile") - if pw in self.passwords: self.passwords.remove(pw) + if pw in self.passwords: + self.passwords.remove(pw) self.passwords.insert(0, pw) f = open(pwfile, "wb") @@ -297,7 +300,8 @@ class ExtractArchive(Hook): def setPermissions(self, files): for f in files: - if not exists(f): continue + if not exists(f): + continue try: if self.core.config["permission"]["change_file"]: if isfile(f): @@ -310,4 +314,4 @@ class ExtractArchive(Hook): gid = getgrnam(self.config["permission"]["group"])[2] chown(f, uid, gid) except Exception, e: - self.log.warning(_("Setting User and Group failed"), e) + self.logWarning(_("Setting User and Group failed"), e) diff --git a/module/plugins/hooks/FastixRu.py b/module/plugins/hooks/FastixRu.py new file mode 100644 index 000000000..25c9a1a67 --- /dev/null +++ b/module/plugins/hooks/FastixRu.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- + +# should be working + +from module.network.RequestFactory import getURL +from module.plugins.internal.MultiHoster import MultiHoster +from module.common.json_layer import json_loads + + +class FastixRu(MultiHoster): + __name__ = "FastixRu" + __version__ = "0.02" + __type__ = "hook" + __config__ = [("activated", "bool", "Activated", "False"), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("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") + + def getHoster(self): + page = getURL( + "http://fastix.ru/api_v2/?apikey=5182964c3f8f9a7f0b00000a_kelmFB4n1IrnCDYuIFn2y&sub=allowed_sources") + host_list = json_loads(page) + host_list = host_list['allow'] + return host_list diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py index ee1031ad5..e44c1e172 100644 --- a/module/plugins/hooks/HotFolder.py +++ b/module/plugins/hooks/HotFolder.py @@ -28,58 +28,56 @@ import time from module.plugins.Hook import Hook + class HotFolder(Hook): __name__ = "HotFolder" - __version__ = "0.1" + __version__ = "0.11" __description__ = """observe folder and file for changes and add container and links""" - __config__ = [ ("activated", "bool", "Activated" , "False"), - ("folder", "str", "Folder to observe", "container"), - ("watch_file", "bool", "Observe link file", "False"), - ("keep", "bool", "Keep added containers", "True"), - ("file", "str", "Link file", "links.txt")] + __config__ = [("activated", "bool", "Activated", "False"), + ("folder", "str", "Folder to observe", "container"), + ("watch_file", "bool", "Observe link file", "False"), + ("keep", "bool", "Keep added containers", "True"), + ("file", "str", "Link file", "links.txt")] __threaded__ = [] __author_name__ = ("RaNaN") __author_mail__ = ("RaNaN@pyload.de") - + def setup(self): self.interval = 10 - + def periodical(self): - + if not exists(join(self.getConfig("folder"), "finished")): makedirs(join(self.getConfig("folder"), "finished")) - + if self.getConfig("watch_file"): if not exists(self.getConfig("file")): f = open(self.getConfig("file"), "wb") f.close() - - + f = open(self.getConfig("file"), "rb") content = f.read().strip() f.close() f = open(self.getConfig("file"), "wb") f.close() if content: - name = "%s_%s.txt" % (self.getConfig("file"), time.strftime("%H-%M-%S_%d%b%Y") ) + name = "%s_%s.txt" % (self.getConfig("file"), time.strftime("%H-%M-%S_%d%b%Y")) f = open(join(self.getConfig("folder"), "finished", name), "wb") f.write(content) f.close() self.core.api.addPackage(f.name, [f.name], 1) - + for f in listdir(self.getConfig("folder")): path = join(self.getConfig("folder"), f) - + if not isfile(path) or f.endswith("~") or f.startswith("#") or f.startswith("."): continue - - newpath = join(self.getConfig("folder"), "finished", f if self.getConfig("keep") else "tmp_"+f) + + newpath = join(self.getConfig("folder"), "finished", f if self.getConfig("keep") else "tmp_" + f) move(path, newpath) - - self.log.info(_("Added %s from HotFolder") % f) + + self.logInfo(_("Added %s from HotFolder") % f) self.core.api.addPackage(f, [newpath], 1) - -
\ No newline at end of file diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py index a9fc11f53..8dadf08ed 100644 --- a/module/plugins/hooks/IRCInterface.py +++ b/module/plugins/hooks/IRCInterface.py @@ -26,60 +26,60 @@ import time from time import sleep from traceback import print_exc import re +from pycurl import FORM_FILE from module.plugins.Hook import Hook from module.network.RequestFactory import getURL from module.utils import formatSize from module.Api import PackageDoesNotExists, FileDoesNotExists -from pycurl import FORM_FILE class IRCInterface(Thread, Hook): __name__ = "IRCInterface" - __version__ = "0.1" + __version__ = "0.11" __description__ = """connect to irc and let owner perform different tasks""" __config__ = [("activated", "bool", "Activated", "False"), - ("host", "str", "IRC-Server Address", "Enter your server here!"), - ("port", "int", "IRC-Server Port", "6667"), - ("ident", "str", "Clients ident", "pyload-irc"), - ("realname", "str", "Realname", "pyload-irc"), - ("nick", "str", "Nickname the Client will take", "pyLoad-IRC"), - ("owner", "str", "Nickname the Client will accept commands from", "Enter your nick here!"), - ("info_file", "bool", "Inform about every file finished", "False"), - ("info_pack", "bool", "Inform about every package finished", "True"), - ("captcha", "bool", "Send captcha requests", "True")] + ("host", "str", "IRC-Server Address", "Enter your server here!"), + ("port", "int", "IRC-Server Port", "6667"), + ("ident", "str", "Clients ident", "pyload-irc"), + ("realname", "str", "Realname", "pyload-irc"), + ("nick", "str", "Nickname the Client will take", "pyLoad-IRC"), + ("owner", "str", "Nickname the Client will accept commands from", "Enter your nick here!"), + ("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") - + def __init__(self, core, manager): Thread.__init__(self) Hook.__init__(self, core, manager) self.setDaemon(True) # self.sm = core.server_methods - self.api = core.api #todo, only use api - + self.api = core.api # todo, only use api + def coreReady(self): self.new_package = {} - + self.abort = False - + self.links_added = 0 self.more = [] self.start() - - + def packageFinished(self, pypack): try: if self.getConfig("info_pack"): self.response(_("Package finished: %s") % pypack.name) except: pass - + def downloadFinished(self, pyfile): try: if self.getConfig("info_file"): - self.response(_("Download finished: %(name)s @ %(plugin)s ") % { "name" : pyfile.name, "plugin": pyfile.pluginname} ) + self.response( + _("Download finished: %(name)s @ %(plugin)s ") % {"name": pyfile.name, "plugin": pyfile.pluginname}) except: pass @@ -88,7 +88,8 @@ class IRCInterface(Thread, Hook): task.handler.append(self) task.setWaiting(60) - page = getURL("http://www.freeimagehosting.net/upload.php", post={"attached" : (FORM_FILE, task.captchaFile)}, multipart=True) + page = getURL("http://www.freeimagehosting.net/upload.php", + post={"attached": (FORM_FILE, task.captchaFile)}, multipart=True) url = re.search(r"\[img\]([^\[]+)\[/img\]\[/url\]", page).group(1) self.response(_("New Captcha Request: %s") % url) @@ -105,17 +106,16 @@ class IRCInterface(Thread, Hook): for t in self.getConfig("owner").split(): if t.strip().startswith("#"): self.sock.send("JOIN %s\r\n" % t.strip()) - self.log.info("pyLoad IRC: Connected to %s!" % host) - self.log.info("pyLoad IRC: Switching to listening mode!") - try: + self.logInfo("pyLoad IRC: Connected to %s!" % host) + self.logInfo("pyLoad IRC: Switching to listening mode!") + try: self.main_loop() - + except IRCError, ex: self.sock.send("QUIT :byebye\r\n") print_exc() self.sock.close() - def main_loop(self): readbuffer = "" while True: @@ -123,61 +123,60 @@ class IRCInterface(Thread, Hook): fdset = select([self.sock], [], [], 0) if self.sock not in fdset[0]: continue - + if self.abort: raise IRCError("quit") - + readbuffer += self.sock.recv(1024) temp = readbuffer.split("\n") readbuffer = temp.pop() for line in temp: - line = line.rstrip() + line = line.rstrip() first = line.split() if first[0] == "PING": self.sock.send("PONG %s\r\n" % first[1]) - + if first[0] == "ERROR": raise IRCError(line) - + msg = line.split(None, 3) if len(msg) < 4: continue - + msg = { - "origin":msg[0][1:], - "action":msg[1], - "target":msg[2], - "text":msg[3][1:] + "origin": msg[0][1:], + "action": msg[1], + "target": msg[2], + "text": msg[3][1:] } - + self.handle_events(msg) - - + def handle_events(self, msg): if not msg["origin"].split("!", 1)[0] in self.getConfig("owner").split(): return - + if msg["target"].split("!", 1)[0] != self.getConfig("nick"): return - + if msg["action"] != "PRIVMSG": return - + # HANDLE CTCP ANTI FLOOD/BOT PROTECTION if msg["text"] == "\x01VERSION\x01": - self.log.debug("Sending CTCP VERSION.") + self.logDebug("Sending CTCP VERSION.") self.sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface")) return elif msg["text"] == "\x01TIME\x01": - self.log.debug("Sending CTCP TIME.") + self.logDebug("Sending CTCP TIME.") self.sock.send("NOTICE %s :%d\r\n" % (msg['origin'], time.time())) return elif msg["text"] == "\x01LAG\x01": - self.log.debug("Received CTCP LAG.") # don't know how to answer + self.logDebug("Received CTCP LAG.") # don't know how to answer return - + trigger = "pass" args = None @@ -195,26 +194,25 @@ class IRCInterface(Thread, Hook): for line in res: self.response(line, msg["origin"]) except Exception, e: - self.log.error("pyLoad IRC: "+ repr(e)) - - + self.logError("pyLoad IRC: " + repr(e)) + def response(self, msg, origin=""): if origin == "": for t in self.getConfig("owner").split(): self.sock.send("PRIVMSG %s :%s\r\n" % (t.strip(), msg)) else: self.sock.send("PRIVMSG %s :%s\r\n" % (origin.split("!", 1)[0], msg)) - - -#### Events + + #### Events + def event_pass(self, args): return [] - + def event_status(self, args): downloads = self.api.statusDownloads() if not downloads: return ["INFO: There are no active downloads currently."] - + temp_progress = "" lines = ["ID - Name - Status - Speed - ETA - Progress"] for data in downloads: @@ -225,71 +223,69 @@ class IRCInterface(Thread, Hook): temp_progress = "%d%% (%s)" % (data.percent, data.format_size) lines.append("#%d - %s - %s - %s - %s - %s" % - ( - data.fid, - data.name, - data.statusmsg, - "%s/s" % formatSize(data.speed), - "%s" % data.format_eta, - temp_progress - ) - ) + ( + data.fid, + data.name, + data.statusmsg, + "%s/s" % formatSize(data.speed), + "%s" % data.format_eta, + temp_progress + )) return lines - + def event_queue(self, args): ps = self.api.getQueueData() - + if not ps: return ["INFO: There are no packages in queue."] - + lines = [] for pack in ps: - lines.append('PACKAGE #%s: "%s" with %d links.' % (pack.pid, pack.name, len(pack.links) )) - + lines.append('PACKAGE #%s: "%s" with %d links.' % (pack.pid, pack.name, len(pack.links))) + return lines - + def event_collector(self, args): ps = self.api.getCollectorData() if not ps: return ["INFO: No packages in collector!"] - + lines = [] for pack in ps: - lines.append('PACKAGE #%s: "%s" with %d links.' % (pack.pid, pack.name, len(pack.links) )) - + lines.append('PACKAGE #%s: "%s" with %d links.' % (pack.pid, pack.name, len(pack.links))) + return lines - + def event_info(self, args): if not args: return ['ERROR: Use info like this: info <id>'] - + info = None try: info = self.api.getFileData(int(args[0])) - + except FileDoesNotExists: return ["ERROR: Link doesn't exists."] - return ['LINK #%s: %s (%s) [%s][%s]' % (info.fid, info.name, info.format_size, info.statusmsg, - info.plugin)] - + return ['LINK #%s: %s (%s) [%s][%s]' % (info.fid, info.name, info.format_size, info.statusmsg, info.plugin)] + def event_packinfo(self, args): if not args: return ['ERROR: Use packinfo like this: packinfo <id>'] - + lines = [] pack = None try: pack = self.api.getPackageData(int(args[0])) - + except PackageDoesNotExists: return ["ERROR: Package doesn't exists."] - + id = args[0] self.more = [] - - lines.append('PACKAGE #%s: "%s" with %d links' % (id, pack.name, len(pack.links)) ) + + lines.append('PACKAGE #%s: "%s" with %d links' % (id, pack.name, len(pack.links))) for pyfile in pack.links: self.more.append('LINK #%s: %s (%s) [%s][%s]' % (pyfile.fid, pyfile.name, pyfile.format_size, pyfile.statusmsg, pyfile.plugin)) @@ -301,74 +297,69 @@ class IRCInterface(Thread, Hook): lines.extend(self.more[:6]) self.more = self.more[6:] lines.append("%d more links do display." % len(self.more)) - - + return lines - + def event_more(self, args): if not self.more: return ["No more information to display."] - + lines = self.more[:6] self.more = self.more[6:] lines.append("%d more links do display." % len(self.more)) - + return lines - + def event_start(self, args): - + self.api.unpauseServer() return ["INFO: Starting downloads."] - + def event_stop(self, args): - + self.api.pauseServer() return ["INFO: No new downloads will be started."] - - + def event_add(self, args): if len(args) < 2: return ['ERROR: Add links like this: "add <packagename|id> links". ', - 'This will add the link <link> to to the package <package> / the package with id <id>!'] - + 'This will add the link <link> to to the package <package> / the package with id <id>!'] - pack = args[0].strip() links = [x.strip() for x in args[1:]] - + count_added = 0 count_failed = 0 try: - id = int(pack) + id = int(pack) pack = self.api.getPackageData(id) if not pack: return ["ERROR: Package doesn't exists."] - + #TODO add links - + return ["INFO: Added %d links to Package %s [#%d]" % (len(links), pack["name"], id)] - + except: # create new package id = self.api.addPackage(pack, links, 1) return ["INFO: Created new Package %s [#%d] with %d links." % (pack, id, len(links))] - - + def event_del(self, args): if len(args) < 2: return ["ERROR: Use del command like this: del -p|-l <id> [...] (-p indicates that the ids are from packages, -l indicates that the ids are from links)"] - + if args[0] == "-p": ret = self.api.deletePackages(map(int, args[1:])) return ["INFO: Deleted %d packages!" % len(args[1:])] - + elif args[0] == "-l": ret = self.api.delLinks(map(int, args[1:])) return ["INFO: Deleted %d links!" % len(args[1:])] else: return ["ERROR: Use del command like this: del <-p|-l> <id> [...] (-p indicates that the ids are from packages, -l indicates that the ids are from links)"] - + def event_push(self, args): if not args: return ["ERROR: Push package to queue like this: push <package id>"] @@ -401,11 +392,10 @@ class IRCInterface(Thread, Hook): task = self.core.captchaManager.getTaskByID(args[0]) if not task: return ["ERROR: Captcha Task with ID %s does not exists." % args[0]] - + task.setResult(" ".join(args[1:])) return ["INFO: Result %s saved." % " ".join(args[1:])] - def event_help(self, args): lines = ["The following commands are available:", "add <package|packid> <links> [...] Adds link to package. (creates new package if it does not exist)", @@ -422,10 +412,11 @@ class IRCInterface(Thread, Hook): "status Show general download status", "help Shows this help message"] return lines - - + + class IRCError(Exception): def __init__(self, value): self.value = value + def __str__(self): return repr(self.value) diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py index f8f515113..c9e43b8ae 100644 --- a/module/plugins/hooks/ImageTyperz.py +++ b/module/plugins/hooks/ImageTyperz.py @@ -16,16 +16,14 @@ @author: mkaay, RaNaN, zoidberg """ from __future__ import with_statement - from thread import start_new_thread from pycurl import FORM_FILE, LOW_SPEED_TIME +import re +from base64 import b64encode from module.network.RequestFactory import getURL, getRequest -from module.network.HTTPRequest import BadHeader - from module.plugins.Hook import Hook -import re -from base64 import b64encode + class ImageTyperzException(Exception): def __init__(self, err): @@ -40,6 +38,7 @@ class ImageTyperzException(Exception): def __repr__(self): return "<ImageTyperzException %s>" % self.err + class ImageTyperz(Hook): __name__ = "ImageTyperz" __version__ = "0.04" @@ -59,28 +58,25 @@ class ImageTyperz(Hook): self.info = {} def getCredits(self): - response = getURL(self.GETCREDITS_URL, - post = {"action": "REQUESTBALANCE", - "username": self.getConfig("username"), - "password": self.getConfig("passkey")} - ) - + response = getURL(self.GETCREDITS_URL, post={"action": "REQUESTBALANCE", "username": self.getConfig("username"), + "password": self.getConfig("passkey")}) + if response.startswith('ERROR'): raise ImageTyperzException(response) - + try: balance = float(response) except: raise ImageTyperzException("invalid response") - + self.logInfo("Account balance: $%s left" % response) - return balance + return balance def submit(self, captcha, captchaType="file", match=None): req = getRequest() #raise timeout threshold req.c.setopt(LOW_SPEED_TIME, 80) - + try: #workaround multipart-post bug in HTTPRequest.py if re.match("^[A-Za-z0-9]*$", self.getConfig("passkey")): @@ -91,13 +87,11 @@ class ImageTyperz(Hook): with open(captcha, 'rb') as f: data = f.read() data = b64encode(data) - - response = req.load(self.SUBMIT_URL, - post={ "action": "UPLOADCAPTCHA", - "username": self.getConfig("username"), - "password": self.getConfig("passkey"), - "file": data}, - multipart = multipart) + + response = req.load(self.SUBMIT_URL, post={"action": "UPLOADCAPTCHA", + "username": self.getConfig("username"), + "password": self.getConfig("passkey"), "file": data}, + multipart=multipart) finally: req.close() @@ -108,14 +102,14 @@ class ImageTyperz(Hook): if len(data) == 2: ticket, result = data else: - raise ImageTyperzException("Unknown response %s" % response) - + raise ImageTyperzException("Unknown response %s" % response) + return ticket, result def newCaptchaTask(self, task): if "service" in task.data: return False - + if not task.isTextual(): return False @@ -136,17 +130,14 @@ class ImageTyperz(Hook): def captchaInvalid(self, task): if task.data['service'] == self.__name__ and "ticket" in task.data: - response = getURL(self.RESPOND_URL, - post={"action": "SETBADIMAGE", - "username": self.getConfig("username"), - "password": self.getConfig("passkey"), - "imageid": task.data["ticket"]} - ) - + response = getURL(self.RESPOND_URL, post={"action": "SETBADIMAGE", "username": self.getConfig("username"), + "password": self.getConfig("passkey"), + "imageid": task.data["ticket"]}) + if response == "SUCCESS": self.logInfo("Bad captcha solution received, requested refund") else: - self.logError("Bad captcha solution received, refund request failed", response) + self.logError("Bad captcha solution received, refund request failed", response) def processCaptcha(self, task): c = task.captchaFile @@ -157,4 +148,4 @@ class ImageTyperz(Hook): return task.data["ticket"] = ticket - task.setResult(result)
\ No newline at end of file + task.setResult(result) diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterCom.py index c117cafb9..f2176e799 100644 --- a/module/plugins/hooks/LinkdecrypterCom.py +++ b/module/plugins/hooks/LinkdecrypterCom.py @@ -22,11 +22,12 @@ from module.plugins.Hook import Hook from module.network.RequestFactory import getURL from module.utils import remove_chars + class LinkdecrypterCom(Hook): __name__ = "LinkdecrypterCom" __version__ = "0.18" __description__ = """linkdecrypter.com - regexp loader""" - __config__ = [ ("activated", "bool", "Activated" , "False") ] + __config__ = [("activated", "bool", "Activated", "False")] __author_name__ = ("zoidberg") def coreReady(self): @@ -36,8 +37,8 @@ class LinkdecrypterCom(Hook): self.logError(_("Crypter list not found")) return - builtin = [ name.lower() for name in self.core.pluginManager.crypterPlugins.keys() ] - builtin.extend([ "downloadserienjunkiesorg" ]) + builtin = [name.lower() for name in self.core.pluginManager.crypterPlugins.keys()] + builtin.extend(["downloadserienjunkiesorg"]) crypter_pattern = re.compile("(\w[\w.-]+)") online = [] @@ -49,11 +50,11 @@ class LinkdecrypterCom(Hook): if not online: self.logError(_("Crypter list is empty")) return - + regexp = r"https?://([^.]+\.)*?(%s)/.*" % "|".join(online) dict = self.core.pluginManager.crypterPlugins[self.__name__] dict["pattern"] = regexp dict["re"] = re.compile(regexp) - + self.logDebug("REGEXP: " + regexp) diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index 02d343096..060dae7a2 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -19,7 +19,6 @@ import os import re -import sys import traceback from os.path import join @@ -28,13 +27,12 @@ from module.plugins.Hook import Hook BUFFER_SIZE = 4096 + class MergeFiles(Hook): __name__ = "MergeFiles" - __version__ = "0.1" + __version__ = "0.11" __description__ = "Merges parts splitted with hjsplit" - __config__ = [ - ("activated" , "bool" , "Activated" , "False"), - ] + __config__ = [("activated", "bool", "Activated", "False")] __threaded__ = ["packageFinished"] __author_name__ = ("and9000") __author_mail__ = ("me@has-no-mail.com") @@ -42,7 +40,7 @@ class MergeFiles(Hook): def setup(self): # nothing to do pass - + def packageFinished(self, pack): files = {} fid_dict = {} @@ -53,18 +51,18 @@ class MergeFiles(Hook): files[data["name"][:-4]].append(data["name"]) files[data["name"][:-4]].sort() fid_dict[data["name"]] = fid - + download_folder = self.core.config['general']['download_folder'] - + if self.core.config['general']['folder_per_package']: download_folder = save_join(download_folder, pack.folder) for name, file_list in files.iteritems(): - self.core.log.info("Starting merging of %s" % name) + self.logInfo("Starting merging of %s" % name) final_file = open(join(download_folder, fs_encode(name)), "wb") for splitted_file in file_list: - self.core.log.debug("Merging part %s" % splitted_file) + self.logDebug("Merging part %s" % splitted_file) pyfile = self.core.files.getFile(fid_dict[splitted_file]) pyfile.setStatus("processing") try: @@ -76,19 +74,17 @@ class MergeFiles(Hook): if f_buffer: final_file.write(f_buffer) size_written += BUFFER_SIZE - pyfile.setProgress((size_written*100)/s_file_size) + pyfile.setProgress((size_written * 100) / s_file_size) else: break s_file.close() - self.core.log.debug("Finished merging part %s" % splitted_file) + self.logDebug("Finished merging part %s" % splitted_file) except Exception, e: print traceback.print_exc() finally: pyfile.setProgress(100) pyfile.setStatus("finished") pyfile.release() - - final_file.close() - self.core.log.info("Finished merging of %s" % name) - + final_file.close() + self.logInfo("Finished merging of %s" % name) diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index f15148538..473e6dcb1 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -17,18 +17,20 @@ @author: mkaay """ -from module.plugins.Hook import Hook from time import time +from module.plugins.Hook import Hook + + class MultiHome(Hook): __name__ = "MultiHome" - __version__ = "0.1" + __version__ = "0.11" __description__ = """ip address changer""" - __config__ = [ ("activated", "bool", "Activated" , "False"), - ("interfaces", "str", "Interfaces" , "None") ] + __config__ = [("activated", "bool", "Activated", "False"), + ("interfaces", "str", "Interfaces", "None")] __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") - + def setup(self): self.register = {} self.interfaces = [] @@ -36,28 +38,30 @@ class MultiHome(Hook): if not self.interfaces: self.parseInterfaces([self.config["download"]["interface"]]) self.setConfig("interfaces", self.toConfig()) - + def toConfig(self): return ";".join([i.adress for i in self.interfaces]) - + def parseInterfaces(self, interfaces): for interface in interfaces: if not interface or str(interface).lower() == "none": continue self.interfaces.append(Interface(interface)) - + def coreReady(self): requestFactory = self.core.requestFactory oldGetRequest = requestFactory.getRequest + def getRequest(pluginName, account=None): iface = self.bestInterface(pluginName, account) if iface: iface.useFor(pluginName, account) requestFactory.iface = lambda: iface.adress - self.log.debug("Multihome: using address: "+iface.adress) + self.logDebug("Multihome: using address: " + iface.adress) return oldGetRequest(pluginName, account) + requestFactory.getRequest = getRequest - + def bestInterface(self, pluginName, account): best = None for interface in self.interfaces: @@ -65,18 +69,19 @@ class MultiHome(Hook): best = interface return best + class Interface(object): def __init__(self, adress): self.adress = adress self.history = {} - + def lastPluginAccess(self, pluginName, account): if (pluginName, account) in self.history: return self.history[(pluginName, account)] return 0 - + def useFor(self, pluginName, account): self.history[(pluginName, account)] = time() - + def __repr__(self): return "<Interface - %s>" % self.adress diff --git a/module/plugins/hooks/MultishareCz.py b/module/plugins/hooks/MultishareCz.py index 7e5a3e007..fc35bb785 100644 --- a/module/plugins/hooks/MultishareCz.py +++ b/module/plugins/hooks/MultishareCz.py @@ -1,16 +1,18 @@ # -*- coding: utf-8 -*- +import re + from module.network.RequestFactory import getURL from module.plugins.internal.MultiHoster import MultiHoster -import re + class MultishareCz(MultiHoster): __name__ = "MultishareCz" __version__ = "0.04" __type__ = "hook" __config__ = [("activated", "bool", "Activated", "False"), - ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")] + ("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") @@ -18,6 +20,5 @@ class MultishareCz(MultiHoster): HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="([^"]+)"></td>\s*<td class="stav">[^>]*?alt="OK"' def getHoster(self): - page = getURL("http://www.multishare.cz/monitoring/") - return re.findall(self.HOSTER_PATTERN, page)
\ No newline at end of file + return re.findall(self.HOSTER_PATTERN, page) diff --git a/module/plugins/hooks/Premium4Me.py b/module/plugins/hooks/Premium4Me.py index 16b02ce87..4bcc79b25 100644 --- a/module/plugins/hooks/Premium4Me.py +++ b/module/plugins/hooks/Premium4Me.py @@ -1,33 +1,32 @@ -# -*- coding: utf-8 -*-
-
-from module.network.RequestFactory import getURL
-from module.plugins.internal.MultiHoster import MultiHoster
-
-class Premium4Me(MultiHoster):
- __name__ = "Premium4Me"
- __version__ = "0.03"
- __type__ = "hook"
-
- __config__ = [("activated", "bool", "Activated", "False"),
- ("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),
- ("hosterList", "str", "Hoster list (comma separated)", "")]
- __description__ = """Premium.to hook plugin"""
- __author_name__ = ("RaNaN", "zoidberg", "stickell")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
-
- def getHoster(self):
-
- page = getURL("http://premium.to/api/hosters.php?authcode=%s" % self.account.authcode)
- return [x.strip() for x in page.replace("\"", "").split(";")]
-
- def coreReady(self):
-
- self.account = self.core.accountManager.getAccountPlugin("Premium4Me")
-
- user = self.account.selectAccount()[0]
-
- if not user:
- self.logError(_("Please add your premium.to account first and restart pyLoad"))
- return
-
- return MultiHoster.coreReady(self)
\ No newline at end of file +# -*- coding: utf-8 -*- + +from module.network.RequestFactory import getURL +from module.plugins.internal.MultiHoster import MultiHoster + + +class Premium4Me(MultiHoster): + __name__ = "Premium4Me" + __version__ = "0.03" + __type__ = "hook" + + __config__ = [("activated", "bool", "Activated", "False"), + ("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"), + ("hosterList", "str", "Hoster list (comma separated)", "")] + __description__ = """Premium.to hook plugin""" + __author_name__ = ("RaNaN", "zoidberg", "stickell") + __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") + + def getHoster(self): + page = getURL("http://premium.to/api/hosters.php?authcode=%s" % self.account.authcode) + return [x.strip() for x in page.replace("\"", "").split(";")] + + def coreReady(self): + self.account = self.core.accountManager.getAccountPlugin("Premium4Me") + + user = self.account.selectAccount()[0] + + if not user: + self.logError(_("Please add your premium.to account first and restart pyLoad")) + return + + return MultiHoster.coreReady(self) diff --git a/module/plugins/hooks/PremiumizeMe.py b/module/plugins/hooks/PremiumizeMe.py index a10c24f85..07630420c 100644 --- a/module/plugins/hooks/PremiumizeMe.py +++ b/module/plugins/hooks/PremiumizeMe.py @@ -1,8 +1,9 @@ from module.plugins.internal.MultiHoster import MultiHoster -from module.common.json_layer import json_loads +from module.common.json_layer import json_loads from module.network.RequestFactory import getURL + class PremiumizeMe(MultiHoster): __name__ = "PremiumizeMe" __version__ = "0.12" @@ -10,41 +11,42 @@ class PremiumizeMe(MultiHoster): __description__ = """Premiumize.Me hook plugin""" __config__ = [("activated", "bool", "Activated", "False"), - ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("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__ = ("Florian Franzen") __author_mail__ = ("FlorianFranzen@gmail.com") - - def getHoster(self): + + def getHoster(self): # If no accounts are available there will be no hosters available if not self.account or not self.account.canUse(): return [] - + # Get account data (user, data) = self.account.selectAccount() - - # Get supported hosters list from premiumize.me using the json API v1 (see https://secure.premiumize.me/?show=api) - answer = getURL("https://api.premiumize.me/pm-api/v1.php?method=hosterlist¶ms[login]=%s¶ms[pass]=%s" % (user, data['password'])) + + # Get supported hosters list from premiumize.me using the + # json API v1 (see https://secure.premiumize.me/?show=api) + answer = getURL("https://api.premiumize.me/pm-api/v1.php?method=hosterlist¶ms[login]=%s¶ms[pass]=%s" % ( + user, data['password'])) data = json_loads(answer) - - + # If account is not valid thera are no hosters available if data['status'] != 200: return [] - + # Extract hosters from json file - return data['result']['hosterlist'] - + return data['result']['hosterlist'] + def coreReady(self): # Get account plugin and check if there is a valid account available - self.account = self.core.accountManager.getAccountPlugin("PremiumizeMe") + self.account = self.core.accountManager.getAccountPlugin("PremiumizeMe") if not self.account.canUse(): self.account = None self.logError(_("Please add a valid premiumize.me account first and restart pyLoad.")) return - + # Run the overwriten core ready which actually enables the multihoster hook - return MultiHoster.coreReady(self)
\ No newline at end of file + return MultiHoster.coreReady(self) diff --git a/module/plugins/hooks/RealdebridCom.py b/module/plugins/hooks/RealdebridCom.py index be74b47c3..41e988495 100644 --- a/module/plugins/hooks/RealdebridCom.py +++ b/module/plugins/hooks/RealdebridCom.py @@ -3,6 +3,7 @@ from module.network.RequestFactory import getURL from module.plugins.internal.MultiHoster import MultiHoster + class RealdebridCom(MultiHoster): __name__ = "RealdebridCom" __version__ = "0.43" @@ -20,6 +21,6 @@ class RealdebridCom(MultiHoster): def getHoster(self): https = "https" if self.getConfig("https") else "http" - page = getURL(https + "://real-debrid.com/api/hosters.php").replace("\"","").strip() + page = getURL(https + "://real-debrid.com/api/hosters.php").replace("\"", "").strip() return [x.strip() for x in page.split(",") if x.strip()] diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py index 7ca5e5cde..6e24988c8 100644 --- a/module/plugins/hooks/RehostTo.py +++ b/module/plugins/hooks/RehostTo.py @@ -3,9 +3,10 @@ from module.network.RequestFactory import getURL from module.plugins.internal.MultiHoster import MultiHoster + class RehostTo(MultiHoster): __name__ = "RehostTo" - __version__ = "0.42" + __version__ = "0.43" __type__ = "hook" __config__ = [("activated", "bool", "Activated", "False"), @@ -19,23 +20,20 @@ class RehostTo(MultiHoster): __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) return [x.strip() for x in page.replace("\"", "").split(",")] - def coreReady(self): - self.account = self.core.accountManager.getAccountPlugin("RehostTo") user = self.account.selectAccount()[0] if not user: - self.log.error("Rehost.to: "+ _("Please add your rehost.to account first and restart pyLoad")) + self.logError("Rehost.to: " + _("Please add your rehost.to account first and restart pyLoad")) return data = self.account.getAccountInfo(user) self.ses = data["ses"] self.long_ses = data["long_ses"] - return MultiHoster.coreReady(self)
\ No newline at end of file + return MultiHoster.coreReady(self) diff --git a/module/plugins/hooks/ReloadCc.py b/module/plugins/hooks/ReloadCc.py index dbd9d659b..d07923624 100644 --- a/module/plugins/hooks/ReloadCc.py +++ b/module/plugins/hooks/ReloadCc.py @@ -1,8 +1,9 @@ from module.plugins.internal.MultiHoster import MultiHoster -from module.common.json_layer import json_loads +from module.common.json_layer import json_loads from module.network.RequestFactory import getURL + class ReloadCc(MultiHoster): __name__ = "ReloadCc" __version__ = "0.3" @@ -16,7 +17,7 @@ class ReloadCc(MultiHoster): __author_name__ = ("Reload Team") __author_mail__ = ("hello@reload.cc") - interval = 0 # Disable periodic calls + interval = 0 # Disable periodic calls def getHoster(self): # If no accounts are available there will be no hosters available @@ -44,7 +45,6 @@ class ReloadCc(MultiHoster): answer = getURL("http://api.reload.cc/login", get=query_params) data = json_loads(answer) - # If account is not valid thera are no hosters available if data['status'] != "ok": print "ReloadCc: Status is not ok: %s" % data['status'] diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py index c78ccf96c..3bf6fe365 100644 --- a/module/plugins/hooks/RestartFailed.py +++ b/module/plugins/hooks/RestartFailed.py @@ -2,13 +2,14 @@ from module.plugins.Hook import Hook + class RestartFailed(Hook): __name__ = "RestartFailed" __version__ = "1.52" __description__ = "restartedFailed Packages after defined time" - __config__ = [("activated", "bool", "Activated" , "False"), - ("interval", "int", "Interval in Minutes", "15") ] - + __config__ = [("activated", "bool", "Activated", "False"), + ("interval", "int", "Interval in Minutes", "15")] + __author_name__ = ("bambie") __author_mail__ = ("bambie@gulli.com") diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index 561329122..ddf19117d 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -1,4 +1,4 @@ - # -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- """ This program is free software; you can redistribute it and/or modify @@ -17,10 +17,11 @@ @author: Walter Purcaro """ -from module.plugins.Hook import Hook from os.path import basename from re import search +from module.plugins.Hook import Hook + class SkipRev(Hook): __name__ = "SkipRev" diff --git a/module/plugins/hooks/UnSkipOnFail.py b/module/plugins/hooks/UnSkipOnFail.py index 4b7a58be8..455832b09 100644 --- a/module/plugins/hooks/UnSkipOnFail.py +++ b/module/plugins/hooks/UnSkipOnFail.py @@ -22,11 +22,12 @@ from module.utils import fs_encode from module.plugins.Hook import Hook from module.PyFile import PyFile + class UnSkipOnFail(Hook): __name__ = 'UnSkipOnFail' __version__ = '0.01' __description__ = 'When a download fails, restart "skipped" duplicates.' - __config__ = [('activated', 'bool', 'Activated', True),] + __config__ = [('activated', 'bool', 'Activated', True), ] __author_name__ = ('hagg',) __author_mail__ = ('') @@ -94,4 +95,3 @@ class UnSkipOnFail(Hook): pyfile.setStatus(new_status) self.core.files.save() pyfile.release() - diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index c800b44bf..62031e6a4 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -27,18 +27,19 @@ from module.ConfigParser import IGNORE from module.network.RequestFactory import getURL from module.plugins.Hook import threaded, Expose, Hook + class UpdateManager(Hook): __name__ = "UpdateManager" - __version__ = "0.13" + __version__ = "0.15" __description__ = """checks for updates""" __config__ = [("activated", "bool", "Activated", "True"), - ("interval", "int", "Check interval in minutes", "480"), - ("debug", "bool", "Check for plugin changes when in debug mode", False)] + ("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") URL = "http://get.pyload.org/check2/%s/" - MIN_TIME = 3 * 60 * 60 # 3h minimum check interval + MIN_TIME = 3 * 60 * 60 # 3h minimum check interval @property def debug(self): @@ -48,10 +49,10 @@ class UpdateManager(Hook): if self.debug: self.logDebug("Monitoring file changes") self.interval = 4 - self.last_check = 0 #timestamp of updatecheck + self.last_check = 0 # timestamp of updatecheck self.old_periodical = self.periodical self.periodical = self.checkChanges - self.mtimes = {} #recordes times + self.mtimes = {} # recordes times else: self.interval = max(self.getConfig("interval") * 60, self.MIN_TIME) @@ -70,12 +71,12 @@ class UpdateManager(Hook): if self.updated and not self.reloaded: self.info["plugins"] = True - self.log.info(_("*** Plugins have been updated, please restart pyLoad ***")) + self.logInfo(_("*** Plugins have been updated, please restart pyLoad ***")) elif self.updated and self.reloaded: - self.log.info(_("Plugins updated and reloaded")) + self.logInfo(_("Plugins updated and reloaded")) self.updated = False elif self.version == "None": - self.log.info(_("No plugin updates available")) + self.logInfo(_("No plugin updates available")) @Expose def recheckForUpdates(self): @@ -86,31 +87,30 @@ class UpdateManager(Hook): """checks if an update is available, return result""" try: - if self.version == "None": # No updated known + if self.version == "None": # No updated known version_check = getURL(self.URL % self.core.api.getServerVersion()).splitlines() self.version = version_check[0] # Still no updates, plugins will be checked if self.version == "None": - self.log.info(_("No Updates for pyLoad")) + self.logInfo(_("No Updates for pyLoad")) return version_check[1:] - self.info["pyload"] = True - self.log.info(_("*** New pyLoad Version %s available ***") % self.version) - self.log.info(_("*** Get it here: http://pyload.org/download ***")) + self.logInfo(_("*** New pyLoad Version %s available ***") % self.version) + self.logInfo(_("*** Get it here: http://pyload.org/download ***")) except: - self.log.warning(_("Not able to connect server for updates")) - - return None # Nothing will be done + self.logWarning(_("Not able to connect server for updates")) + return None # Nothing will be done def checkPlugins(self, updates): """ checks for plugins updates""" # plugins were already updated - if self.info["plugins"]: return + if self.info["plugins"]: + return reloads = [] @@ -145,7 +145,7 @@ class UpdateManager(Hook): if name in IGNORE or (type, name) in IGNORE: continue - self.log.info(_("New version of %(type)s|%(name)s : %(version).2f") % { + self.logInfo(_("New version of %(type)s|%(name)s : %(version).2f") % { "type": type, "name": name, "version": float(version) @@ -178,8 +178,8 @@ class UpdateManager(Hook): self.last_check = time() modules = filter( - lambda m: m and (m.__name__.startswith("module.plugins.") or m.__name__.startswith("userplugins.")) and m.__name__.count(".") >= 2, - sys.modules.itervalues()) + lambda m: m and (m.__name__.startswith("module.plugins.") or m.__name__.startswith( + "userplugins.")) and m.__name__.count(".") >= 2, sys.modules.itervalues()) reloads = [] @@ -188,7 +188,8 @@ class UpdateManager(Hook): id = (type, name) if type in self.core.pluginManager.plugins: f = m.__file__.replace(".pyc", ".py") - if not exists(f): continue + if not exists(f): + continue mtime = stat(f).st_mtime diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index f14ba7eb7..fe2df840d 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -1,16 +1,18 @@ # -*- coding: utf-8 -*- -from module.plugins.Hook import Hook import re +from module.plugins.Hook import Hook + + class XFileSharingPro(Hook): __name__ = "XFileSharingPro" - __version__ = "0.05" + __version__ = "0.06" __type__ = "hook" - __config__ = [ ("activated" , "bool" , "Activated" , "True"), - ("loadDefault", "bool", "Include default (built-in) hoster list" , "True"), - ("includeList", "str", "Include hosters (comma separated)", ""), - ("excludeList", "str", "Exclude hosters (comma separated)", "") ] + __config__ = [("activated", "bool", "Activated", "True"), + ("loadDefault", "bool", "Include default (built-in) hoster list", "True"), + ("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") @@ -24,25 +26,27 @@ class XFileSharingPro(Hook): if self.getConfig('loadDefault'): hosterList |= set(( - #WORKING HOSTERS: - "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", - #NOT TESTED: - "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", "grupload.com", "heftyfile.com", - "host4desi.com", "laoupload.com", "linkzhost.com", "movreel.com", "rockdizfile.com", "limfile.com" - "share76.com", "sharebeast.com", "sharehut.com", "sharerun.com", "shareswift.com", "sharingonline.com", "6ybh-upload.com", - "skipfile.com", "spaadyshare.com", "space4file.com", "uploadbaz.com", "uploadc.com", - "uploaddot.com", "uploadfloor.com", "uploadic.com", "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", - #WRONG FILE NAME: - "sendmyway.com", "upchi.co.il", - #NOT WORKING: - "amonshare.com", "imageporter.com", "file4safe.com", - #DOWN OR BROKEN: - "ddlanime.com", "fileforth.com", "loombo.com", "goldfile.eu", "putshare.com" + #WORKING HOSTERS: + "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", + #NOT TESTED: + "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", + "grupload.com", "heftyfile.com", "host4desi.com", "laoupload.com", "linkzhost.com", "movreel.com", + "rockdizfile.com", "limfile.com", "share76.com", "sharebeast.com", "sharehut.com", "sharerun.com", + "shareswift.com", "sharingonline.com", "6ybh-upload.com", "skipfile.com", "spaadyshare.com", + "space4file.com", "uploadbaz.com", "uploadc.com", "uploaddot.com", "uploadfloor.com", "uploadic.com", + "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", + #WRONG FILE NAME: + "sendmyway.com", "upchi.co.il", + #NOT WORKING: + "amonshare.com", "imageporter.com", "file4safe.com", + #DOWN OR BROKEN: + "ddlanime.com", "fileforth.com", "loombo.com", "goldfile.eu", "putshare.com" )) hosterList -= (excludeList) @@ -52,7 +56,7 @@ class XFileSharingPro(Hook): self.unload() return - regexp = r"http://(?:[^/]*\.)?(%s)/\w{12}" % ("|".join(sorted(hosterList)).replace('.','\.')) + regexp = r"http://(?:[^/]*\.)?(%s)/\w{12}" % ("|".join(sorted(hosterList)).replace('.', '\.')) #self.logDebug(regexp) dict = self.core.pluginManager.hosterPlugins['XFileSharingPro'] @@ -61,7 +65,7 @@ class XFileSharingPro(Hook): self.logDebug("Pattern loaded - handling %d hosters" % len(hosterList)) def getConfigSet(self, option): - s = self.getConfig(option).lower().replace('|',',').replace(';',',') + s = self.getConfig(option).lower().replace('|', ',').replace(';', ',') return set([x.strip() for x in s.split(',')]) def unload(self): diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py index a96adf524..adffc04e3 100644 --- a/module/plugins/hooks/XMPPInterface.py +++ b/module/plugins/hooks/XMPPInterface.py @@ -13,7 +13,7 @@ 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: RaNaN @interface-version: 0.2 """ @@ -26,18 +26,19 @@ from pyxmpp.interfaces import * from module.plugins.hooks.IRCInterface import IRCInterface + class XMPPInterface(IRCInterface, JabberClient): __name__ = "XMPPInterface" - __version__ = "0.1" + __version__ = "0.11" __description__ = """connect to jabber and let owner perform different tasks""" __config__ = [("activated", "bool", "Activated", "False"), - ("jid", "str", "Jabber ID", "user@exmaple-jabber-server.org"), - ("pw", "str", "Password", ""), - ("tls", "bool", "Use TLS", False), - ("owners", "str", "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"), - ("info_file", "bool", "Inform about every file finished", "False"), - ("info_pack", "bool", "Inform about every package finished", "True"), - ("captcha", "bool", "Send captcha requests", "True")] + ("jid", "str", "Jabber ID", "user@exmaple-jabber-server.org"), + ("pw", "str", "Password", ""), + ("tls", "bool", "Use TLS", False), + ("owners", "str", "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"), + ("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") @@ -69,7 +70,7 @@ class XMPPInterface(IRCInterface, JabberClient): self.interface_providers = [ VersionHandler(self), self, - ] + ] def coreReady(self): self.new_package = {} @@ -97,22 +98,22 @@ class XMPPInterface(IRCInterface, JabberClient): try: self.loop() except Exception, ex: - self.core.log.error("pyLoad XMPP: %s" % str(ex)) + self.logError("pyLoad XMPP: %s" % str(ex)) def stream_state_changed(self, state, arg): """This one is called when the state of stream connecting the component to a server changes. This will usually be used to let the user know what is going on.""" - self.log.debug("pyLoad XMPP: *** State changed: %s %r ***" % (state, arg)) + self.logDebug("pyLoad XMPP: *** State changed: %s %r ***" % (state, arg)) def disconnected(self): - self.log.debug("pyLoad XMPP: Client was disconnected") + self.logDebug("pyLoad XMPP: Client was disconnected") def stream_closed(self, stream): - self.log.debug("pyLoad XMPP: Stream was closed | %s" % stream) + self.logDebug("pyLoad XMPP: Stream was closed | %s" % stream) def stream_error(self, err): - self.log.debug("pyLoad XMPP: Stream Error: %s" % err) + self.logDebug("pyLoad XMPP: Stream Error: %s" % err) def get_message_handlers(self): """Return list of (message_type, message_handler) tuples. @@ -120,16 +121,16 @@ class XMPPInterface(IRCInterface, JabberClient): The handlers returned will be called when matching message is received in a client session.""" return [ - ("normal", self.message), - ] + ("normal", self.message), + ] def message(self, stanza): """Message handler for the component.""" subject = stanza.get_subject() body = stanza.get_body() t = stanza.get_type() - self.log.debug(u'pyLoad XMPP: Message from %s received.' % (unicode(stanza.get_from(), ))) - self.log.debug(u'pyLoad XMPP: Body: %s Subject: %s Type: %s' % (body, subject, t)) + self.logDebug(u'pyLoad XMPP: Message from %s received.' % (unicode(stanza.get_from(), ))) + self.logDebug(u'pyLoad XMPP: Body: %s Subject: %s Type: %s' % (body, subject, t)) if t == "headline": # 'headline' messages should never be replied to @@ -173,7 +174,7 @@ class XMPPInterface(IRCInterface, JabberClient): messages.append(m) except Exception, e: - self.log.error("pyLoad XMPP: " + repr(e)) + self.logError("pyLoad XMPP: " + repr(e)) return messages @@ -186,7 +187,7 @@ class XMPPInterface(IRCInterface, JabberClient): def announce(self, message): """ send message to all owners""" for user in self.getConfig("owners").split(";"): - self.log.debug("pyLoad XMPP: Send message to %s" % user) + self.logDebug("pyLoad XMPP: Send message to %s" % user) to_jid = JID(user) @@ -211,7 +212,7 @@ class XMPPInterface(IRCInterface, JabberClient): class VersionHandler(object): """Provides handler for a version query. - + This class will answer version query and announce 'jabber:iq:version' namespace in the client's disco#info results.""" @@ -230,8 +231,8 @@ class VersionHandler(object): """Return list of tuples (element_name, namespace, handler) describing handlers of <iq type='get'/> stanzas""" return [ - ("query", "jabber:iq:version", self.get_version), - ] + ("query", "jabber:iq:version", self.get_version), + ] def get_iq_set_handlers(self): """Return empty list, as this class provides no <iq type='set'/> stanza handler.""" @@ -248,4 +249,3 @@ class VersionHandler(object): q.newTextChild(q.ns(), "name", "Echo component") q.newTextChild(q.ns(), "version", "1.0") return iq -
\ No newline at end of file diff --git a/module/plugins/hooks/ZeveraCom.py b/module/plugins/hooks/ZeveraCom.py index cadf60069..fb84886d1 100644 --- a/module/plugins/hooks/ZeveraCom.py +++ b/module/plugins/hooks/ZeveraCom.py @@ -3,6 +3,7 @@ from module.network.RequestFactory import getURL from module.plugins.internal.MultiHoster import MultiHoster + class ZeveraCom(MultiHoster): __name__ = "ZeveraCom" __version__ = "0.02" @@ -15,5 +16,5 @@ class ZeveraCom(MultiHoster): __author_mail__ = ("zoidberg@mujmail.cz") def getHoster(self): - page = getURL("http://www.zevera.com/jDownloader.ashx?cmd=gethosters") - return [x.strip() for x in page.replace("\"", "").split(",")]
\ No newline at end of file + page = getURL("http://www.zevera.com/jDownloader.ashx?cmd=gethosters") + return [x.strip() for x in page.replace("\"", "").split(",")] diff --git a/module/plugins/hoster/ARD.py b/module/plugins/hoster/ARD.py index 5ab65cd4b..4404994b3 100644 --- a/module/plugins/hoster/ARD.py +++ b/module/plugins/hoster/ARD.py @@ -1,4 +1,3 @@ - import subprocess import re import os.path @@ -10,6 +9,7 @@ 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 @@ -37,17 +37,20 @@ class RTMP: return subprocess.check_call(args) + class ARD(Hoster): __name__ = "ARD Mediathek" - __version__ = "0.1" + __version__ = "0.11" __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 + 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] @@ -73,7 +76,7 @@ class ARD(Hoster): chown(location, uid, gid) except Exception, e: - self.log.warning(_("Setting User and Group failed: %s") % str(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] diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index efc96ff28..cdb5ccc08 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -1,84 +1,84 @@ -# -*- 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 AlldebridCom(Hoster):
- __name__ = "AlldebridCom"
- __version__ = "0.31"
- __type__ = "hoster"
-
- __pattern__ = r"https?://.*alldebrid\..*"
- __description__ = """Alldebrid.com hoster plugin"""
- __author_name__ = ("Andy, Voigt")
- __author_mail__ = ("spamsales@online.de")
-
- 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 init(self):
- self.tries = 0
- self.chunkLimit = 3
- self.resumeDownload = True
-
- def process(self, pyfile):
- if not self.account:
- self.logError("Please enter your AllDebrid account or deactivate this plugin")
- self.fail("No AllDebrid account provided")
-
- self.log.debug("AllDebrid: Old URL: %s" % pyfile.url)
- if re.match(self.__pattern__, pyfile.url):
- new_url = pyfile.url
- else:
- password = self.getPassword().splitlines()
- password = "" if not password else password[0]
-
- url = "http://www.alldebrid.com/service.php?link=%s&json=true&pw=%s" % (pyfile.url, password)
- page = self.load(url)
- data = json_loads(page)
-
- self.logDebug("Json data: %s" % str(data))
-
- if data["error"]:
- if data["error"] == "This link isn't available on the hoster website.":
- self.offline()
- else:
- self.logWarning(data["error"])
- self.tempOffline()
- else:
- if self.pyfile.name and not self.pyfile.name.endswith('.tmp'):
- self.pyfile.name = data["filename"]
- self.pyfile.size = parseFileSize(data["filesize"])
- new_url = data["link"]
-
- if self.getConfig("https"):
- new_url = new_url.replace("http://", "https://")
- else:
- new_url = new_url.replace("https://", "http://")
-
- self.logDebug("AllDebrid: New URL: %s" % new_url)
-
- if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown"):
- #only use when name wasnt 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</title>",
- "empty": re.compile(r"^$")})
-
- if check == "error":
- self.retry(reason="An error occured while generating link.", wait_time=60)
- elif check == "empty":
- self.retry(reason="Downloaded File was empty.", wait_time=60)
+# -*- 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 AlldebridCom(Hoster): + __name__ = "AlldebridCom" + __version__ = "0.33" + __type__ = "hoster" + + __pattern__ = r"https?://.*alldebrid\..*" + __description__ = """Alldebrid.com hoster plugin""" + __author_name__ = ("Andy, Voigt") + __author_mail__ = ("spamsales@online.de") + + 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 init(self): + self.tries = 0 + self.chunkLimit = 3 + self.resumeDownload = True + + def process(self, pyfile): + if not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "AllDebrid") + self.fail("No AllDebrid account provided") + + self.logDebug("AllDebrid: Old URL: %s" % pyfile.url) + if re.match(self.__pattern__, pyfile.url): + new_url = pyfile.url + else: + password = self.getPassword().splitlines() + password = "" if not password else password[0] + + url = "http://www.alldebrid.com/service.php?link=%s&json=true&pw=%s" % (pyfile.url, password) + page = self.load(url) + data = json_loads(page) + + self.logDebug("Json data: %s" % str(data)) + + if data["error"]: + if data["error"] == "This link isn't available on the hoster website.": + self.offline() + else: + self.logWarning(data["error"]) + self.tempOffline() + else: + if self.pyfile.name and not self.pyfile.name.endswith('.tmp'): + self.pyfile.name = data["filename"] + self.pyfile.size = parseFileSize(data["filesize"]) + new_url = data["link"] + + if self.getConfig("https"): + new_url = new_url.replace("http://", "https://") + else: + new_url = new_url.replace("https://", "http://") + + self.logDebug("AllDebrid: New URL: %s" % new_url) + + if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown"): + #only use when name wasnt 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</title>", + "empty": re.compile(r"^$")}) + + if check == "error": + self.retry(reason="An error occured while generating link.", wait_time=60) + elif check == "empty": + self.retry(reason="Downloaded File was empty.", wait_time=60) diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index f8d494e39..2bdfda7c4 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -8,11 +8,12 @@ from module.network.HTTPRequest import BadHeader from module.plugins.Hoster import Hoster from module.utils import html_unescape, remove_chars + class BasePlugin(Hoster): __name__ = "BasePlugin" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.17" + __version__ = "0.19" __description__ = """Base Plugin when any other didnt fit""" __author_name__ = ("RaNaN") __author_mail__ = ("RaNaN@pyload.org") @@ -29,17 +30,17 @@ class BasePlugin(Hoster): self.multiDL = False return -# self.__name__ = "NetloadIn" -# pyfile.name = "test" -# self.html = self.load("http://localhost:9000/short") -# self.download("http://localhost:9000/short") -# self.api = self.load("http://localhost:9000/short") -# self.decryptCaptcha("http://localhost:9000/captcha") -# -# if pyfile.url == "79": -# self.core.api.addPackage("test", [str(i) for i in range(80)], 1) -# -# return + # self.__name__ = "NetloadIn" + # pyfile.name = "test" + # self.html = self.load("http://localhost:9000/short") + # self.download("http://localhost:9000/short") + # self.api = self.load("http://localhost:9000/short") + # self.decryptCaptcha("http://localhost:9000/captcha") + # + # if pyfile.url == "79": + # self.core.api.addPackage("test", [str(i) for i in range(80)], 1) + # + # return if pyfile.url.startswith("http"): try: @@ -49,7 +50,7 @@ class BasePlugin(Hoster): self.logDebug("Auth required") account = self.core.accountManager.getAccountPlugin('Http') - servers = [ x['login'] for x in account.getAllAccounts() ] + servers = [x['login'] for x in account.getAllAccounts()] server = urlparse(pyfile.url).netloc if server in servers: @@ -70,20 +71,25 @@ class BasePlugin(Hoster): else: self.fail("No Plugin matched and not a downloadable url.") - def downloadFile(self, pyfile): url = pyfile.url for i in range(5): - header = self.load(url, just_header = True) + header = self.load(url, just_header=True) # self.load does not raise a BadHeader on 404 responses, do it here - if header.has_key('code') and header['code'] == 404: + if 'code' in header and header['code'] == 404: raise BadHeader(404) if 'location' in header: self.logDebug("Location: " + header['location']) - url = unquote(header['location']) + base = search(r'https?://[^/]+', url).group(0) + if header['location'].startswith("http"): + url = unquote(header['location']) + elif header['location'].startswith("/"): + url = base + unquote(header['location']) + else: + url = '%s/%s' % (base, unquote(header['location'])) else: break @@ -95,11 +101,13 @@ class BasePlugin(Hoster): if m: disp = m.groupdict() self.logDebug(disp) - if not disp['enc']: disp['enc'] = 'utf-8' + if not disp['enc']: + disp['enc'] = 'utf-8' name = remove_chars(disp['name'], "\"';").strip() name = unicode(unquote(name), disp['enc']) - if not name: name = url + if not name: + name = url pyfile.name = name self.logDebug("Filename: %s" % pyfile.name) - self.download(url, disposition=True)
\ No newline at end of file + self.download(url, disposition=True) diff --git a/module/plugins/hoster/BayfilesCom.py b/module/plugins/hoster/BayfilesCom.py index 190d9a952..bb1e78bb3 100644 --- a/module/plugins/hoster/BayfilesCom.py +++ b/module/plugins/hoster/BayfilesCom.py @@ -17,10 +17,11 @@ """ import re +from time import time + from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.ReCaptcha import ReCaptcha from module.common.json_layer import json_loads -from time import time + class BayfilesCom(SimpleHoster): __name__ = "BayfilesCom" @@ -33,50 +34,53 @@ class BayfilesCom(SimpleHoster): FILE_INFO_PATTERN = r'<p title="(?P<N>[^"]+)">[^<]*<strong>(?P<S>[0-9., ]+)(?P<U>[kKMG])i?B</strong></p>' FILE_OFFLINE_PATTERN = r'(<p>The requested file could not be found.</p>|<title>404 Not Found</title>)' - + WAIT_PATTERN = r'>Your IP [0-9.]* has recently downloaded a file\. Upgrade to premium or wait (\d+) minutes\.<' VARS_PATTERN = r'var vfid = (\d+);\s*var delay = (\d+);' LINK_PATTERN = r"javascript:window.location.href = '([^']+)';" PREMIUM_LINK_PATTERN = r'(?:<a class="highlighted-btn" href="|(?=http://s\d+\.baycdn\.com/dl/))(.*?)"' - + def handleFree(self): found = re.search(self.WAIT_PATTERN, self.html) if found: self.setWait(int(found.group(1)) * 60) self.wait() self.retry() - + # Get download token found = re.search(self.VARS_PATTERN, self.html) - if not found: self.parseError('VARS') + if not found: + self.parseError('VARS') vfid, delay = found.groups() - - response = json_loads(self.load('http://bayfiles.com/ajax_download', get = { + + response = json_loads(self.load('http://bayfiles.com/ajax_download', get={ "_": time() * 1000, "action": "startTimer", - "vfid": vfid}, decode = True)) - - if not "token" in response or not response['token']: - self.fail('No token') - + "vfid": vfid}, decode=True)) + + if not "token" in response or not response['token']: + self.fail('No token') + self.setWait(int(delay)) self.wait() - - self.html = self.load('http://bayfiles.com/ajax_download', get = { + + self.html = self.load('http://bayfiles.com/ajax_download', get={ "token": response['token'], "action": "getLink", "vfid": vfid}) # Get final link and download found = re.search(self.LINK_PATTERN, self.html) - if not found: self.parseError("Free link") + if not found: + self.parseError("Free link") self.startDownload(found.group(1)) - - def handlePremium(self): + + def handlePremium(self): found = re.search(self.PREMIUM_LINK_PATTERN, self.html) - if not found: self.parseError("Premium link") + if not found: + self.parseError("Premium link") self.startDownload(found.group(1)) - + def startDownload(self, url): self.logDebug("%s URL: %s" % ("Premium" if self.premium else "Free", url)) self.download(url) @@ -84,10 +88,11 @@ class BayfilesCom(SimpleHoster): check = self.checkDownload({ "waitforfreeslots": re.compile(r"<title>BayFiles</title>"), "notfound": re.compile(r"<title>404 Not Found</title>") - }) + }) if check == "waitforfreeslots": self.retry(60, 300, "Wait for free slot") elif check == "notfound": self.retry(60, 300, "404 Not found") - + + getInfo = create_getInfo(BayfilesCom) diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py index cb9bae07c..d923a0633 100644 --- a/module/plugins/hoster/BezvadataCz.py +++ b/module/plugins/hoster/BezvadataCz.py @@ -19,6 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class BezvadataCz(SimpleHoster): __name__ = "BezvadataCz" __type__ = "hoster" @@ -38,7 +39,8 @@ class BezvadataCz(SimpleHoster): def handleFree(self): #download button found = re.search(r'<a class="stahnoutSoubor".*?href="(.*?)"', self.html) - if not found: self.parseError("page1 URL") + if not found: + self.parseError("page1 URL") url = "http://bezvadata.cz%s" % found.group(1) #captcha form @@ -46,10 +48,12 @@ class BezvadataCz(SimpleHoster): self.checkErrors() for i in range(5): action, inputs = self.parseHtmlForm('frm-stahnoutFreeForm') - if not inputs: self.parseError("FreeForm") + if not inputs: + self.parseError("FreeForm") found = re.search(r'<img src="data:image/png;base64,(.*?)"', self.html) - if not found: self.parseError("captcha img") + if not found: + self.parseError("captcha img") #captcha image is contained in html page as base64encoded data but decryptCaptcha() expects image url self.load, proper_load = self.loadcaptcha, self.load @@ -70,7 +74,8 @@ class BezvadataCz(SimpleHoster): self.html = self.load("http://bezvadata.cz%s" % action, post=inputs) self.checkErrors() found = re.search(r'<a class="stahnoutSoubor2" href="(.*?)">', self.html) - if not found: self.parseError("page2 URL") + if not found: + self.parseError("page2 URL") url = "http://bezvadata.cz%s" % found.group(1) self.logDebug("DL URL %s" % url) @@ -84,11 +89,12 @@ class BezvadataCz(SimpleHoster): def checkErrors(self): if 'images/button-download-disable.png' in self.html: - self.longWait(300, 24) #parallel dl limit + self.longWait(300, 24) # parallel dl limit elif '<div class="infobox' in self.html: self.tempOffline() def loadcaptcha(self, data, *args, **kwargs): return data.decode("base64") + getInfo = create_getInfo(BezvadataCz) diff --git a/module/plugins/hoster/BillionuploadsCom.py b/module/plugins/hoster/BillionuploadsCom.py index 5b053d547..91e869c59 100644 --- a/module/plugins/hoster/BillionuploadsCom.py +++ b/module/plugins/hoster/BillionuploadsCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class BillionuploadsCom(XFileSharingPro): __name__ = "BillionuploadsCom" __type__ = "hoster" @@ -14,4 +15,5 @@ class BillionuploadsCom(XFileSharingPro): FILE_SIZE_PATTERN = r'<b>Size:</b>(?P<S>.*?)<br>' HOSTER_NAME = "billionuploads.com" + getInfo = create_getInfo(BillionuploadsCom) diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index 644345387..82c2fe9cb 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -2,58 +2,24 @@ from __future__ import with_statement import re -from pycurl import FOLLOWLOCATION - -from module.plugins.Hoster import Hoster -from module.plugins.ReCaptcha import ReCaptcha -from module.network.RequestFactory import getRequest - - -def getInfo(urls): - result = [] - - for url in urls: - - # Get file info html - req = getRequest() - req.cj.setCookie(BitshareCom.HOSTER_DOMAIN, "language_selection", "EN") - html = req.load(url) - req.close() - - # Check online - if re.search(BitshareCom.FILE_OFFLINE_PATTERN, html): - result.append((url, 0, 1, url)) - continue - - # Name - name1 = re.search(BitshareCom.__pattern__, url).group('name') - m = re.search(BitshareCom.FILE_INFO_PATTERN, html) - name2 = m.group('name') - name = max(name1, name2) - - # Size - value = float(m.group('size')) - units = m.group('units') - pow = {'KB' : 1, 'MB' : 2, 'GB' : 3}[units] - size = int(value*1024**pow) - - # Return info - result.append((name, size, 2, url)) - - yield result - -class BitshareCom(Hoster): + +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.CaptchaService import ReCaptcha + + +class BitshareCom(SimpleHoster): __name__ = "BitshareCom" __type__ = "hoster" __pattern__ = r"http://(www\.)?bitshare\.com/(files/(?P<id1>[a-zA-Z0-9]+)(/(?P<name>.*?)\.html)?|\?f=(?P<id2>[a-zA-Z0-9]+))" - __version__ = "0.47" + __version__ = "0.48" __description__ = """Bitshare.Com File Download Hoster""" __author_name__ = ("paulking", "fragonib") __author_mail__ = (None, "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)''' - FILE_INFO_PATTERN = r'<h1>(Downloading|Streaming)\s(?P<name>.+?)\s-\s(?P<size>[\d.]+)\s(?P<units>..)yte</h1>' + 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)' + FILE_NAME_PATTERN = r'Download:</td>\s*<td><input type="text" value="http://bitshare\.com/files/\w+/(?P<N>[^"]+)\.html"' + FILE_SIZE_PATTERN = r'- (?P<S>[\d.]+) (?P<U>\w+)</h1>' FILE_AJAXID_PATTERN = r'var ajaxdl = "(.*?)";' CAPTCHA_KEY_PATTERN = r"http://api\.recaptcha\.net/challenge\?k=(.*?) " TRAFFIC_USED_UP = r"Your Traffic is used up for today. Upgrade to premium to continue!" @@ -65,12 +31,12 @@ class BitshareCom(Hoster): def process(self, pyfile): if self.premium: self.account.relogin(self.user) - + self.pyfile = pyfile - + # File id m = re.match(self.__pattern__, self.pyfile.url) - self.file_id = max(m.group('id1'), m.group('id2')) + self.file_id = max(m.group('id1'), m.group('id2')) self.logDebug("File id is [%s]" % self.file_id) # Load main page @@ -100,24 +66,23 @@ class BitshareCom(Hoster): # Ajax file id self.ajaxid = re.search(BitshareCom.FILE_AJAXID_PATTERN, self.html).group(1) self.logDebug("File ajax id is [%s]" % self.ajaxid) - + # This may either download our file or forward us to an error page - url = self.getDownloadUrl() + url = self.getDownloadUrl() self.logDebug("Downloading file with url [%s]" % url) self.download(url) - def getDownloadUrl(self): # Return location if direct download is active if self.premium: - header = self.load(self.pyfile.url, cookies = True, just_header = True) + header = self.load(self.pyfile.url, cookies=True, just_header=True) if 'location' in header: - return header['location'] - + return header['location'] + # Get download info self.logDebug("Getting download info") response = self.load("http://bitshare.com/files-ajax/" + self.file_id + "/request.html", - post={"request" : "generateID", "ajaxid" : self.ajaxid}) + post={"request": "generateID", "ajaxid": self.ajaxid}) self.handleErrors(response, ':') parts = response.split(":") filetype = parts[0] @@ -142,24 +107,24 @@ class BitshareCom(Hoster): id = re.search(BitshareCom.CAPTCHA_KEY_PATTERN, self.html).group(1) # Try up to 3 times for i in range(3): - self.logDebug("Resolving ReCaptcha with key [%s], round %d" % (id, i+1)) + self.logDebug("Resolving ReCaptcha with key [%s], round %d" % (id, i + 1)) recaptcha = ReCaptcha(self) challenge, code = recaptcha.challenge(id) response = self.load("http://bitshare.com/files-ajax/" + self.file_id + "/request.html", - post={"request" : "validateCaptcha", "ajaxid" : self.ajaxid, "recaptcha_challenge_field" : challenge, "recaptcha_response_field" : code}) + post={"request": "validateCaptcha", "ajaxid": self.ajaxid, + "recaptcha_challenge_field": challenge, "recaptcha_response_field": code}) if self.handleCaptchaErrors(response): break - # Get download URL self.logDebug("Getting download url") response = self.load("http://bitshare.com/files-ajax/" + self.file_id + "/request.html", - post={"request" : "getDownloadURL", "ajaxid" : self.ajaxid}) + post={"request": "getDownloadURL", "ajaxid": self.ajaxid}) self.handleErrors(response, '#') - url = response.split("#")[-1] - + url = response.split("#")[-1] + return url - + def handleErrors(self, response, separator): self.logDebug("Checking response [%s]" % response) if "ERROR:Session timed out" in response: @@ -177,3 +142,6 @@ class BitshareCom(Hoster): self.retry() self.logDebug("Wrong captcha") self.invalidCaptcha() + + +getInfo = create_getInfo(BitshareCom) diff --git a/module/plugins/hoster/BoltsharingCom.py b/module/plugins/hoster/BoltsharingCom.py index 2f42c8b23..f9cc91ca5 100644 --- a/module/plugins/hoster/BoltsharingCom.py +++ b/module/plugins/hoster/BoltsharingCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class BoltsharingCom(XFileSharingPro): __name__ = "BoltsharingCom" __type__ = "hoster" @@ -12,4 +13,5 @@ class BoltsharingCom(XFileSharingPro): HOSTER_NAME = "boltsharing.com" + getInfo = create_getInfo(BoltsharingCom) diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py index 47063096e..66d46c2e8 100644 --- a/module/plugins/hoster/CatShareNet.py +++ b/module/plugins/hoster/CatShareNet.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha class CatShareNet(SimpleHoster): @@ -35,4 +35,5 @@ class CatShareNet(SimpleHoster): self.invalidCaptcha() self.retry() + getInfo = create_getInfo(CatShareNet) diff --git a/module/plugins/hoster/ChipDe.py b/module/plugins/hoster/ChipDe.py index fcb84a300..8e13b914d 100644 --- a/module/plugins/hoster/ChipDe.py +++ b/module/plugins/hoster/ChipDe.py @@ -4,21 +4,22 @@ import re from module.plugins.Crypter import Crypter + class ChipDe(Crypter): - __name__ = "ChipDe" - __type__ = "container" - __pattern__ = r"http://(?:www\.)?chip.de/video/.*\.html" - __version__ = "0.1" - __description__ = """Chip.de Container Plugin""" - __author_name__ = ('4Christopher') - __author_mail__ = ('4Christopher@gmx.de') + __name__ = "ChipDe" + __type__ = "container" + __pattern__ = r"http://(?:www\.)?chip.de/video/.*\.html" + __version__ = "0.1" + __description__ = """Chip.de Container Plugin""" + __author_name__ = ('4Christopher') + __author_mail__ = ('4Christopher@gmx.de') - def decrypt(self, pyfile): - self.html = self.load(pyfile.url) - try: - url = re.search(r'"(http://video.chip.de/\d+?/.*)"', self.html).group(1) - self.logDebug('The file URL is %s' % url) - except: - self.fail('Failed to find the URL') + def decrypt(self, pyfile): + self.html = self.load(pyfile.url) + try: + url = re.search(r'"(http://video.chip.de/\d+?/.*)"', self.html).group(1) + self.logDebug('The file URL is %s' % url) + except: + self.fail('Failed to find the URL') - self.packages.append((self.pyfile.package().name, [ url ], self.pyfile.package().folder)) + self.packages.append((self.pyfile.package().name, [url], self.pyfile.package().folder)) diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py index 2701752ce..e95f90792 100644 --- a/module/plugins/hoster/CloudzerNet.py +++ b/module/plugins/hoster/CloudzerNet.py @@ -2,7 +2,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster from module.common.json_layer import json_loads -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.network.RequestFactory import getURL from module.utils import parseFileSize @@ -52,7 +52,8 @@ class CloudzerNet(SimpleHoster): 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)) + 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") diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py index 171fba0ff..68df322f5 100644 --- a/module/plugins/hoster/CramitIn.py +++ b/module/plugins/hoster/CramitIn.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class CramitIn(XFileSharingPro): __name__ = "CramitIn" __type__ = "hoster" @@ -9,12 +10,13 @@ class CramitIn(XFileSharingPro): __description__ = """Cramit.in hoster plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + FILE_INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)' - DIRECT_LINK_PATTERN = r'href="(http://cramit.in/file_download/.*?)"' + DIRECT_LINK_PATTERN = r'href="(http://cramit.in/file_download/.*?)"' HOSTER_NAME = "cramit.in" - + def setup(self): - self.resumeDownload = self.multiDL = self.premium + self.resumeDownload = self.multiDL = self.premium + -getInfo = create_getInfo(CramitIn)
\ No newline at end of file +getInfo = create_getInfo(CramitIn) diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py index 27ab52436..7d5336cd9 100644 --- a/module/plugins/hoster/CrockoCom.py +++ b/module/plugins/hoster/CrockoCom.py @@ -1,15 +1,17 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.ReCaptcha import ReCaptcha import re +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.CaptchaService import ReCaptcha + + class CrockoCom(SimpleHoster): __name__ = "CrockoCom" __type__ = "hoster" __pattern__ = r"http://(www\.)?(crocko|easy-share).com/.*" - __version__ = "0.13" + __version__ = "0.14" __description__ = """Crocko Download Hoster""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") @@ -20,45 +22,46 @@ class CrockoCom(SimpleHoster): DOWNLOAD_URL_PATTERN = r"window.location ='([^']+)';" CAPTCHA_URL_PATTERN = re.compile(r"u='(/file_contents/captcha/\w+)';\s*w='(\d+)';") CAPTCHA_KEY_PATTERN = re.compile(r'Recaptcha.create\("([^"]+)"') - + FORM_PATTERN = r'<form method="post" action="([^"]+)">(.*?)</form>' FORM_INPUT_PATTERN = r'<input[^>]* name="?([^" ]+)"? value="?([^" ]+)"?[^>]*>' - + FILE_NAME_REPLACEMENTS = [(r'<[^>]*>', '')] def handleFree(self): if "You need Premium membership to download this file." in self.html: self.fail("You need Premium membership to download this file.") - - url = False + for i in range(5): found = re.search(self.CAPTCHA_URL_PATTERN, self.html) - if found: + if found: url, wait_time = 'http://crocko.com' + found.group(1), found.group(2) self.setWait(wait_time) self.wait() self.html = self.load(url) - else: - break - + else: + break + found = re.search(self.CAPTCHA_KEY_PATTERN, self.html) - if not found: self.parseError('Captcha KEY') + if not found: + self.parseError('Captcha KEY') captcha_key = found.group(1) - + found = re.search(self.FORM_PATTERN, self.html, re.DOTALL) - if not found: self.parseError('ACTION') + if not found: + self.parseError('ACTION') action, form = found.groups() inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form)) - + recaptcha = ReCaptcha(self) - + for i in range(5): inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key) - self.download(action, post = inputs) - + self.download(action, post=inputs) + check = self.checkDownload({ "captcha_err": self.CAPTCHA_KEY_PATTERN - }) + }) if check == "captcha_err": self.invalidCaptcha() @@ -67,5 +70,5 @@ class CrockoCom(SimpleHoster): else: self.fail('No valid captcha solution received') + getInfo = create_getInfo(CrockoCom) -
\ No newline at end of file diff --git a/module/plugins/hoster/CyberlockerCh.py b/module/plugins/hoster/CyberlockerCh.py index 57dd26787..19a4473b3 100644 --- a/module/plugins/hoster/CyberlockerCh.py +++ b/module/plugins/hoster/CyberlockerCh.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class CyberlockerCh(XFileSharingPro): __name__ = "CyberlockerCh" __type__ = "hoster" @@ -12,4 +13,5 @@ class CyberlockerCh(XFileSharingPro): HOSTER_NAME = "cyberlocker.ch" + getInfo = create_getInfo(CyberlockerCh) diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index 347427586..8f6f76d84 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -23,6 +23,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError from module.utils import parseFileSize + class CzshareCom(SimpleHoster): __name__ = "CzshareCom" __type__ = "hoster" @@ -34,7 +35,7 @@ class CzshareCom(SimpleHoster): FILE_NAME_PATTERN = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=[^>]*>(?P<N>[^<]+)</a>' FILE_SIZE_PATTERN = r'<div class="tab" id="category">(?:\s*<p>[^\n]*</p>)*\s*Velikost:\s*(?P<S>[0-9., ]+)(?P<U>[kKMG])i?B\s*</div>' FILE_OFFLINE_PATTERN = r'<div class="header clearfix">\s*<h2 class="red">' - + FILE_SIZE_REPLACEMENTS = [(' ', '')] FILE_URL_REPLACEMENTS = [(r'http://[^/]*/download.php\?.*?id=(\w+).*', r'http://czshare.com/\1/x/')] SH_CHECK_TRAFFIC = True @@ -57,11 +58,12 @@ class CzshareCom(SimpleHoster): self.account.relogin(self.user) self.html = self.load(self.pyfile.url, cookies=True, decode=True) found = re.search(self.USER_CREDIT_PATTERN, self.html) - if not found: return False + if not found: + return False # check user credit try: - credit = parseFileSize(found.group(1).replace(' ',''), found.group(2)) + credit = parseFileSize(found.group(1).replace(' ', ''), found.group(2)) self.logInfo("Premium download for %i KiB of Credit" % (self.pyfile.size / 1024)) self.logInfo("User %s has %i KiB left" % (self.user, credit / 1024)) if credit < self.pyfile.size: @@ -70,11 +72,11 @@ class CzshareCom(SimpleHoster): except Exception, e: # let's continue and see what happens... self.logError('Parse error (CREDIT): %s' % e) - - return True - - def handlePremium(self): - # parse download link + + return True + + def handlePremium(self): + # parse download link try: form = re.search(self.PREMIUM_FORM_PATTERN, self.html, re.DOTALL).group(1) inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form)) @@ -121,20 +123,20 @@ class CzshareCom(SimpleHoster): break else: self.fail("No valid captcha code entered") - + found = re.search("countdown_number = (\d+);", self.html) self.setWait(int(found.group(1)) if found else 50) # download the file, destination is determined by pyLoad - self.logDebug("WAIT URL", self.req.lastEffectiveURL) - found = re.search("free_wait.php\?server=(.*?)&(.*)", self.req.lastEffectiveURL) + self.logDebug("WAIT URL", self.req.lastEffectiveURL) + found = re.search("free_wait.php\?server=(.*?)&(.*)", self.req.lastEffectiveURL) if not found: raise PluginParseError('Download URL') url = "http://%s/download.php?%s" % (found.group(1), found.group(2)) - - self.wait() - self.multiDL = True + + self.wait() + self.multiDL = True self.download(url) self.checkDownloadedFile() @@ -145,7 +147,7 @@ class CzshareCom(SimpleHoster): "credit": re.compile(r"^Nem.*te dostate.*n.* kredit.$"), "multi_dl": re.compile(self.MULTIDL_PATTERN), "captcha_err": "<li>Zadaný ověřovací kód nesouhlasí!</li>" - }) + }) if check == "tempoffline": self.fail("File not available - try later") @@ -156,5 +158,6 @@ class CzshareCom(SimpleHoster): elif check == "captcha_err": self.invalidCaptcha() self.retry() - + + getInfo = create_getInfo(CzshareCom) diff --git a/module/plugins/hoster/DailymotionCom.py b/module/plugins/hoster/DailymotionCom.py index 1b411393d..ab8ff7910 100644 --- a/module/plugins/hoster/DailymotionCom.py +++ b/module/plugins/hoster/DailymotionCom.py @@ -5,6 +5,7 @@ import re from urllib import unquote from module.plugins.Hoster import Hoster + class DailymotionCom(Hoster): __name__ = 'DailymotionCom' __type__ = 'hoster' @@ -22,12 +23,13 @@ class DailymotionCom(Hoster): r'<span class="title foreground" title="(.*?)">', r'"(?:vs_videotitle|videoTitle|dm_title|ss_mediaTitle)": "(.*?)"'): filename = re.search(pattern, html) - if filename is not None: break + if filename is not None: + break else: self.fail("Unable to find file name") - pyfile.name = filename.group(1)+'.mp4' - self.logDebug('Filename='+pyfile.name) + pyfile.name = filename.group(1) + '.mp4' + self.logDebug('Filename=' + pyfile.name) allLinksInfo = re.search(r'"sequence":"(.*?)"', html) self.logDebug(allLinksInfo.groups()) allLinksInfo = unquote(allLinksInfo.group(1)) @@ -44,4 +46,4 @@ class DailymotionCom(Hoster): def getQuality(self, quality, data): link = re.search('"' + quality + '":"(http:[^<>"\']+)"', data) if link is not None: - return link.group(1).replace('\\','')
\ No newline at end of file + return link.group(1).replace('\\', '') diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py index 3dc581bf1..1e24388d7 100644 --- a/module/plugins/hoster/DataportCz.py +++ b/module/plugins/hoster/DataportCz.py @@ -16,10 +16,9 @@ @author: zoidberg """ -import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError -from pycurl import FOLLOWLOCATION - + + class DataportCz(SimpleHoster): __name__ = "DataportCz" __type__ = "hoster" @@ -32,26 +31,26 @@ class DataportCz(SimpleHoster): FILE_SIZE_PATTERN = r'<td class="fil">Velikost</td>\s*<td>(?P<S>[^<]+)</td>' FILE_OFFLINE_PATTERN = r'<h2>Soubor nebyl nalezen</h2>' FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.dataport.cz/file/\1')] - - CAPTCHA_URL_PATTERN = r'<section id="captcha_bg">\s*<img src="(.*?)"' + + CAPTCHA_URL_PATTERN = r'<section id="captcha_bg">\s*<img src="(.*?)"' FREE_SLOTS_PATTERN = ur'Počet volných slotů: <span class="darkblue">(\d+)</span><br />' - def handleFree(self): + def handleFree(self): captchas = {"1": "jkeG", "2": "hMJQ", "3": "vmEK", "4": "ePQM", "5": "blBd"} - + for i in range(60): action, inputs = self.parseHtmlForm('free_download_form') self.logDebug(action, inputs) if not action or not inputs: raise PluginParseError('free_download_form') - + if "captchaId" in inputs and inputs["captchaId"] in captchas: - inputs['captchaCode'] = captchas[inputs["captchaId"]] + inputs['captchaCode'] = captchas[inputs["captchaId"]] else: raise PluginParseError('captcha') - - self.html = self.download("http://www.dataport.cz%s" % action, post = inputs) - + + self.html = self.download("http://www.dataport.cz%s" % action, post=inputs) + check = self.checkDownload({"captcha": 'alert("\u0160patn\u011b opsan\u00fd k\u00f3d z obr\u00e1zu");', "slot": 'alert("Je n\u00e1m l\u00edto, ale moment\u00e1ln\u011b nejsou'}) if check == "captcha": @@ -60,9 +59,10 @@ class DataportCz(SimpleHoster): self.logDebug("No free slots - wait 60s and retry") self.setWait(60, False) self.wait() - self.html = self.load(self.pyfile.url, decode = True) + self.html = self.load(self.pyfile.url, decode=True) continue else: break - + + create_getInfo(DataportCz)
\ No newline at end of file diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index 8d994c179..d7760d940 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -18,7 +18,8 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha + class DateiTo(SimpleHoster): __name__ = "DateiTo" @@ -33,47 +34,48 @@ class DateiTo(SimpleHoster): FILE_SIZE_PATTERN = r'Dateigröße:</td>\s*<td colspan="2">(?P<S>.*?)</' FILE_OFFLINE_PATTERN = r'>Datei wurde nicht gefunden<|>Bitte wähle deine Datei aus... <' PARALELL_PATTERN = r'>Du lädst bereits eine Datei herunter<' - + WAIT_PATTERN = r'countdown\({seconds: (\d+)' DATA_PATTERN = r'url: "(.*?)", data: "(.*?)",' RECAPTCHA_KEY_PATTERN = r'Recaptcha.create\("(.*?)"' - + def handleFree(self): url = 'http://datei.to/ajax/download.php' data = {'P': 'I', 'ID': self.file_info['ID']} - - recaptcha = ReCaptcha(self) - + + recaptcha = ReCaptcha(self) + for i in range(10): - self.logDebug("URL", url, "POST", data) - self.html = self.load(url, post = data) + self.logDebug("URL", url, "POST", data) + self.html = self.load(url, post=data) self.checkErrors() - + if url.endswith('download.php') and 'P' in data: if data['P'] == 'I': self.doWait() - + elif data['P'] == 'IV': - break - + break + found = re.search(self.DATA_PATTERN, self.html) - if not found: self.parseError('data') + if not found: + self.parseError('data') url = 'http://datei.to/' + found.group(1) data = dict(x.split('=') for x in found.group(2).split('&')) - + if url.endswith('recaptcha.php'): found = re.search(self.RECAPTCHA_KEY_PATTERN, self.html) recaptcha_key = found.group(1) if found else "6LdBbL8SAAAAAI0vKUo58XRwDd5Tu_Ze1DA7qTao" - - data['recaptcha_challenge_field'], data['recaptcha_response_field'] = recaptcha.challenge(recaptcha_key) - + + data['recaptcha_challenge_field'], data['recaptcha_response_field'] = recaptcha.challenge(recaptcha_key) + else: - self.fail('Too bad...') - + self.fail('Too bad...') + download_url = self.html self.logDebug('Download URL', download_url) self.download(download_url) - + def checkErrors(self): found = re.search(self.PARALELL_PATTERN, self.html) if found: @@ -82,13 +84,14 @@ class DateiTo(SimpleHoster): self.setWait(wait_time + 1, False) self.wait(300) self.retry() - - def doWait(self): + + def doWait(self): found = re.search(self.WAIT_PATTERN, self.html) wait_time = int(found.group(1)) if found else 30 self.setWait(wait_time + 1, False) - - self.load('http://datei.to/ajax/download.php', post = {'P': 'Ads'}) - self.wait() - + + self.load('http://datei.to/ajax/download.php', post={'P': 'Ads'}) + self.wait() + + getInfo = create_getInfo(DateiTo) diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 470c4ae5d..1c2f4246b 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -22,7 +22,7 @@ from module.plugins.Hoster import Hoster class DebridItaliaCom(Hoster): __name__ = "DebridItaliaCom" - __version__ = "0.03" + __version__ = "0.04" __type__ = "hoster" __pattern__ = r"https?://.*debriditalia\.com" __description__ = """Debriditalia.com hoster plugin""" @@ -35,7 +35,7 @@ class DebridItaliaCom(Hoster): def process(self, pyfile): if not self.account: - self.logError("Please enter your DebridItalia account or deactivate this plugin") + self.logError(_("Please enter your %s account or deactivate this plugin") % "DebridItalia") self.fail("No DebridItalia account provided") self.logDebug("Old URL: %s" % pyfile.url) diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index eb64ae4de..1ede3b715 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -4,14 +4,14 @@ import re from urllib import unquote from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.network.RequestFactory import getURL -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha + class DepositfilesCom(SimpleHoster): __name__ = "DepositfilesCom" __type__ = "hoster" __pattern__ = r"http://[\w\.]*?(depositfiles\.com|dfiles\.eu)(/\w{1,3})?/files/[\w]+" - __version__ = "0.43" + __version__ = "0.44" __description__ = """Depositfiles.com Download Hoster""" __author_name__ = ("spoob", "zoidberg") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz") @@ -21,7 +21,8 @@ class DepositfilesCom(SimpleHoster): FILE_INFO_PATTERN = r'<script type="text/javascript">eval\( unescape\(\'(?P<N>.*?)\'' FILE_OFFLINE_PATTERN = r'<span class="html_download_api-not_exists"></span>' FILE_URL_REPLACEMENTS = [(r"\.com(/.*?)?/files", ".com/en/files"), (r"\.html$", "")] - FILE_NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))), (r'.*<b title="(?P<N>[^"]+).*', "\g<N>" )] + FILE_NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))), + (r'.*<b title="(?P<N>[^"]+).*', "\g<N>" )] RECAPTCHA_PATTERN = r"Recaptcha.create\('([^']+)'" DOWNLOAD_LINK_PATTERN = r'<form id="downloader_file_form" action="(http://.+?\.(dfiles\.eu|depositfiles\.com)/.+?)" method="post"' @@ -31,11 +32,12 @@ class DepositfilesCom(SimpleHoster): self.resumeDownload = self.premium def handleFree(self): - self.html = self.load(self.pyfile.url, post={"gateway_result":"1"}, cookies = True) - if re.search(self.FILE_OFFLINE_PATTERN, self.html): self.offline() + self.html = self.load(self.pyfile.url, post={"gateway_result": "1"}, cookies=True) + if re.search(self.FILE_OFFLINE_PATTERN, self.html): + self.offline() if re.search(r'File is checked, please try again in a minute.', self.html) is not None: - self.log.info("DepositFiles.com: The file is being checked. Waiting 1 minute.") + self.logInfo("DepositFiles.com: The file is being checked. Waiting 1 minute.") self.setWait(61) self.wait() self.retry() @@ -43,7 +45,7 @@ class DepositfilesCom(SimpleHoster): wait = re.search(r'html_download_api-limit_interval\">(\d+)</span>', self.html) if wait: wait_time = int(wait.group(1)) - self.log.info( "%s: Traffic used up. Waiting %d seconds." % (self.__name__, wait_time) ) + self.logInfo("%s: Traffic used up. Waiting %d seconds." % (self.__name__, wait_time)) self.setWait(wait_time) self.wantReconnect = True self.wait() @@ -52,7 +54,7 @@ class DepositfilesCom(SimpleHoster): wait = re.search(r'>Try in (\d+) minutes or use GOLD account', self.html) if wait: wait_time = int(wait.group(1)) - self.log.info( "%s: All free slots occupied. Waiting %d minutes." % (self.__name__, wait_time) ) + self.logInfo("%s: All free slots occupied. Waiting %d minutes." % (self.__name__, wait_time)) self.setWait(wait_time * 60, False) wait = re.search(r'Please wait (\d+) sec', self.html) @@ -60,33 +62,38 @@ class DepositfilesCom(SimpleHoster): self.setWait(int(wait.group(1))) found = re.search(r"var fid = '(\w+)';", self.html) - if not found: self.retry(wait_time=5) - params = {'fid' : found.group(1)} - self.logDebug ("FID: %s" % params['fid']) + if not found: + self.retry(wait_time=5) + params = {'fid': found.group(1)} + self.logDebug("FID: %s" % params['fid']) captcha_key = '6LdRTL8SAAAAAE9UOdWZ4d0Ky-aeA7XfSqyWDM2m' found = re.search(self.RECAPTCHA_PATTERN, self.html) - if found: captcha_key = found.group(1) - self.logDebug ("CAPTCHA_KEY: %s" % captcha_key) + if found: + captcha_key = found.group(1) + self.logDebug("CAPTCHA_KEY: %s" % captcha_key) self.wait() recaptcha = ReCaptcha(self) for i in range(5): - self.html = self.load("http://depositfiles.com/get_file.php", get = params) + self.html = self.load("http://depositfiles.com/get_file.php", get=params) if '<input type=button value="Continue" onclick="check_recaptcha' in self.html: - if not captcha_key: self.parseError('Captcha key') - if 'response' in params: self.invalidCaptcha() + if not captcha_key: + self.parseError('Captcha key') + if 'response' in params: + self.invalidCaptcha() params['challenge'], params['response'] = recaptcha.challenge(captcha_key) self.logDebug(params) continue found = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) if found: - if 'response' in params: self.correctCaptcha() + if 'response' in params: + self.correctCaptcha() link = unquote(found.group(1)) - self.logDebug ("LINK: %s" % link) + self.logDebug("LINK: %s" % link) break else: self.parseError('Download link') @@ -94,9 +101,9 @@ class DepositfilesCom(SimpleHoster): self.fail('No valid captcha response received') try: - self.download(link, disposition = True) + self.download(link, disposition=True) except: - self.retry(wait_time = 60) + self.retry(wait_time=60) def handlePremium(self): if '<span class="html_download_api-gold_traffic_limit">' in self.html: @@ -105,8 +112,10 @@ class DepositfilesCom(SimpleHoster): elif 'onClick="show_gold_offer' in self.html: self.account.relogin(self.user) self.retry() - link = unquote(re.search('<div id="download_url">\s*<a href="(http://.+?\.depositfiles.com/.+?)"', self.html).group(1)) + link = unquote( + re.search('<div id="download_url">\s*<a href="(http://.+?\.depositfiles.com/.+?)"', self.html).group(1)) self.multiDL = True - self.download(link, disposition = True) + self.download(link, disposition=True) + getInfo = create_getInfo(DepositfilesCom) diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 44906e7e8..bb2dfa036 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -2,17 +2,18 @@ # -*- coding: utf-8 -*- import re +import pycurl + from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns from module.common.json_layer import json_loads - -import pycurl from module.network.Browser import Browser from module.network.CookieJar import CookieJar + class CustomBrowser(Browser): def __init__(self, bucket=None, options={}): Browser.__init__(self, bucket, options) - + def load(self, *args, **kwargs): post = kwargs.get("post") if post is None: @@ -28,30 +29,36 @@ class CustomBrowser(Browser): self.http.c.setopt(pycurl.CUSTOMREQUEST, "GET") return Browser.load(self, *args, **kwargs) -""" -Class to support adyoulike captcha service -""" + class AdYouLike(): + """ + Class to support adyoulike captcha service + """ ADYOULIKE_INPUT_PATTERN = r'Adyoulike.create\((.*?)\);' ADYOULIKE_CALLBACK = r'Adyoulike.g._jsonp_5579316662423138' - ADYOULIKE_CHALLENGE_PATTERN = ADYOULIKE_CALLBACK + r'\((.*?)\)' - - def __init__(self, plugin, engine = "adyoulike"): + ADYOULIKE_CHALLENGE_PATTERN = ADYOULIKE_CALLBACK + r'\((.*?)\)' + + def __init__(self, plugin, engine="adyoulike"): self.plugin = plugin self.engine = engine - - def challenge(self, html): + + def challenge(self, html): adyoulike_data_string = None found = re.search(self.ADYOULIKE_INPUT_PATTERN, html) if found: adyoulike_data_string = found.group(1) else: self.plugin.fail("Can't read AdYouLike input data") - - ayl_data = json_loads(adyoulike_data_string) #{"adyoulike":{"key":"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"},"all":{"element_id":"ayl_private_cap_92300","lang":"fr","env":"prod"}} - res = self.plugin.load(r'http://api-ayl.appspot.com/challenge?key=%(ayl_key)s&env=%(ayl_env)s&callback=%(callback)s' % {"ayl_key": ayl_data[self.engine]["key"], "ayl_env": ayl_data["all"]["env"], "callback": self.ADYOULIKE_CALLBACK}) - + # {"adyoulike":{"key":"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"}, + # "all":{"element_id":"ayl_private_cap_92300","lang":"fr","env":"prod"}} + ayl_data = json_loads(adyoulike_data_string) + + res = self.plugin.load( + r'http://api-ayl.appspot.com/challenge?key=%(ayl_key)s&env=%(ayl_env)s&callback=%(callback)s' % { + "ayl_key": ayl_data[self.engine]["key"], "ayl_env": ayl_data["all"]["env"], + "callback": self.ADYOULIKE_CALLBACK}) + found = re.search(self.ADYOULIKE_CHALLENGE_PATTERN, res) challenge_string = None if found: @@ -59,12 +66,20 @@ class AdYouLike(): else: self.plugin.fail("Invalid AdYouLike challenge") challenge_data = json_loads(challenge_string) - + return ayl_data, challenge_data - + def result(self, ayl, challenge): """ - Adyoulike.g._jsonp_5579316662423138({"translations":{"fr":{"instructions_visual":"Recopiez « Soonnight » ci-dessous :"}},"site_under":true,"clickable":true,"pixels":{"VIDEO_050":[],"DISPLAY":[],"VIDEO_000":[],"VIDEO_100":[],"VIDEO_025":[],"VIDEO_075":[]},"medium_type":"image/adyoulike","iframes":{"big":"<iframe src=\"http://www.soonnight.com/campagn.html\" scrolling=\"no\" height=\"250\" width=\"300\" frameborder=\"0\"></iframe>"},"shares":{},"id":256,"token":"e6QuI4aRSnbIZJg02IsV6cp4JQ9~MjA1","formats":{"small":{"y":300,"x":0,"w":300,"h":60},"big":{"y":0,"x":0,"w":300,"h":250},"hover":{"y":440,"x":0,"w":300,"h":60}},"tid":"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"}) + Adyoulike.g._jsonp_5579316662423138 + ({"translations":{"fr":{"instructions_visual":"Recopiez « Soonnight » ci-dessous :"}}, + "site_under":true,"clickable":true,"pixels":{"VIDEO_050":[],"DISPLAY":[],"VIDEO_000":[],"VIDEO_100":[], + "VIDEO_025":[],"VIDEO_075":[]},"medium_type":"image/adyoulike", + "iframes":{"big":"<iframe src=\"http://www.soonnight.com/campagn.html\" scrolling=\"no\" + height=\"250\" width=\"300\" frameborder=\"0\"></iframe>"},"shares":{},"id":256, + "token":"e6QuI4aRSnbIZJg02IsV6cp4JQ9~MjA1","formats":{"small":{"y":300,"x":0,"w":300,"h":60}, + "big":{"y":0,"x":0,"w":300,"h":250},"hover":{"y":440,"x":0,"w":300,"h":60}}, + "tid":"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"}) """ response = None try: @@ -76,54 +91,55 @@ class AdYouLike(): self.plugin.fail("Can't parse instructions visual") except KeyError: self.plugin.fail("No instructions visual") - + #TODO: Supports captcha - + if not response: self.plugin.fail("AdYouLike result failed") - - return {"_ayl_captcha_engine" : self.engine, - "_ayl_env" : ayl["all"]["env"], - "_ayl_tid" : challenge["tid"], - "_ayl_token_challenge" : challenge["token"], - "_ayl_response": response } + + return {"_ayl_captcha_engine": self.engine, + "_ayl_env": ayl["all"]["env"], + "_ayl_tid": challenge["tid"], + "_ayl_token_challenge": challenge["token"], + "_ayl_response": response} + class DlFreeFr(SimpleHoster): __name__ = "DlFreeFr" __type__ = "hoster" __pattern__ = r"http://dl\.free\.fr/([a-zA-Z0-9]+|getfile\.pl\?file=/[a-zA-Z0-9]+)" - __version__ = "0.24" + __version__ = "0.25" __description__ = """dl.free.fr download hoster""" __author_name__ = ("the-razer", "zoidberg", "Toilal") __author_mail__ = ("daniel_ AT gmx DOT net", "zoidberg@mujmail.cz", "toilal.dev@gmail.com") - + FILE_NAME_PATTERN = r"Fichier:</td>\s*<td[^>]*>(?P<N>[^>]*)</td>" FILE_SIZE_PATTERN = r"Taille:</td>\s*<td[^>]*>(?P<S>[\d.]+[KMG])o" FILE_OFFLINE_PATTERN = r"Erreur 404 - Document non trouv|Fichier inexistant|Le fichier demandé n'a pas été trouvé" #FILE_URL_PATTERN = r'href="(?P<url>http://.*?)">Télécharger ce fichier' - + def setup(self): self.multiDL = True self.limitDL = 5 self.resumeDownload = True - self.chunkLimit = 1 + self.chunkLimit = 1 def init(self): factory = self.core.requestFactory self.req = CustomBrowser(factory.bucket, factory.getOptions()) - + def process(self, pyfile): self.req.setCookieJar(None) - + pyfile.url = replace_patterns(pyfile.url, self.FILE_URL_REPLACEMENTS) valid_url = pyfile.url - headers = self.load(valid_url, just_header = True) - + headers = self.load(valid_url, just_header=True) + self.html = None if headers.get('code') == 302: valid_url = headers.get('location') - headers = self.load(valid_url, just_header = True) - + headers = self.load(valid_url, just_header=True) + if headers.get('code') == 200: content_type = headers.get('content-type') if content_type and content_type.startswith("text/html"): @@ -132,23 +148,23 @@ class DlFreeFr(SimpleHoster): self.handleFree() else: # Direct access to requested file for users using free.fr as Internet Service Provider. - self.download(valid_url, disposition=True) + self.download(valid_url, disposition=True) elif headers.get('code') == 404: self.offline() else: self.fail("Invalid return code: " + str(headers.get('code'))) - - def handleFree(self): + + def handleFree(self): action, inputs = self.parseHtmlForm('action="getfile.pl"') - + adyoulike = AdYouLike(self) ayl, challenge = adyoulike.challenge(self.html) result = adyoulike.result(ayl, challenge) inputs.update(result) - - self.load("http://dl.free.fr/getfile.pl", post = inputs) - headers = self.getLastHeaders() - if headers.get("code") == 302 and headers.has_key("set-cookie") and headers.has_key("location"): + + self.load("http://dl.free.fr/getfile.pl", post=inputs) + headers = self.getLastHeaders() + if headers.get("code") == 302 and "set-cookie" in headers and "location" in headers: found = re.search("(.*?)=(.*?); path=(.*?); domain=(.*?)", headers.get("set-cookie")) cj = CookieJar(__name__) if found: @@ -157,16 +173,17 @@ class DlFreeFr(SimpleHoster): self.fail("Cookie error") location = headers.get("location") self.req.setCookieJar(cj) - self.download(location, disposition=True); + self.download(location, disposition=True) else: self.fail("Invalid response") - + def getLastHeaders(self): #parse header header = {"code": self.req.code} for line in self.req.http.header.splitlines(): line = line.strip() - if not line or ":" not in line: continue + if not line or ":" not in line: + continue key, none, value = line.partition(":") key = key.lower().strip() @@ -181,4 +198,5 @@ class DlFreeFr(SimpleHoster): header[key] = value return header -getInfo = create_getInfo(DlFreeFr) + +getInfo = create_getInfo(DlFreeFr) diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py index a253be0d9..c172e7447 100644 --- a/module/plugins/hoster/EdiskCz.py +++ b/module/plugins/hoster/EdiskCz.py @@ -19,6 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class EdiskCz(SimpleHoster): __name__ = "EdiskCz" __type__ = "hoster" @@ -42,7 +43,8 @@ class EdiskCz(SimpleHoster): self.logDebug('URL:' + url) found = re.search(self.ACTION_PATTERN, url) - if found is None: self.parseError("ACTION") + if found is None: + self.parseError("ACTION") action = found.group(1) self.html = self.load(url, decode=True) @@ -59,4 +61,5 @@ class EdiskCz(SimpleHoster): self.download(url) -getInfo = create_getInfo(EdiskCz)
\ No newline at end of file + +getInfo = create_getInfo(EdiskCz) diff --git a/module/plugins/hoster/EgoFilesCom.py b/module/plugins/hoster/EgoFilesCom.py index 7e6673210..274286cf1 100644 --- a/module/plugins/hoster/EgoFilesCom.py +++ b/module/plugins/hoster/EgoFilesCom.py @@ -1,103 +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 <http://www.gnu.org/licenses/>. #
-############################################################################
-
-# Test link (random.bin):
-# http://egofiles.com/mOZfMI1WLZ6HBkGG/random.bin
-
-import re
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.plugins.ReCaptcha import ReCaptcha
-
-
-class EgoFilesCom(SimpleHoster):
- __name__ = "EgoFilesCom"
- __type__ = "hoster"
- __pattern__ = r"https?://(www\.)?egofiles.com/(\w+)"
- __version__ = "0.13"
- __description__ = """Egofiles.com Download Hoster"""
- __author_name__ = ("stickell")
- __author_mail__ = ("l.stickell@yahoo.it")
-
- FILE_INFO_PATTERN = r'<div class="down-file">\s+(?P<N>[^\t]+)\s+<div class="file-properties">\s+(File size|Rozmiar): (?P<S>[\w.]+) (?P<U>\w+) \|'
- FILE_OFFLINE_PATTERN = r'(File size|Rozmiar): 0 KB'
- WAIT_TIME_PATTERN = r'For next free download you have to wait <strong>((?P<m>\d*)m)? ?((?P<s>\d+)s)?</strong>'
- DIRECT_LINK_PATTERN = r'<a href="(?P<link>[^"]+)">Download ></a>'
- RECAPTCHA_KEY = '6LeXatQSAAAAAHezcjXyWAni-4t302TeYe7_gfvX'
-
- def init(self):
- self.file_info = {}
- # Set English language
- self.load("https://egofiles.com/ajax/lang.php?lang=en", just_header=True)
-
- def process(self, pyfile):
- if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()):
- self.handlePremium()
- else:
- self.handleFree()
-
- def handleFree(self):
- self.html = self.load(self.pyfile.url, decode=True)
- self.getFileInfo()
-
- # Wait time between free downloads
- if 'For next free download you have to wait' in self.html:
- m = re.search(self.WAIT_TIME_PATTERN, self.html).groupdict('0')
- waittime = int(m['m']) * 60 + int(m['s'])
- self.setWait(waittime, True)
- self.wait()
-
- downloadURL = ''
- recaptcha = ReCaptcha(self)
- for i in xrange(5):
- challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY)
- post_data = {'recaptcha_challenge_field': challenge,
- 'recaptcha_response_field': response}
- self.html = self.load(self.pyfile.url, post=post_data, decode=True)
- m = re.search(self.DIRECT_LINK_PATTERN, self.html)
- if not m:
- self.logInfo('Wrong captcha')
- self.invalidCaptcha()
- elif hasattr(m, 'group'):
- downloadURL = m.group('link')
- self.correctCaptcha()
- break
- else:
- self.fail('Unknown error - Plugin may be out of date')
-
- if not downloadURL:
- self.fail("No Download url retrieved/all captcha attempts failed")
-
- self.download(downloadURL, disposition=True)
-
- def handlePremium(self):
- header = self.load(self.pyfile.url, just_header=True)
- if header.has_key('location'):
- self.logDebug('DIRECT LINK from header: ' + header['location'])
- self.download(header['location'])
- else:
- self.html = self.load(self.pyfile.url, decode=True)
- self.getFileInfo()
- m = re.search(r'<a href="(?P<link>[^"]+)">Download ></a>', self.html)
- if not m:
- self.parseError('Unable to detect direct download url')
- else:
- self.logDebug('DIRECT URL from html: ' + m.group('link'))
- self.download(m.group('link'), disposition=True)
-
-
-getInfo = create_getInfo(EgoFilesCom)
+# -*- 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/>. # +############################################################################ + +# Test link (random.bin): +# http://egofiles.com/mOZfMI1WLZ6HBkGG/random.bin + +import re + +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.CaptchaService import ReCaptcha + + +class EgoFilesCom(SimpleHoster): + __name__ = "EgoFilesCom" + __type__ = "hoster" + __pattern__ = r"https?://(www\.)?egofiles.com/(\w+)" + __version__ = "0.13" + __description__ = """Egofiles.com Download Hoster""" + __author_name__ = ("stickell") + __author_mail__ = ("l.stickell@yahoo.it") + + FILE_INFO_PATTERN = r'<div class="down-file">\s+(?P<N>[^\t]+)\s+<div class="file-properties">\s+(File size|Rozmiar): (?P<S>[\w.]+) (?P<U>\w+) \|' + FILE_OFFLINE_PATTERN = r'(File size|Rozmiar): 0 KB' + WAIT_TIME_PATTERN = r'For next free download you have to wait <strong>((?P<m>\d*)m)? ?((?P<s>\d+)s)?</strong>' + DIRECT_LINK_PATTERN = r'<a href="(?P<link>[^"]+)">Download ></a>' + RECAPTCHA_KEY = '6LeXatQSAAAAAHezcjXyWAni-4t302TeYe7_gfvX' + + def init(self): + self.file_info = {} + # Set English language + self.load("https://egofiles.com/ajax/lang.php?lang=en", just_header=True) + + def process(self, pyfile): + if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()): + self.handlePremium() + else: + self.handleFree() + + def handleFree(self): + self.html = self.load(self.pyfile.url, decode=True) + self.getFileInfo() + + # Wait time between free downloads + if 'For next free download you have to wait' in self.html: + m = re.search(self.WAIT_TIME_PATTERN, self.html).groupdict('0') + waittime = int(m['m']) * 60 + int(m['s']) + self.setWait(waittime, True) + self.wait() + + downloadURL = '' + recaptcha = ReCaptcha(self) + for i in xrange(5): + challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY) + post_data = {'recaptcha_challenge_field': challenge, + 'recaptcha_response_field': response} + self.html = self.load(self.pyfile.url, post=post_data, decode=True) + m = re.search(self.DIRECT_LINK_PATTERN, self.html) + if not m: + self.logInfo('Wrong captcha') + self.invalidCaptcha() + elif hasattr(m, 'group'): + downloadURL = m.group('link') + self.correctCaptcha() + break + else: + self.fail('Unknown error - Plugin may be out of date') + + if not downloadURL: + self.fail("No Download url retrieved/all captcha attempts failed") + + self.download(downloadURL, disposition=True) + + def handlePremium(self): + header = self.load(self.pyfile.url, just_header=True) + if header.has_key('location'): + self.logDebug('DIRECT LINK from header: ' + header['location']) + self.download(header['location']) + else: + self.html = self.load(self.pyfile.url, decode=True) + self.getFileInfo() + m = re.search(r'<a href="(?P<link>[^"]+)">Download ></a>', self.html) + if not m: + self.parseError('Unable to detect direct download url') + else: + self.logDebug('DIRECT URL from html: ' + m.group('link')) + self.download(m.group('link'), disposition=True) + + +getInfo = create_getInfo(EgoFilesCom) diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index 5224dfd9f..03bec8bbd 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -19,6 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class EuroshareEu(SimpleHoster): __name__ = "EuroshareEu" __type__ = "hoster" @@ -48,8 +49,7 @@ class EuroshareEu(SimpleHoster): self.download(self.pyfile.url.rstrip('/') + "/download/") check = self.checkDownload({"login": re.compile(self.ERR_NOT_LOGGED_IN_PATTERN), - "json": re.compile(r'\{"status":"error".*?"message":"(.*?)"') - }) + "json": re.compile(r'\{"status":"error".*?"message":"(.*?)"')}) if check == "login" or (check == "json" and self.lastCheck.group(1) == "Access token expired"): self.account.relogin(self.user) self.retry(reason="Access token expired") @@ -71,4 +71,5 @@ class EuroshareEu(SimpleHoster): if check == "multi_dl": self.longWait(300, 12) -getInfo = create_getInfo(EuroshareEu)
\ No newline at end of file + +getInfo = create_getInfo(EuroshareEu) diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py index fd91bb023..f68627b56 100644 --- a/module/plugins/hoster/ExtabitCom.py +++ b/module/plugins/hoster/ExtabitCom.py @@ -19,7 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.common.json_layer import json_loads @@ -27,7 +27,7 @@ class ExtabitCom(SimpleHoster): __name__ = "ExtabitCom" __type__ = "hoster" __pattern__ = r"http://(\w+\.)*extabit\.com/(file|go|fid)/(?P<ID>\w+)" - __version__ = "0.3" + __version__ = "0.4" __description__ = """Extabit.com""" __author_name__ = ("zoidberg") @@ -36,7 +36,7 @@ class ExtabitCom(SimpleHoster): FILE_OFFLINE_PATTERN = r'<h1>File not found</h1>' TEMP_OFFLINE_PATTERN = r">(File is temporary unavailable|No download mirror)<" - DOWNLOAD_LINK_PATTERN = r'"(http://guest\d+\.extabit\.com/[a-z0-9]+/.*?)"' + DOWNLOAD_LINK_PATTERN = r'[\'"](http://guest\d+\.extabit\.com/[a-z0-9]+/.*?)[\'"]' def handleFree(self): if r">Only premium users can download this file" in self.html: @@ -73,7 +73,8 @@ class ExtabitCom(SimpleHoster): else: self.parseError('Captcha') - if not "href" in response: self.parseError('JSON') + if not "href" in response: + self.parseError('JSON') self.html = self.load("http://extabit.com/file/%s%s" % (fileID, response['href'])) m = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py new file mode 100644 index 000000000..4d3e7b93d --- /dev/null +++ b/module/plugins/hoster/FastixRu.py @@ -0,0 +1,66 @@ +# -*- 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 + + +class FastixRu(Hoster): + __name__ = "FastixRu" + __version__ = "0.02" + __type__ = "hoster" + __pattern__ = r"http?://.*fastix.ru\..*" + __description__ = """Fastix hoster plugin""" + __author_name__ = ("Massimo, Rosamilia") + __author_mail__ = ("max@spiritix.eu") + + 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 init(self): + self.chunkLimit = 3 + self.resumeDownload = True + + def process(self, pyfile): + if not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "Fastix") + self.fail("No Fastix account provided") + + self.logDebug("Old URL: %s" % pyfile.url) + if re.match(self.__pattern__, pyfile.url): + new_url = pyfile.url + else: + api_key = self.account.getAccountData(self.user) + api_key = api_key["api"] + url = "http://fastix.ru/api_v2/?apikey=%s&sub=getdirectlink&link=%s" % (api_key, pyfile.url) + page = self.load(url) + data = json_loads(page) + self.logDebug("Json data: %s" % str(data)) + if "error\":true" in page: + self.offline() + else: + new_url = data["downloadlink"] + + self.logDebug("New URL: %s" % new_url) + + if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown"): + #only use when name wasnt already set + pyfile.name = self.getFilename(new_url) + + self.download(new_url, disposition=True) + + check = self.checkDownload({"error": "<title>An error occurred while processing your request</title>", + "empty": re.compile(r"^$")}) + + if check == "error": + self.retry(reason="An error occurred while generating link.", wait_time=60) + elif check == "empty": + self.retry(reason="Downloaded File was empty.", wait_time=60) diff --git a/module/plugins/hoster/FastshareCz.py b/module/plugins/hoster/FastshareCz.py index 1dbf9fe8f..b44d55a2d 100644 --- a/module/plugins/hoster/FastshareCz.py +++ b/module/plugins/hoster/FastshareCz.py @@ -33,7 +33,7 @@ class FastshareCz(SimpleHoster): FILE_INFO_PATTERN = r'<h1 class="dwp">(?P<N>[^<]+)</h1>\s*<div class="fileinfo">\s*(?:Velikost|Size)\s*: (?P<S>[^,]+),' FILE_OFFLINE_PATTERN = ur'<td align=center>Tento soubor byl smazán' - FILE_URL_REPLACEMENTS = [('#.*','')] + FILE_URL_REPLACEMENTS = [('#.*', '')] FREE_URL_PATTERN = ur'<form method=post action=(/free/.*?)><b>Stáhnout FREE.*?<img src="([^"]*)">' PREMIUM_URL_PATTERN = r'(http://data\d+\.fastshare\.cz/download\.php\?id=\d+\&[^\s\"\'<>]+)' @@ -45,7 +45,7 @@ class FastshareCz(SimpleHoster): if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()): self.handlePremium() else: - self.html = self.load(pyfile.url, decode = not self.SH_BROKEN_ENCODING, cookies = self.SH_COOKIES) + self.html = self.load(pyfile.url, decode=not self.SH_BROKEN_ENCODING, cookies=self.SH_COOKIES) self.getFileInfo() self.handleFree() @@ -56,14 +56,16 @@ class FastshareCz(SimpleHoster): self.retry(120, "No free slots") found = re.search(self.FREE_URL_PATTERN, self.html) - if not found: self.parseError("Free URL") + if not found: + 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, "submit": u"stáhnout"}) + self.download("http://www.fastshare.cz/" + action, post={"code": captcha, "submit": u"stáhnout"}) check = self.checkDownload({ - "paralell_dl": "<title>FastShare.cz</title>|<script>alert\('Pres FREE muzete stahovat jen jeden soubor najednou.'\)" - }) + "paralell_dl": + "<title>FastShare.cz</title>|<script>alert\('Pres FREE muzete stahovat jen jeden soubor najednou.'\)" + }) self.logDebug(self.req.lastEffectiveURL, self.req.lastURL, self.req.code) if check == "paralell_dl": @@ -83,7 +85,8 @@ class FastshareCz(SimpleHoster): self.resetAccount() found = re.search(self.PREMIUM_URL_PATTERN, self.html) - if not found: self.parseError("Premium URL") + if not found: + self.parseError("Premium URL") url = found.group(1) self.logDebug("PREMIUM URL: %s" % url) @@ -93,4 +96,5 @@ class FastshareCz(SimpleHoster): if check == "credit": self.resetAccount() -getInfo = create_getInfo(FastshareCz)
\ No newline at end of file + +getInfo = create_getInfo(FastshareCz) diff --git a/module/plugins/hoster/FileApeCom.py b/module/plugins/hoster/FileApeCom.py index 1f933e776..2ba01f3a0 100644 --- a/module/plugins/hoster/FileApeCom.py +++ b/module/plugins/hoster/FileApeCom.py @@ -5,11 +5,12 @@ import re from module.plugins.Hoster import Hoster + class FileApeCom(Hoster): __name__ = "FileApeCom" __type__ = "hoster" __pattern__ = r"http://(www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+" - __version__ = "0.1" + __version__ = "0.11" __description__ = """FileApe Download Hoster""" __author_name__ = ("espes") @@ -21,27 +22,29 @@ class FileApeCom(Hoster): self.pyfile = pyfile self.html = self.load(self.pyfile.url) - + if "This file is either temporarily unavailable or does not exist" in self.html: self.offline() - - self.html = self.load(self.pyfile.url+"&g=1") - + + self.html = self.load(self.pyfile.url + "&g=1") + continueMatch = re.search(r"window\.location = '(http://.*?)'", self.html) if not continueMatch: continueMatch = re.search(r"'(http://fileape\.com/\?act=download&t=[A-Za-z0-9_-]+)'", self.html) if continueMatch: continuePage = continueMatch.group(1) else: - self.fail("Plugin Defect") - + self.fail("Plugin Defect") + wait = 60 - waitMatch = re.search("id=\"waitnumber\" style=\"font-size:2em; text-align:center; width:33px; height:33px;\">(\\d+)</span>", self.html) + waitMatch = re.search( + "id=\"waitnumber\" style=\"font-size:2em; text-align:center; width:33px; height:33px;\">(\\d+)</span>", + self.html) if waitMatch: wait = int(waitMatch.group(1)) - self.setWait(wait+3) + self.setWait(wait + 3) self.wait() - + self.html = self.load(continuePage) linkMatch = \ re.search(r"<div style=\"text-align:center; font-size: 30px;\"><a href=\"(http://.*?)\"", self.html) @@ -51,12 +54,12 @@ class FileApeCom(Hoster): link = linkMatch.group(1) else: self.fail("Plugin Defect") - + pyfile.name = link.rpartition('/')[2] - + self.download(link) - + check = self.checkDownload({"exp": "Download ticket expired"}) if check == "exp": - self.log.info("Ticket expired, retrying...") - self.retry()
\ No newline at end of file + self.logInfo("Ticket expired, retrying...") + self.retry() diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py index 4a096e400..92735d579 100644 --- a/module/plugins/hoster/FilecloudIo.py +++ b/module/plugins/hoster/FilecloudIo.py @@ -19,8 +19,8 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError from module.common.json_layer import json_loads -from module.plugins.ReCaptcha import ReCaptcha -from module.network.RequestFactory import getURL +from module.plugins.internal.CaptchaService import ReCaptcha + class FilecloudIo(SimpleHoster): __name__ = "FilecloudIo" @@ -34,59 +34,59 @@ class FilecloudIo(SimpleHoster): FILE_NAME_PATTERN = r'id="aliasSpan">(?P<N>.*?) <' FILE_OFFLINE_PATTERN = r'l10n.(FILES__DOESNT_EXIST|REMOVED)' TEMP_OFFLINE_PATTERN = r'l10n.FILES__WARNING' - + UKEY_PATTERN = r"'ukey'\s*:'(\w+)'," AB1_PATTERN = r"if\( __ab1 == '(\w+)' \)" ERROR_MSG_PATTERN = r"var __error_msg\s*=\s*l10n\.(.*?);" DOWNLOAD_LINK_PATTERN = r'"(http://s\d+.filecloud.io/%s/\d+/.*?)"' - RECAPTCHA_KEY_PATTERN = r"var __recaptcha_public\s*=\s*'([^']+)';" + RECAPTCHA_KEY_PATTERN = r"var __recaptcha_public\s*=\s*'([^']+)';" RECAPTCHA_KEY = '6Lf5OdISAAAAAEZObLcx5Wlv4daMaASRov1ysDB1' - + def setup(self): self.resumeDownload = self.multiDL = True self.chunkLimit = 1 - + def handleFree(self): data = {"ukey": self.file_info['ID']} - + found = re.search(self.AB1_PATTERN, self.html) if not found: raise PluginParseError("__AB1") data["__ab1"] = found.group(1) - + if not self.account: self.fail("User not logged in") elif not self.account.logged_in: recaptcha = ReCaptcha(self) captcha_challenge, captcha_response = recaptcha.challenge(self.RECAPTCHA_KEY) - self.account.form_data = {"recaptcha_challenge_field" : captcha_challenge, - "recaptcha_response_field" : captcha_response} + self.account.form_data = {"recaptcha_challenge_field": captcha_challenge, + "recaptcha_response_field": captcha_response} self.account.relogin(self.user) - self.retry(max_tries = 2) - + self.retry(max_tries=2) + json_url = "http://filecloud.io/download-request.json" - response = self.load(json_url, post = data) - self.logDebug(response) + response = self.load(json_url, post=data) + self.logDebug(response) response = json_loads(response) - + if "error" in response and response["error"]: self.fail(response) - + self.logDebug(response) if response["captcha"]: recaptcha = ReCaptcha(self) found = re.search(self.RECAPTCHA_KEY_PATTERN, self.html) captcha_key = found.group(1) if found else self.RECAPTCHA_KEY data["ctype"] = "recaptcha" - + for i in range(5): data["recaptcha_challenge"], data["recaptcha_response"] = recaptcha.challenge(captcha_key) - + json_url = "http://filecloud.io/download-request.json" - response = self.load(json_url, post = data) + response = self.load(json_url, post=data) self.logDebug(response) response = json_loads(response) - + if "retry" in response and response["retry"]: self.invalidCaptcha() else: @@ -102,11 +102,12 @@ class FilecloudIo(SimpleHoster): raise PluginParseError("Download URL") download_url = found.group(1) self.logDebug("Download URL: %s" % download_url) - + if "size" in self.file_info and self.file_info['size']: - self.check_data = {"size": int(self.file_info['size'])} + self.check_data = {"size": int(self.file_info['size'])} self.download(download_url) else: self.fail("Unexpected server response") -getInfo = create_getInfo(FilecloudIo)
\ No newline at end of file + +getInfo = create_getInfo(FilecloudIo) diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py index fd833eef2..0fb0b6150 100644 --- a/module/plugins/hoster/FilejungleCom.py +++ b/module/plugins/hoster/FilejungleCom.py @@ -19,6 +19,7 @@ from module.plugins.hoster.FileserveCom import FileserveCom, checkFile from module.plugins.Plugin import chunks + class FilejungleCom(FileserveCom): __name__ = "FilejungleCom" __type__ = "hoster" @@ -27,12 +28,15 @@ class FilejungleCom(FileserveCom): __description__ = """Filejungle.com plugin - free only""" __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'] + + URLS = ['http://www.filejungle.com/f/', 'http://www.filejungle.com/check_links.php', + 'http://www.filejungle.com/checkReCaptcha.php'] LINKCHECK_TR = r'<li>\s*(<div class="col1">.*?)</li>' LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<[^>]*>| )*([^<]*)' - + LONG_WAIT_PATTERN = r'<h1>Please wait for (\d+) (\w+)\s*to download the next file\.</h1>' -def getInfo(urls): - for chunk in chunks(urls, 100): yield checkFile(FilejungleCom, chunk)
\ No newline at end of file + +def getInfo(urls): + for chunk in chunks(urls, 100): + yield checkFile(FilejungleCom, chunk) diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index bc47856e5..0c3cb925b 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -22,10 +22,12 @@ """ import re +from time import time + from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.common.json_layer import json_loads -from time import time + class FilepostCom(SimpleHoster): __name__ = "FilepostCom" @@ -47,65 +49,73 @@ class FilepostCom(SimpleHoster): file_id = re.search(self.__pattern__, self.pyfile.url).group(1) found = re.search(self.FLP_TOKEN_PATTERN, self.html) - if not found: self.parseError("Token") + if not found: + self.parseError("Token") flp_token = found.group(1) found = re.search(self.RECAPTCHA_KEY_PATTERN, self.html) - if not found: self.parseError("Captcha key") + if not found: + self.parseError("Captcha key") captcha_key = found.group(1) # Get wait time - get_dict = {'SID' : self.req.cj.getCookie('SID'), 'JsHttpRequest' : str(int(time()*10000)) + '-xml'} - post_dict = {'action' : 'set_download', 'token' : flp_token, 'code' : file_id} - wait_time = int(self.getJsonResponse(get_dict, post_dict, 'wait_time')) + get_dict = {'SID': self.req.cj.getCookie('SID'), 'JsHttpRequest': str(int(time() * 10000)) + '-xml'} + post_dict = {'action': 'set_download', 'token': flp_token, 'code': file_id} + wait_time = int(self.getJsonResponse(get_dict, post_dict, 'wait_time')) if wait_time > 0: self.setWait(wait_time) - self.wait() - - post_dict = {"token" : flp_token, "code" : file_id, "file_pass" : ''} - + self.wait() + + post_dict = {"token": flp_token, "code": file_id, "file_pass": ''} + if 'var is_pass_exists = true;' in self.html: # Solve password for file_pass in self.getPassword().splitlines(): - get_dict['JsHttpRequest'] = str(int(time()*10000)) + '-xml' + get_dict['JsHttpRequest'] = str(int(time() * 10000)) + '-xml' post_dict['file_pass'] = file_pass - self.logInfo("Password protected link, trying " + file_pass) - - download_url = self.getJsonResponse(get_dict, post_dict, 'link') - if download_url: + self.logInfo("Password protected link, trying " + file_pass) + + download_url = self.getJsonResponse(get_dict, post_dict, 'link') + if download_url: break - - else: self.fail("No or incorrect password") - + + else: + self.fail("No or incorrect password") + else: # Solve recaptcha recaptcha = ReCaptcha(self) - + for pokus in range(5): - get_dict['JsHttpRequest'] = str(int(time()*10000)) + '-xml' + get_dict['JsHttpRequest'] = str(int(time() * 10000)) + '-xml' if pokus: - post_dict["recaptcha_challenge_field"], post_dict["recaptcha_response_field"] = recaptcha.challenge(captcha_key) - self.logDebug(u"RECAPTCHA: %s : %s : %s" % (captcha_key, post_dict["recaptcha_challenge_field"], post_dict["recaptcha_response_field"])) - + post_dict["recaptcha_challenge_field"], post_dict["recaptcha_response_field"] = recaptcha.challenge( + captcha_key) + self.logDebug(u"RECAPTCHA: %s : %s : %s" % ( + captcha_key, post_dict["recaptcha_challenge_field"], post_dict["recaptcha_response_field"])) + download_url = self.getJsonResponse(get_dict, post_dict, 'link') if download_url: - if pokus: self.correctCaptcha() + if pokus: + self.correctCaptcha() break elif pokus: self.invalidCaptcha() - - else: self.fail("Invalid captcha") - + + else: + self.fail("Invalid captcha") + # Download - self.download(download_url) - - def getJsonResponse(self, get_dict, post_dict, field): - json_response = json_loads(self.load('https://filepost.com/files/get/', get = get_dict, post = post_dict)) + self.download(download_url) + + def getJsonResponse(self, get_dict, post_dict, field): + json_response = json_loads(self.load('https://filepost.com/files/get/', get=get_dict, post=post_dict)) self.logDebug(json_response) - - if not 'js' in json_response: self.parseError('JSON %s 1' % field) - + + if not 'js' in json_response: + self.parseError('JSON %s 1' % field) + # i changed js_answer to json_response['js'] since js_answer is nowhere set. # i don't know the JSON-HTTP specs in detail, but the previous author # accessed json_response['js']['error'] as well as js_answer['error']. @@ -115,9 +125,9 @@ class FilepostCom(SimpleHoster): self.retry(json_response['js']['params']['next_download']) # ~? self.retry(js_answer['params']['next_download']) elif 'Wrong file password' in json_response['js']['error']: - return None + return None elif 'You entered a wrong CAPTCHA code' in json_response['js']['error']: - return None + return None elif 'CAPTCHA Code nicht korrekt' in json_response['js']['error']: return None elif 'CAPTCHA' in json_response['js']['error']: @@ -126,10 +136,11 @@ class FilepostCom(SimpleHoster): else: self.fail(json_response['js']['error']) # ~? self.fail(js_answer['error']) - - if not 'answer' in json_response['js'] or not field in json_response['js']['answer']: + + if not 'answer' in json_response['js'] or not field in json_response['js']['answer']: self.parseError('JSON %s 2' % field) - + return json_response['js']['answer'][field] - + + getInfo = create_getInfo(FilepostCom) diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py index 815685ef8..8e8cee526 100644 --- a/module/plugins/hoster/FilerNet.py +++ b/module/plugins/hoster/FilerNet.py @@ -23,7 +23,7 @@ import pycurl import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha class FilerNet(SimpleHoster): diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py index 7be0fa4f6..7adffc4ed 100644 --- a/module/plugins/hoster/FilerioCom.py +++ b/module/plugins/hoster/FilerioCom.py @@ -1,20 +1,22 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class FilerioCom(XFileSharingPro): __name__ = "FilerioCom" __type__ = "hoster" __pattern__ = r"http://(?:\w*\.)*(filerio\.(in|com)|filekeen\.com)/\w{12}" - __version__ = "0.02" + __version__ = "0.02" __description__ = """FileRio.in hoster plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + FILE_OFFLINE_PATTERN = '<b>"File Not Found"</b>|File has been removed due to Copyright Claim' HOSTER_NAME = "filerio.in" - FILE_URL_REPLACEMENTS = [(r'http://.*?/','http://filerio.in/')] - + FILE_URL_REPLACEMENTS = [(r'http://.*?/', 'http://filerio.in/')] + def setup(self): - self.resumeDownload = self.multiDL = self.premium + self.resumeDownload = self.multiDL = self.premium + -getInfo = create_getInfo(FilerioCom)
\ No newline at end of file +getInfo = create_getInfo(FilerioCom) diff --git a/module/plugins/hoster/FilesMailRu.py b/module/plugins/hoster/FilesMailRu.py index 5f36de3c4..b18fec77b 100644 --- a/module/plugins/hoster/FilesMailRu.py +++ b/module/plugins/hoster/FilesMailRu.py @@ -6,6 +6,7 @@ from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.plugins.Plugin import chunks + def getInfo(urls): result = [] for chunk in chunks(urls, 10): @@ -23,21 +24,20 @@ def getInfo(urls): except: pass - # status 1=OFFLINE, 2=OK, 3=UNKNOWN # result.append((#name,#size,#status,#url)) yield result + class FilesMailRu(Hoster): __name__ = "FilesMailRu" __type__ = "hoster" __pattern__ = r"http://files\.mail\.ru/.*" - __version__ = "0.3" + __version__ = "0.31" __description__ = """Files.Mail.Ru One-Klick Hoster""" __author_name__ = ("oZiRiz") __author_mail__ = ("ich@oziriz.de") - def setup(self): if not self.account: self.multiDL = False @@ -46,17 +46,17 @@ class FilesMailRu(Hoster): def process(self, pyfile): self.html = self.load(pyfile.url) self.url_pattern = '<a href="(.+?)" onclick="return Act\(this\, \'dlink\'\, event\)">(.+?)</a>' - + #marks the file as "offline" when the pattern was found on the html-page''' if r'<div class="errorMessage mb10">' in self.html: self.offline() - + elif r'Page cannot be displayed' in self.html: self.offline() - + #the filename that will be showed in the list (e.g. test.part1.rar)''' pyfile.name = self.getFileName() - + #prepare and download''' if not self.account: self.prepare() @@ -67,25 +67,25 @@ class FilesMailRu(Hoster): self.myPostProcess() def prepare(self): - '''You have to wait some seconds. Otherwise you will get a 40Byte HTML Page instead of the file you expected''' + """You have to wait some seconds. Otherwise you will get a 40Byte HTML Page instead of the file you expected""" self.setWait(10) self.wait() return True - + def getFileUrl(self): - '''gives you the URL to the file. Extracted from the Files.mail.ru HTML-page stored in self.html''' - file_url = re.search(self.url_pattern, self.html).group(0).split('<a href="')[1].split('" onclick="return Act')[0] + """gives you the URL to the file. Extracted from the Files.mail.ru HTML-page stored in self.html""" + file_url = re.search(self.url_pattern, self.html).group(0).split('<a href="')[1].split('" onclick="return Act')[ + 0] return file_url - def getFileName(self): - '''gives you the Name for each file. Also extracted from the HTML-Page''' + """gives you the Name for each file. Also extracted from the HTML-Page""" file_name = re.search(self.url_pattern, self.html).group(0).split(', event)">')[1].split('</a>')[0] return file_name - + def myPostProcess(self): - # searches the file for HTMl-Code. Sometimes the Redirect - # doesn't work (maybe a curl Problem) and you get only a small + # searches the file for HTMl-Code. Sometimes the Redirect + # doesn't work (maybe a curl Problem) and you get only a small # HTML file and the Download is marked as "finished" # then the download will be restarted. It's only bad for these # who want download a HTML-File (it's one in a million ;-) ) @@ -96,5 +96,7 @@ class FilesMailRu(Hoster): # (Loading 100MB in to ram is not an option) check = self.checkDownload({"html": "<meta name="}, read_size=50000) if check == "html": - self.log.info(_("There was HTML Code in the Downloaded File("+ self.pyfile.name +")...redirect error? The Download will be restarted.")) + self.logInfo(_( + "There was HTML Code in the Downloaded File (%s)...redirect error? The Download will be restarted." % + self.pyfile.name)) self.retry() diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index 04c297661..e8e78f9b0 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -17,29 +17,31 @@ import re from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.common.json_layer import json_loads from module.utils import parseFileSize from module.plugins.Plugin import chunks + def checkFile(plugin, urls): - html = getURL(plugin.URLS[1], post = {"urls": "\n".join(urls)}, decode=True) + html = getURL(plugin.URLS[1], post={"urls": "\n".join(urls)}, decode=True) - file_info = [] + file_info = [] for li in re.finditer(plugin.LINKCHECK_TR, html, re.DOTALL): try: cols = re.findall(plugin.LINKCHECK_TD, li.group(1)) if cols: file_info.append(( cols[1] if cols[1] != '--' else cols[0], - parseFileSize(cols[2]) if cols[2] != '--' else 0, + parseFileSize(cols[2]) if cols[2] != '--' else 0, 2 if cols[3].startswith('Available') else 1, cols[0])) except Exception, e: continue - + return file_info + class FileserveCom(Hoster): __name__ = "FileserveCom" __type__ = "hoster" @@ -48,49 +50,49 @@ class FileserveCom(Hoster): __description__ = """Fileserve.Com File Download Hoster""" __author_name__ = ("jeix", "mkaay", "paul king", "zoidberg") __author_mail__ = ("jeix@hasnomail.de", "mkaay@mkaay.de", "", "zoidberg@mujmail.cz") - - URLS = ['http://www.fileserve.com/file/', 'http://www.fileserve.com/link-checker.php', 'http://www.fileserve.com/checkReCaptcha.php'] + + URLS = ['http://www.fileserve.com/file/', 'http://www.fileserve.com/link-checker.php', + 'http://www.fileserve.com/checkReCaptcha.php'] LINKCHECK_TR = r'<tr>\s*(<td>http://www.fileserve\.com/file/.*?)</tr>' LINKCHECK_TD = r'<td>(?:<[^>]*>| )*([^<]*)' - + CAPTCHA_KEY_PATTERN = r"var reCAPTCHA_publickey='(?P<key>[^']+)'" LONG_WAIT_PATTERN = r'<li class="title">You need to wait (\d+) (\w+) to start another download\.</li>' LINK_EXPIRED_PATTERN = "Your download link has expired" DAILY_LIMIT_PATTERN = "Your daily download limit has been reached" NOT_LOGGED_IN_PATTERN = '<form (name="loginDialogBoxForm"|id="login_form")|<li><a href="/login.php">Login</a></li>' - + # shares code with FilejungleCom and UploadstationCom - + def setup(self): self.resumeDownload = self.multiDL = True if self.premium else False - + self.file_id = re.search(self.__pattern__, self.pyfile.url).group('id') self.url = "%s%s" % (self.URLS[0], self.file_id) self.logDebug("File ID: %s URL: %s" % (self.file_id, self.url)) def process(self, pyfile): - pyfile.name, pyfile.size, status, self.url = checkFile(self, [self.url])[0] - if status != 2: self.offline() - self.logDebug("File Name: %s Size: %d" % (pyfile.name, pyfile.size)) - + pyfile.name, pyfile.size, status, self.url = checkFile(self, [self.url])[0] + if status != 2: + self.offline() + self.logDebug("File Name: %s Size: %d" % (pyfile.name, pyfile.size)) + if self.premium: self.handlePremium() else: self.handleFree() - + def handleFree(self): - self.html = self.load(self.url) + self.html = self.load(self.url) action = self.load(self.url, post={"checkDownload": "check"}, decode=True) action = json_loads(action) self.logDebug(action) - + if "fail" in action: if action["fail"] == "timeLimit": - self.html = self.load(self.url, - post={"checkDownload": "showError", - "errorType": "timeLimit"}, - decode=True) - + self.html = self.load(self.url,post={"checkDownload": "showError", "errorType": "timeLimit"}, + decode=True) + self.doLongWait(re.search(self.LONG_WAIT_PATTERN, self.html)) elif action["fail"] == "parallelDownload": @@ -99,17 +101,17 @@ class FileserveCom(Hoster): else: self.fail("Download check returned %s" % action["fail"]) - - elif "success" in action: + + elif "success" in action: if action["success"] == "showCaptcha": self.doCaptcha() self.doTimmer() elif action["success"] == "showTimmer": self.doTimmer() - + else: - self.fail("Unknown server response") - + self.fail("Unknown server response") + # show download link response = self.load(self.url, post={"downloadLink": "show"}, decode=True) self.logDebug("show downloadLink response : %s" % response) @@ -117,7 +119,7 @@ class FileserveCom(Hoster): self.fail("Couldn't retrieve download url") # this may either download our file or forward us to an error page - self.download(self.url, post = {"download": "normal"}) + self.download(self.url, post={"download": "normal"}) self.logDebug(self.req.http.lastEffectiveURL) check = self.checkDownload({"expired": self.LINK_EXPIRED_PATTERN, @@ -135,24 +137,23 @@ class FileserveCom(Hoster): self.wait() self.retry(max_tries=0) - self.thread.m.reconnecting.wait(3) # Ease issue with later downloads appearing to be in parallel - + self.thread.m.reconnecting.wait(3) # Ease issue with later downloads appearing to be in parallel + def doTimmer(self): - response = self.load(self.url, - post={"downloadLink": "wait"}, - decode=True) + response = self.load(self.url, post={"downloadLink": "wait"}, decode=True) self.logDebug("wait response : %s" % response[:80]) if "fail" in response: self.fail("Failed getting wait time") - if self.__name__ == "FilejungleCom": + if self.__name__ == "FilejungleCom": found = re.search(r'"waitTime":(\d+)', response) - if not found: self.fail("Cannot get wait time") + if not found: + self.fail("Cannot get wait time") wait_time = int(found.group(1)) else: wait_time = int(response) + 3 - + self.setWait(wait_time) self.wait() @@ -164,48 +165,56 @@ class FileserveCom(Hoster): challenge, code = recaptcha.challenge(captcha_key) response = json_loads(self.load(self.URLS[2], - post={'recaptcha_challenge_field': challenge, - 'recaptcha_response_field': code, - 'recaptcha_shortencode_field': self.file_id})) + post={'recaptcha_challenge_field': challenge, + 'recaptcha_response_field': code, + 'recaptcha_shortencode_field': self.file_id})) self.logDebug("reCaptcha response : %s" % response) if not response["success"]: self.invalidCaptcha() else: self.correctCaptcha() break - else: self.fail("Invalid captcha") - + else: + self.fail("Invalid captcha") + def doLongWait(self, m): - wait_time = (int(m.group(1)) * {'seconds':1, 'minutes':60, 'hours':3600}[m.group(2)]) if m else 720 + wait_time = (int(m.group(1)) * {'seconds': 1, 'minutes': 60, 'hours': 3600}[m.group(2)]) if m else 720 self.setWait(wait_time, True) self.wait() self.retry() - + def handlePremium(self): - premium_url = None + premium_url = None if self.__name__ == "FileserveCom": #try api download response = self.load("http://app.fileserve.com/api/download/premium/", - post = {"username": self.user, - "password": self.account.getAccountData(self.user)["password"], - "shorten": self.file_id}, - decode = True) + post={"username": self.user, + "password": self.account.getAccountData(self.user)["password"], + "shorten": self.file_id}, + decode=True) if response: response = json_loads(response) - if response['error_code'] == "302": premium_url = response['next'] - elif response['error_code'] in ["305", "500"]: self.tempOffline() - elif response['error_code'] in ["403", "605"]: self.resetAccount() - elif response['error_code'] in ["606", "607", "608"]: self.offline() - else: self.logError(response['error_code'], response['error_message']) - + if response['error_code'] == "302": + premium_url = response['next'] + elif response['error_code'] in ["305", "500"]: + self.tempOffline() + elif response['error_code'] in ["403", "605"]: + self.resetAccount() + elif response['error_code'] in ["606", "607", "608"]: + self.offline() + else: + self.logError(response['error_code'], response['error_message']) + self.download(premium_url or self.pyfile.url) - - if not premium_url: + + if not premium_url: check = self.checkDownload({"login": re.compile(self.NOT_LOGGED_IN_PATTERN)}) - + if check == "login": self.account.relogin(self.user) self.retry(reason=_("Not logged in.")) + def getInfo(urls): - for chunk in chunks(urls, 100): yield checkFile(FileserveCom, chunk)
\ No newline at end of file + for chunk in chunks(urls, 100): + yield checkFile(FileserveCom, chunk) diff --git a/module/plugins/hoster/FileshareInUa.py b/module/plugins/hoster/FileshareInUa.py index 9700b2d0a..d3724f728 100644 --- a/module/plugins/hoster/FileshareInUa.py +++ b/module/plugins/hoster/FileshareInUa.py @@ -1,9 +1,9 @@ -from urllib import urlencode import re from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.utils import parseFileSize + class FileshareInUa(Hoster): __name__ = "FileshareInUa" __type__ = "hoster" @@ -12,12 +12,12 @@ class FileshareInUa(Hoster): __description__ = """fileshare.in.ua hoster plugin""" __author_name__ = ("fwannmacher") __author_mail__ = ("felipe@warhammerproject.com") - + HOSTER_NAME = "fileshare.in.ua" PATTERN_FILENAME = r'<h3 class="b-filename">(.*?)</h3>' PATTERN_FILESIZE = r'<b class="b-filesize">(.*?)</b>' PATTERN_OFFLINE = "This file doesn't exist, or has been removed." - + def setup(self): self.resumeDownload = True self.multiDL = True @@ -28,51 +28,52 @@ class FileshareInUa(Hoster): if not self._checkOnline(): self.offline() - + self.pyfile.name = self._getName() - + self.link = self._getLink() - + if not self.link.startswith('http://'): self.link = "http://fileshare.in.ua" + self.link - self.download(self.link) + self.download(self.link) def _checkOnline(self): if re.search(self.PATTERN_OFFLINE, self.html): return False else: return True - + def _getName(self): name = re.search(self.PATTERN_FILENAME, self.html) if name is None: self.fail("%s: Plugin broken." % self.__name__) return name.group(1) - - def _getLink(self): + + def _getLink(self): return re.search("<a href=\"(/get/.+)\" class=\"b-button m-blue m-big\" >", self.html).group(1) + def getInfo(urls): result = [] - - for url in urls: + + for url in urls: html = getURL(url) - + if re.search(FileshareInUa.PATTERN_OFFLINE, html): result.append((url, 0, 1, url)) else: name = re.search(FileshareInUa.PATTERN_FILENAME, html) - + if name is None: result.append((url, 0, 1, url)) continue - + name = name.group(1) size = re.search(FileshareInUa.PATTERN_FILESIZE, html) - size = parseFileSize(size.group(1)) - + size = parseFileSize(size.group(1)) + result.append((name, size, 3, url)) yield result diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py index 7c5729c2d..c31707089 100644 --- a/module/plugins/hoster/FilezyNet.py +++ b/module/plugins/hoster/FilezyNet.py @@ -2,6 +2,7 @@ import re from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class FilezyNet(XFileSharingPro): __name__ = "FilezyNet" __type__ = "hoster" @@ -23,11 +24,12 @@ class FilezyNet(XFileSharingPro): self.logDebug("Getting download link") data = self.getPostParameters() - self.html = self.load(self.pyfile.url, post = data, ref = True, decode = True) + self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True) obfuscated_js = re.search(self.DOWNLOAD_JS_PATTERN, self.html) dl_file_now = self.js.eval(obfuscated_js.group(1)) link = re.search(self.DIRECT_LINK_PATTERN, dl_file_now) return link.group(1) + getInfo = create_getInfo(FilezyNet) diff --git a/module/plugins/hoster/FlyFilesNet.py b/module/plugins/hoster/FlyFilesNet.py index 0ffb76191..8d0ff0a08 100644 --- a/module/plugins/hoster/FlyFilesNet.py +++ b/module/plugins/hoster/FlyFilesNet.py @@ -4,9 +4,10 @@ import re import urllib -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.SimpleHoster import SimpleHoster from module.network.RequestFactory import getURL + class FlyFilesNet(SimpleHoster): __name__ = "FlyFilesNet" __version__ = "0.1" @@ -17,7 +18,6 @@ class FlyFilesNet(SimpleHoster): FILE_NAME_PATTERN = r'flyfiles\.net/.*/(.*)' def process(self, pyfile): - pyfile.name = re.search(self.FILE_NAME_PATTERN, pyfile.url).group(1) pyfile.name = urllib.unquote_plus(pyfile.name) @@ -31,11 +31,11 @@ class FlyFilesNet(SimpleHoster): if parsed_url == '#downlink|' or parsed_url == "#downlink|#": self.logWarning("Could not get the download URL. Please wait 10 minutes.") - self.setWait(600, True) # wait 10 minutes + self.setWait(600, True) # wait 10 minutes self.wait() self.retry() - download_url = parsed_url.replace('#downlink|','') + download_url = parsed_url.replace('#downlink|', '') self.logDebug("Download URL: %s" % download_url) self.download(download_url) diff --git a/module/plugins/hoster/FourSharedCom.py b/module/plugins/hoster/FourSharedCom.py index 518ae2ae6..6b3e33284 100644 --- a/module/plugins/hoster/FourSharedCom.py +++ b/module/plugins/hoster/FourSharedCom.py @@ -1,9 +1,11 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo import re +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + class FourSharedCom(SimpleHoster): __name__ = "FourSharedCom" __type__ = "hoster" @@ -18,7 +20,7 @@ class FourSharedCom(SimpleHoster): FILE_OFFLINE_PATTERN = 'The file link that you requested is not valid\.|This file was deleted.' FILE_NAME_REPLACEMENTS = [(r"&#(\d+).", lambda m: unichr(int(m.group(1))))] FILE_SIZE_REPLACEMENTS = [(",", "")] - + DOWNLOAD_BUTTON_PATTERN = 'id="btnLink" href="(.*?)"' FID_PATTERN = 'name="d3fid" value="(.*?)"' DOWNLOAD_URL_PATTERN = r'name="d3link" value="(.*?)"' @@ -26,28 +28,30 @@ class FourSharedCom(SimpleHoster): def handleFree(self): if not self.account: self.fail("User not logged in") - + found = re.search(self.DOWNLOAD_BUTTON_PATTERN, self.html) if found: link = found.group(1) else: link = re.sub(r'/(download|get|file|document|photo|video|audio)/', r'/get/', self.pyfile.url) - + self.html = self.load(link) - + found = re.search(self.DOWNLOAD_URL_PATTERN, self.html) - if not found: self.parseError('Download link') + if not found: + self.parseError('Download link') link = found.group(1) - + try: found = re.search(self.FID_PATTERN, self.html) response = self.load('http://www.4shared.com/web/d2/getFreeDownloadLimitInfo?fileId=%s' % found.group(1)) self.logDebug(response) except: pass - + self.setWait(20) self.wait() self.download(link) -getInfo = create_getInfo(FourSharedCom)
\ No newline at end of file + +getInfo = create_getInfo(FourSharedCom) diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py index 56e02cbdc..5a42d1a47 100644 --- a/module/plugins/hoster/FreakshareCom.py +++ b/module/plugins/hoster/FreakshareCom.py @@ -1,167 +1,171 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-from module.plugins.ReCaptcha import ReCaptcha
-
-class FreakshareCom(Hoster):
- __name__ = "FreakshareCom"
- __type__ = "hoster"
- __pattern__ = r"http://(?:www\.)?freakshare\.(net|com)/files/\S*?/"
- __version__ = "0.37"
- __description__ = """Freakshare.com Download Hoster"""
- __author_name__ = ("sitacuisses","spoob","mkaay", "Toilal")
- __author_mail__ = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de", "toilal.dev@gmail.com")
-
- def setup(self):
- self.html = None
- self.wantReconnect = False
- self.multiDL = False
- self.req_opts = []
-
- def process(self, pyfile):
- self.pyfile = pyfile
-
- pyfile.url = pyfile.url.replace("freakshare.net/","freakshare.com/")
-
- if self.account:
- self.html = self.load(pyfile.url, cookies=False)
- pyfile.name = self.get_file_name()
- self.download(pyfile.url)
-
- else:
- self.prepare()
- self.get_file_url()
-
- self.download(self.pyfile.url, post=self.req_opts)
-
-
- check = self.checkDownload({"bad": "bad try",
- "paralell": "> Sorry, you cant download more then 1 files at time. <",
- "empty": "Warning: Unknown: Filename cannot be empty",
- "wrong_captcha": "Wrong Captcha!"})
-
- if check == "bad":
- self.fail("Bad Try.")
- if check == "paralell":
- self.setWait(300, True)
- self.wait()
- self.retry()
- if check == "empty":
- self.fail("File not downloadable")
- if check == "wrong_captcha":
- self.invalidCaptcha()
- self.retry()
-
- def prepare(self):
- pyfile = self.pyfile
-
- self.wantReconnect = False
-
- self.download_html()
-
- if not self.file_exists():
- self.offline()
-
- self.setWait( self.get_waiting_time() )
-
- pyfile.name = self.get_file_name()
- pyfile.size = self.get_file_size()
-
- self.wait()
-
- return True
-
- def download_html(self):
- self.load("http://freakshare.com/index.php", {"language": "EN"}); # Set english language in server session
- self.html = self.load(self.pyfile.url)
-
- def get_file_url(self):
- """ returns the absolute downloadable filepath
- """
- if self.html is None:
- self.download_html()
- if not self.wantReconnect:
- self.req_opts = self.get_download_options() # get the Post options for the Request
- #file_url = self.pyfile.url
- #return file_url
- else:
- self.offline()
-
- def get_file_name(self):
- if self.html is None:
- self.download_html()
- if not self.wantReconnect:
- file_name = re.search(r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">([^ ]+)", self.html)
- if file_name is not None:
- file_name = file_name.group(1)
- else:
- file_name = self.pyfile.url
- return file_name
- else:
- return self.pyfile.url
-
- def get_file_size(self):
- size = 0
- if self.html is None:
- self.download_html()
- if not self.wantReconnect:
- file_size_check = re.search(r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">[^ ]+ - ([^ ]+) (\w\w)yte", self.html)
- if file_size_check is not None:
- units = float(file_size_check.group(1).replace(",", ""))
- pow = {'KB': 1, 'MB': 2, 'GB': 3}[file_size_check.group(2)]
- size = int(units * 1024 ** pow)
-
- return size
-
- def get_waiting_time(self):
- if self.html is None:
- self.download_html()
-
- if "Your Traffic is used up for today" in self.html:
- self.wantReconnect = True
- return 24*3600
-
- timestring = re.search('\s*var\s(?:downloadWait|time)\s=\s(\d*)[.\d]*;', self.html)
- if timestring:
- return int(timestring.group(1)) + 1 #add 1 sec as tenths of seconds are cut off
- else:
- return 60
-
-
- def file_exists(self):
- """ returns True or False
- """
- if self.html is None:
- self.download_html()
- if re.search(r"This file does not exist!", self.html) is not None:
- return False
- else:
- return True
-
- def get_download_options(self):
- re_envelope = re.search(r".*?value=\"Free\sDownload\".*?\n*?(.*?<.*?>\n*)*?\n*\s*?</form>", self.html).group(0) #get the whole request
- to_sort = re.findall(r"<input\stype=\"hidden\"\svalue=\"(.*?)\"\sname=\"(.*?)\"\s\/>", re_envelope)
- request_options = dict((n, v) for (v, n) in to_sort)
-
- herewego = self.load(self.pyfile.url, None, request_options) # the actual download-Page
-
- # comment this in, when it doesnt work
- # with open("DUMP__FS_.HTML", "w") as fp:
- # fp.write(herewego)
-
- to_sort = re.findall(r"<input\stype=\".*?\"\svalue=\"(\S*?)\".*?name=\"(\S*?)\"\s.*?\/>", herewego)
- request_options = dict((n, v) for (v, n) in to_sort)
-
- # comment this in, when it doesnt work as well
- #print "\n\n%s\n\n" % ";".join(["%s=%s" % x for x in to_sort])
-
- challenge = re.search(r"http://api\.recaptcha\.net/challenge\?k=([0-9A-Za-z]+)", herewego)
-
- if challenge:
- re_captcha = ReCaptcha(self)
- request_options["recaptcha_challenge_field"], request_options["recaptcha_response_field"] \
- = re_captcha.challenge(challenge.group(1))
-
- return request_options
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +from module.plugins.Hoster import Hoster +from module.plugins.internal.CaptchaService import ReCaptcha + + +class FreakshareCom(Hoster): + __name__ = "FreakshareCom" + __type__ = "hoster" + __pattern__ = r"http://(?:www\.)?freakshare\.(net|com)/files/\S*?/" + __version__ = "0.38" + __description__ = """Freakshare.com Download Hoster""" + __author_name__ = ("sitacuisses", "spoob", "mkaay", "Toilal") + __author_mail__ = ("sitacuisses@yahoo.de", "spoob@pyload.org", "mkaay@mkaay.de", "toilal.dev@gmail.com") + + def setup(self): + self.html = None + self.wantReconnect = False + self.multiDL = False + self.req_opts = [] + + def process(self, pyfile): + self.pyfile = pyfile + + pyfile.url = pyfile.url.replace("freakshare.net/", "freakshare.com/") + + if self.account: + self.html = self.load(pyfile.url, cookies=False) + pyfile.name = self.get_file_name() + self.download(pyfile.url) + + else: + self.prepare() + self.get_file_url() + + self.download(self.pyfile.url, post=self.req_opts) + + check = self.checkDownload({"bad": "bad try", + "paralell": "> Sorry, you cant download more then 1 files at time. <", + "empty": "Warning: Unknown: Filename cannot be empty", + "wrong_captcha": "Wrong Captcha!", + "downloadserver": "No Downloadserver. Please try again later!"}) + + if check == "bad": + self.fail("Bad Try.") + elif check == "paralell": + self.setWait(300, True) + self.wait() + self.retry() + elif check == "empty": + self.fail("File not downloadable") + elif check == "wrong_captcha": + self.invalidCaptcha() + self.retry() + elif check == "downloadserver": + self.retry(5, 900, 'No Download server') + + def prepare(self): + pyfile = self.pyfile + + self.wantReconnect = False + + self.download_html() + + if not self.file_exists(): + self.offline() + + self.setWait(self.get_waiting_time()) + + pyfile.name = self.get_file_name() + pyfile.size = self.get_file_size() + + self.wait() + + return True + + def download_html(self): + self.load("http://freakshare.com/index.php", {"language": "EN"}) # Set english language in server session + self.html = self.load(self.pyfile.url) + + def get_file_url(self): + """ returns the absolute downloadable filepath + """ + if self.html is None: + self.download_html() + if not self.wantReconnect: + self.req_opts = self.get_download_options() # get the Post options for the Request + #file_url = self.pyfile.url + #return file_url + else: + self.offline() + + def get_file_name(self): + if self.html is None: + self.download_html() + if not self.wantReconnect: + file_name = re.search(r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">([^ ]+)", self.html) + if file_name is not None: + file_name = file_name.group(1) + else: + file_name = self.pyfile.url + return file_name + else: + return self.pyfile.url + + def get_file_size(self): + size = 0 + if self.html is None: + self.download_html() + if not self.wantReconnect: + file_size_check = re.search( + r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">[^ ]+ - ([^ ]+) (\w\w)yte", self.html) + if file_size_check is not None: + units = float(file_size_check.group(1).replace(",", "")) + pow = {'KB': 1, 'MB': 2, 'GB': 3}[file_size_check.group(2)] + size = int(units * 1024 ** pow) + + return size + + def get_waiting_time(self): + if self.html is None: + self.download_html() + + if "Your Traffic is used up for today" in self.html: + self.wantReconnect = True + return 24 * 3600 + + timestring = re.search('\s*var\s(?:downloadWait|time)\s=\s(\d*)[.\d]*;', self.html) + if timestring: + return int(timestring.group(1)) + 1 # add 1 sec as tenths of seconds are cut off + else: + return 60 + + def file_exists(self): + """ returns True or False + """ + if self.html is None: + self.download_html() + if re.search(r"This file does not exist!", self.html) is not None: + return False + else: + return True + + def get_download_options(self): + re_envelope = re.search(r".*?value=\"Free\sDownload\".*?\n*?(.*?<.*?>\n*)*?\n*\s*?</form>", + self.html).group(0) # get the whole request + to_sort = re.findall(r"<input\stype=\"hidden\"\svalue=\"(.*?)\"\sname=\"(.*?)\"\s\/>", re_envelope) + request_options = dict((n, v) for (v, n) in to_sort) + + herewego = self.load(self.pyfile.url, None, request_options) # the actual download-Page + + # comment this in, when it doesnt work + # with open("DUMP__FS_.HTML", "w") as fp: + # fp.write(herewego) + + to_sort = re.findall(r"<input\stype=\".*?\"\svalue=\"(\S*?)\".*?name=\"(\S*?)\"\s.*?\/>", herewego) + request_options = dict((n, v) for (v, n) in to_sort) + + # comment this in, when it doesnt work as well + #print "\n\n%s\n\n" % ";".join(["%s=%s" % x for x in to_sort]) + + challenge = re.search(r"http://api\.recaptcha\.net/challenge\?k=([0-9A-Za-z]+)", herewego) + + if challenge: + re_captcha = ReCaptcha(self) + request_options["recaptcha_challenge_field"], request_options["recaptcha_response_field"] \ + = re_captcha.challenge(challenge.group(1)) + + return request_options diff --git a/module/plugins/hoster/FreevideoCz.py b/module/plugins/hoster/FreevideoCz.py index 19eb77470..c5da074ed 100644 --- a/module/plugins/hoster/FreevideoCz.py +++ b/module/plugins/hoster/FreevideoCz.py @@ -20,6 +20,7 @@ import re from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL + def getInfo(urls): result = [] @@ -33,6 +34,7 @@ def getInfo(urls): result.append((url, 0, 2, url)) yield result + class FreevideoCz(Hoster): __name__ = "FreevideoCz" __type__ = "hoster" diff --git a/module/plugins/hoster/FshareVn.py b/module/plugins/hoster/FshareVn.py index 926781b40..fa0bcb253 100644 --- a/module/plugins/hoster/FshareVn.py +++ b/module/plugins/hoster/FshareVn.py @@ -1,25 +1,29 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo -from module.network.RequestFactory import getURL import re from time import strptime, mktime, gmtime +from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo +from module.network.RequestFactory import getURL + + def getInfo(urls): for url in urls: - html = getURL('http://www.fshare.vn/check_link.php', post = { - "action" : "check_link", - "arrlinks" : url - }, decode = True) + html = getURL('http://www.fshare.vn/check_link.php', post={ + "action": "check_link", + "arrlinks": url + }, decode=True) file_info = parseFileInfo(FshareVn, url, html) yield file_info + def doubleDecode(m): return m.group(1).decode('raw_unicode_escape') + class FshareVn(SimpleHoster): __name__ = "FshareVn" __type__ = "hoster" @@ -37,10 +41,10 @@ class FshareVn(SimpleHoster): WAIT_PATTERN = ur'Lượt tải xuống kế tiếp là:\s*(.*?)\s*<' def process(self, pyfile): - self.html = self.load('http://www.fshare.vn/check_link.php', post = { + self.html = self.load('http://www.fshare.vn/check_link.php', post={ "action": "check_link", "arrlinks": pyfile.url - }, decode = True) + }, decode=True) self.getFileInfo() if self.premium: @@ -50,14 +54,15 @@ class FshareVn(SimpleHoster): self.checkDownloadedFile() def handleFree(self): - self.html = self.load(self.pyfile.url, decode = True) + self.html = self.load(self.pyfile.url, decode=True) self.checkErrors() action, inputs = self.parseHtmlForm('frm_download') self.url = self.pyfile.url + action - if not inputs: self.parseError('FORM') + if not inputs: + self.parseError('FORM') elif 'link_file_pwd_dl' in inputs: for password in self.getPassword().splitlines(): self.logInfo('Password protected link, trying "%s"' % password) @@ -76,7 +81,8 @@ class FshareVn(SimpleHoster): self.setWait(int(found.group(1)) if found else 30) found = re.search(self.DOWNLOAD_URL_PATTERN, self.html) - if not found: self.parseError('FREE DL URL') + if not found: + self.parseError('FREE DL URL') self.url = found.group(1) self.logDebug("FREE DL URL: %s" % self.url) @@ -104,8 +110,8 @@ class FshareVn(SimpleHoster): def checkDownloadedFile(self): # check download check = self.checkDownload({ - "not_found": ("<head><title>404 Not Found</title></head>") - }) + "not_found": "<head><title>404 Not Found</title></head>" + }) if check == "not_found": self.fail("File not found on server") diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py index 3bda3b32e..77992372a 100644 --- a/module/plugins/hoster/Ftp.py +++ b/module/plugins/hoster/Ftp.py @@ -1,91 +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: jeix
- @author: mkaay
-"""
-from urlparse import urlparse, urljoin
-from urllib import quote, unquote
-import pycurl, re
-
-from module.plugins.Hoster import Hoster
-from module.network.HTTPRequest import BadHeader
-
-class Ftp(Hoster):
- __name__ = "Ftp"
- __version__ = "0.41"
- __pattern__ = r'(ftps?|sftp)://(.*?:.*?@)?.*?/.*' # ftp://user:password@ftp.server.org/path/to/file
- __type__ = "hoster"
- __description__ = """A Plugin that allows you to download from an from an ftp directory"""
- __author_name__ = ("jeix", "mkaay", "zoidberg")
- __author_mail__ = ("jeix@hasnomail.com", "mkaay@mkaay.de", "zoidberg@mujmail.cz")
-
- def setup(self):
- self.chunkLimit = -1
- self.resumeDownload = True
-
- def process(self, pyfile):
- parsed_url = urlparse(pyfile.url)
- netloc = parsed_url.netloc
-
- pyfile.name = parsed_url.path.rpartition('/')[2]
- try:
- pyfile.name = unquote(str(pyfile.name)).decode('utf8')
- except:
- pass
-
- if not "@" in netloc:
- servers = [ x['login'] for x in self.account.getAllAccounts() ] if self.account else []
-
- if netloc in servers:
- self.logDebug("Logging on to %s" % netloc)
- self.req.addAuth(self.account.accounts[netloc]["password"])
- else:
- for pwd in pyfile.package().password.splitlines():
- if ":" in pwd:
- self.req.addAuth(pwd.strip())
- break
-
- self.req.http.c.setopt(pycurl.NOBODY, 1)
-
- try:
- response = self.load(pyfile.url)
- except pycurl.error, e:
- self.fail("Error %d: %s" % e.args)
-
- self.req.http.c.setopt(pycurl.NOBODY, 0)
- self.logDebug(self.req.http.header)
-
- found = re.search(r"Content-Length:\s*(\d+)", response)
- if found:
- pyfile.size = int(found.group(1))
- self.download(pyfile.url)
- else:
- #Naive ftp directory listing
- if re.search(r'^25\d.*?"', self.req.http.header, re.M):
- pyfile.url = pyfile.url.rstrip('/')
- pkgname = "/".join((pyfile.package().name,urlparse(pyfile.url).path.rpartition('/')[2]))
- pyfile.url += '/'
- self.req.http.c.setopt(48, 1) # CURLOPT_DIRLISTONLY
- response = self.load(pyfile.url, decode = False)
- links = [ pyfile.url + quote(x) for x in response.splitlines() ]
- self.logDebug("LINKS", links)
- self.core.api.addPackage(pkgname, links, 1)
- #self.core.files.addLinks(links, pyfile.package().id)
- else:
- self.fail("Unexpected server response")
-
-
\ No newline at end of file +# -*- 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 + @author: mkaay +""" +from urlparse import urlparse +from urllib import quote, unquote +import pycurl +import re + +from module.plugins.Hoster import Hoster + + +class Ftp(Hoster): + __name__ = "Ftp" + __version__ = "0.41" + __pattern__ = r'(ftps?|sftp)://(.*?:.*?@)?.*?/.*' # ftp://user:password@ftp.server.org/path/to/file + __type__ = "hoster" + __description__ = """A Plugin that allows you to download from an from an ftp directory""" + __author_name__ = ("jeix", "mkaay", "zoidberg") + __author_mail__ = ("jeix@hasnomail.com", "mkaay@mkaay.de", "zoidberg@mujmail.cz") + + def setup(self): + self.chunkLimit = -1 + self.resumeDownload = True + + def process(self, pyfile): + parsed_url = urlparse(pyfile.url) + netloc = parsed_url.netloc + + pyfile.name = parsed_url.path.rpartition('/')[2] + try: + pyfile.name = unquote(str(pyfile.name)).decode('utf8') + except: + pass + + if not "@" in netloc: + servers = [x['login'] for x in self.account.getAllAccounts()] if self.account else [] + + if netloc in servers: + self.logDebug("Logging on to %s" % netloc) + self.req.addAuth(self.account.accounts[netloc]["password"]) + else: + for pwd in pyfile.package().password.splitlines(): + if ":" in pwd: + self.req.addAuth(pwd.strip()) + break + + self.req.http.c.setopt(pycurl.NOBODY, 1) + + try: + response = self.load(pyfile.url) + except pycurl.error, e: + self.fail("Error %d: %s" % e.args) + + self.req.http.c.setopt(pycurl.NOBODY, 0) + self.logDebug(self.req.http.header) + + found = re.search(r"Content-Length:\s*(\d+)", response) + if found: + pyfile.size = int(found.group(1)) + self.download(pyfile.url) + else: + #Naive ftp directory listing + if re.search(r'^25\d.*?"', self.req.http.header, re.M): + pyfile.url = pyfile.url.rstrip('/') + pkgname = "/".join((pyfile.package().name, urlparse(pyfile.url).path.rpartition('/')[2])) + pyfile.url += '/' + self.req.http.c.setopt(48, 1) # CURLOPT_DIRLISTONLY + response = self.load(pyfile.url, decode=False) + links = [pyfile.url + quote(x) for x in response.splitlines()] + self.logDebug("LINKS", links) + self.core.api.addPackage(pkgname, links, 1) + #self.core.files.addLinks(links, pyfile.package().id) + else: + self.fail("Unexpected server response") diff --git a/module/plugins/hoster/GamefrontCom.py b/module/plugins/hoster/GamefrontCom.py index 34fda09d2..a76eb9b2f 100644 --- a/module/plugins/hoster/GamefrontCom.py +++ b/module/plugins/hoster/GamefrontCom.py @@ -3,6 +3,7 @@ from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.utils import parseFileSize + class GamefrontCom(Hoster): __name__ = "GamefrontCom" __type__ = "hoster" @@ -11,12 +12,12 @@ class GamefrontCom(Hoster): __description__ = """gamefront.com hoster plugin""" __author_name__ = ("fwannmacher") __author_mail__ = ("felipe@warhammerproject.com") - + HOSTER_NAME = "gamefront.com" PATTERN_FILENAME = r'<title>(.*?) | Game Front' PATTERN_FILESIZE = r'<dt>File Size:</dt>[\n\s]*<dd>(.*?)</dd>' PATTERN_OFFLINE = "This file doesn't exist, or has been removed." - + def setup(self): self.resumeDownload = True self.multiDL = False @@ -27,54 +28,56 @@ class GamefrontCom(Hoster): if not self._checkOnline(): self.offline() - + self.pyfile.name = self._getName() - + self.link = self._getLink() - + if not self.link.startswith('http://'): self.link = "http://www.gamefront.com/" + self.link - self.download(self.link) + self.download(self.link) def _checkOnline(self): if re.search(self.PATTERN_OFFLINE, self.html): return False else: return True - + def _getName(self): name = re.search(self.PATTERN_FILENAME, self.html) if name is None: self.fail("%s: Plugin broken." % self.__name__) return name.group(1) - - def _getLink(self): - self.html2 = self.load("http://www.gamefront.com/" + re.search("(files/service/thankyou\\?id=[A-Za-z0-9]+)", self.html).group(1)) + + def _getLink(self): + self.html2 = self.load("http://www.gamefront.com/" + re.search("(files/service/thankyou\\?id=[A-Za-z0-9]+)", + self.html).group(1)) self.link = re.search("<a href=\"(http://media[0-9]+\.gamefront.com/.*)\">click here</a>", self.html2) return self.link.group(1).replace("&", "&") + def getInfo(urls): result = [] - - for url in urls: + + for url in urls: html = getURL(url) - + if re.search(GamefrontCom.PATTERN_OFFLINE, html): result.append((url, 0, 1, url)) else: name = re.search(GamefrontCom.PATTERN_FILENAME, html) - + if name is None: result.append((url, 0, 1, url)) continue - + name = name.group(1) size = re.search(GamefrontCom.PATTERN_FILESIZE, html) - size = parseFileSize(size.group(1)) - + size = parseFileSize(size.group(1)) + result.append((name, size, 3, url)) - yield result
\ No newline at end of file + yield result diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py index 28ba35abe..de5d94513 100644 --- a/module/plugins/hoster/GigapetaCom.py +++ b/module/plugins/hoster/GigapetaCom.py @@ -18,9 +18,11 @@ import re from random import randint -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from pycurl import FOLLOWLOCATION +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + class GigapetaCom(SimpleHoster): __name__ = "GigapetaCom" __type__ = "hoster" @@ -34,40 +36,41 @@ class GigapetaCom(SimpleHoster): FILE_NAME_PATTERN = r'<img src=".*" alt="file" />-->\s*(?P<N>.*?)\s*</td>' FILE_SIZE_PATTERN = r'<th>\s*Size\s*</th>\s*<td>\s*(?P<S>.*?)\s*</td>' FILE_OFFLINE_PATTERN = r'<div id="page_error">' - - def handleFree(self): - captcha_key = str(randint(1,100000000)) + + def handleFree(self): + captcha_key = str(randint(1, 100000000)) captcha_url = "http://gigapeta.com/img/captcha.gif?x=%s" % captcha_key - + self.req.http.c.setopt(FOLLOWLOCATION, 0) - + for i in range(5): self.checkErrors() - - captcha = self.decryptCaptcha(captcha_url) - self.html = self.load(self.pyfile.url, post = { - "captcha_key": captcha_key, + + captcha = self.decryptCaptcha(captcha_url) + self.html = self.load(self.pyfile.url, post={ + "captcha_key": captcha_key, "captcha": captcha, "download": "Download"}) - + found = re.search(r"Location\s*:\s*(.*)", self.req.http.header, re.I) if found: - download_url = found.group(1) - break + download_url = found.group(1) + break elif "Entered figures don`t coincide with the picture" in self.html: - self.invalidCaptcha() + self.invalidCaptcha() else: - self.fail("No valid captcha code entered") - + self.fail("No valid captcha code entered") + self.req.http.c.setopt(FOLLOWLOCATION, 1) self.logDebug("Download URL: %s" % download_url) self.download(download_url) - + def checkErrors(self): if "All threads for IP" in self.html: self.logDebug("Your IP is already downloading a file - wait and retry") self.setWait(300, True) self.wait() self.retry() - -getInfo = create_getInfo(GigapetaCom)
\ No newline at end of file + + +getInfo = create_getInfo(GigapetaCom) diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py index aa494e34e..5fdcca7ae 100644 --- a/module/plugins/hoster/HellshareCz.py +++ b/module/plugins/hoster/HellshareCz.py @@ -17,7 +17,6 @@ """ import re -from math import ceil from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo @@ -39,18 +38,21 @@ class HellshareCz(SimpleHoster): self.chunkLimit = 1 def process(self, pyfile): - if not self.account: self.fail("User not logged in") + if not self.account: + self.fail("User not logged in") pyfile.url = re.search(self.__pattern__, pyfile.url).group(1) - self.html = self.load(pyfile.url, decode = True) + self.html = self.load(pyfile.url, decode=True) self.getFileInfo() if not self.checkTrafficLeft(): self.fail("Not enough traffic left for user %s." % self.user) found = re.search(self.SHOW_WINDOW_PATTERN, self.html) - if not found: self.parseError('SHOW WINDOW') + if not found: + self.parseError('SHOW WINDOW') self.url = "http://www.hellshare.com" + found.group(1) self.logDebug("DOWNLOAD URL: " + self.url) self.download(self.url) + getInfo = create_getInfo(HellshareCz) diff --git a/module/plugins/hoster/HellspyCz.py b/module/plugins/hoster/HellspyCz.py index 9858c82b7..2e0746ff4 100644 --- a/module/plugins/hoster/HellspyCz.py +++ b/module/plugins/hoster/HellspyCz.py @@ -19,6 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class HellspyCz(SimpleHoster): __name__ = "HellspyCz" __type__ = "hoster" @@ -32,7 +33,7 @@ class HellspyCz(SimpleHoster): FILE_NAME_PATTERN = r'<h1 title="(?P<N>.*?)"' FILE_OFFLINE_PATTERN = r'<h2>(404 - Page|File) not found</h2>' FILE_URL_REPLACEMENTS = [(__pattern__, r"http://www.hellspy.com\1")] - + CREDIT_LEFT_PATTERN = r'<strong>Credits: </strong>\s*(\d+)' DOWNLOAD_AGAIN_PATTERN = r'<a id="button-download-start"[^>]*title="You can download the file without deducting your credit.">' DOWNLOAD_URL_PATTERN = r"launchFullDownload\('([^']+)'" @@ -44,14 +45,14 @@ class HellspyCz(SimpleHoster): def handleFree(self): self.fail("Only premium users can download from HellSpy.cz") - def handlePremium(self): + def handlePremium(self): # set PHPSESSID cookie cj = self.account.getAccountCookies(self.user) cj.setCookie(".hellspy.com", "PHPSESSID", self.account.phpsessid) self.logDebug("PHPSESSID: " + cj.getCookie("PHPSESSID")) info = self.account.getAccountInfo(self.user, True) - self.logInfo("User %s has %i credits left" % (self.user, info["trafficleft"]/1024)) + self.logInfo("User %s has %i credits left" % (self.user, info["trafficleft"] / 1024)) if self.pyfile.size / 1024 > info["trafficleft"]: self.logWarning("Not enough credit left to download file") @@ -59,12 +60,14 @@ class HellspyCz(SimpleHoster): # get premium download URL and download self.html = self.load(self.pyfile.url + "?download=1") found = re.search(self.DOWNLOAD_URL_PATTERN, self.html) - if not found: self.parseError("Download URL") + if not found: + self.parseError("Download URL") url = found.group(1) self.logDebug("Download URL: " + url) self.download(url) info = self.account.getAccountInfo(self.user, True) - self.logInfo("User %s has %i credits left" % (self.user, info["trafficleft"]/1024)) - -getInfo = create_getInfo(HellspyCz)
\ No newline at end of file + self.logInfo("User %s has %i credits left" % (self.user, info["trafficleft"] / 1024)) + + +getInfo = create_getInfo(HellspyCz) diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py index 902a5601b..df08419fa 100644 --- a/module/plugins/hoster/HotfileCom.py +++ b/module/plugins/hoster/HotfileCom.py @@ -3,39 +3,42 @@ import re from module.plugins.Hoster import Hoster -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.network.RequestFactory import getURL from module.plugins.Plugin import chunks + def getInfo(urls): api_url_base = "http://api.hotfile.com/" - + for chunk in chunks(urls, 90): - api_param_file = {"action":"checklinks","links": ",".join(chunk),"fields":"id,status,name,size"} #api only supports old style links + api_param_file = {"action": "checklinks", "links": ",".join(chunk), + "fields": "id,status,name,size"} #api only supports old style links src = getURL(api_url_base, post=api_param_file, decode=True) result = [] for i, res in enumerate(src.split("\n")): if not res: continue fields = res.split(",") - + if fields[1] in ("1", "2"): status = 2 else: status = 1 - + result.append((fields[2], int(fields[3]), status, chunk[i])) yield result + class HotfileCom(Hoster): __name__ = "HotfileCom" __type__ = "hoster" __pattern__ = r"https?://(www.)?hotfile\.com/dl/\d+/[0-9a-zA-Z]+/" __version__ = "0.36" __description__ = """Hotfile.com Download Hoster""" - __author_name__ = ("sitacuisses","spoob","mkaay","JoKoT3") - __author_mail__ = ("sitacuisses@yhoo.de","spoob@pyload.org","mkaay@mkaay.de","jokot3@gmail.com") + __author_name__ = ("sitacuisses", "spoob", "mkaay", "JoKoT3") + __author_mail__ = ("sitacuisses@yhoo.de", "spoob@pyload.org", "mkaay@mkaay.de", "jokot3@gmail.com") FILE_OFFLINE_PATTERN = r'File is removed' @@ -44,7 +47,7 @@ class HotfileCom(Hoster): self.wantReconnect = False self.htmlwithlink = None self.url = None - + if self.premium: self.multiDL = True self.resumeDownload = True @@ -52,7 +55,7 @@ class HotfileCom(Hoster): else: self.multiDL = False self.chunkLimit = 1 - + def apiCall(self, method, post, login=False): if not self.account and login: return @@ -60,21 +63,21 @@ class HotfileCom(Hoster): return self.account.apiCall(method, post, self.user) post.update({"action": method}) return self.load("http://api.hotfile.com/", post=post, decode=True) - + def process(self, pyfile): self.wantReconnect = False - - args = {"links":self.pyfile.url, "fields":"id,status,name,size,sha1"} + + args = {"links": self.pyfile.url, "fields": "id,status,name,size,sha1"} resp = self.apiCall("checklinks", args) self.api_data = {} for k, v in zip(args["fields"].split(","), resp.strip().split(",")): self.api_data[k] = v - + if self.api_data["status"] == "0": self.offline() pyfile.name = self.api_data["name"] - + if not self.premium: self.downloadHTML() @@ -83,19 +86,19 @@ class HotfileCom(Hoster): self.setWait(self.getWaitTime()) self.wait() - + self.freeDownload() else: - dl = self.account.apiCall("getdirectdownloadlink", {"link":self.pyfile.url}, self.user) + dl = self.account.apiCall("getdirectdownloadlink", {"link": self.pyfile.url}, self.user) #dl = unquote(dl).strip() <- Made problems dl = dl.strip() self.download(dl) def downloadHTML(self): - self.html[0] = self.load(self.pyfile.url, get={"lang":"en"}) + self.html[0] = self.load(self.pyfile.url, get={"lang": "en"}) def freeDownload(self): - + form_content = re.search(r"<form style=.*(\n<.*>\s*)*?[\n\t]?<tr>", self.html[0]) if form_content is None: print self.html[0] @@ -103,35 +106,35 @@ class HotfileCom(Hoster): form_content = form_content.group(0) form_posts = dict(re.findall(r"<input\stype=hidden\sname=(\S*)\svalue=(\S*)>", form_content)) - + self.html[1] = self.load(self.pyfile.url, post=form_posts) challenge = re.search(r"http://api\.recaptcha\.net/challenge\?k=([0-9A-Za-z]+)", self.html[1]) - + if challenge: re_captcha = ReCaptcha(self) challenge, result = re_captcha.challenge(challenge.group(1)) - - url = re.search(r'<form action="(/dl/[^"]+)', self.html[1] ) - - self.html[1] = self.load("http://hotfile.com"+url.group(1), post={"action": "checkcaptcha", - "recaptcha_challenge_field" : challenge, - "recaptcha_response_field": result}) - + + url = re.search(r'<form action="(/dl/[^"]+)', self.html[1]) + + self.html[1] = self.load("http://hotfile.com" + url.group(1), post={"action": "checkcaptcha", + "recaptcha_challenge_field": challenge, + "recaptcha_response_field": result}) + if "Wrong Code. Please try again." in self.html[1]: self.freeDownload() return - + file_url = re.search(r'a href="(http://hotfile\.com/get/\S*)"', self.html[1]).group(1) self.download(file_url) - + def getWaitTime(self): free_limit_pattern = re.compile(r"timerend=d\.getTime\(\)\+(\d+);") matches = free_limit_pattern.findall(self.html[0]) if matches: - wait_time = (sum([int(match) for match in matches])/1000) or 60 - if wait_time > 300: + wait_time = (sum([int(match) for match in matches]) / 1000) or 60 + if wait_time > 300: self.wantReconnect = True return wait_time + 1 else: - self.fail("Don't know how long to wait. Cannot proceed.")
\ No newline at end of file + self.fail("Don't know how long to wait. Cannot proceed.") diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py index d8b744359..3cf32d338 100644 --- a/module/plugins/hoster/HundredEightyUploadCom.py +++ b/module/plugins/hoster/HundredEightyUploadCom.py @@ -15,6 +15,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################ +# Test links (random.bin): +# http://180upload.com/js9qdm6kjnrs + from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo diff --git a/module/plugins/hoster/IcyFilesCom.py b/module/plugins/hoster/IcyFilesCom.py index 34737e560..53c934675 100644 --- a/module/plugins/hoster/IcyFilesCom.py +++ b/module/plugins/hoster/IcyFilesCom.py @@ -20,6 +20,7 @@ import re from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL + def getInfo(urls): result = [] for url in urls: @@ -36,8 +37,8 @@ def getInfo(urls): size = (int(size.group(1)) * 1000000) result.append((name, size, 2, url)) yield result - - + + class IcyFilesCom(Hoster): __name__ = "IcyFilesCom" __type__ = "hoster" @@ -54,32 +55,31 @@ class IcyFilesCom(Hoster): WAIT_PATTERN = r'<div class="counter">(\d+)</div>' TOOMUCH_PATTERN = r'Sorry dude, you have downloaded too much\. Please wait (\d+) seconds' - def setup(self): self.multiDL = False - + def process(self, pyfile): self.html = self.load(pyfile.url, decode=True) # check if offline if re.search(self.FILE_OFFLINE_PATTERN, self.html): self.offline() - # All Downloadtickets in use + # All Downloadtickets in use timmy = re.search(self.WAIT_LONGER_PATTERN, self.html) if timmy: self.logDebug("waitforfreeslot") self.waitForFreeSlot() - # Wait the waittime + # Wait the waittime timmy = re.search(self.WAIT_PATTERN, self.html) if timmy: self.logDebug("waiting", timmy.group(1)) self.setWait(int(timmy.group(1)) + 2, False) - self.wait() + self.wait() # Downloaded to much timmy = re.search(self.TOOMUCH_PATTERN, self.html) if timmy: self.logDebug("too much", timmy.group(1)) self.setWait(int(timmy.group(1)), True) - self.wait() + self.wait() # Find Name found = re.search(self.FILE_NAME_PATTERN, self.html) if found is None: @@ -98,7 +98,7 @@ class IcyFilesCom(Hoster): "skippedcountdown": re.compile(r"^Dont skip the countdown$"), "waitforfreeslots": re.compile(self.WAIT_LONGER_PATTERN), "downloadedtoomuch": re.compile(self.TOOMUCH_PATTERN) - }) + }) if check == "skippedcountdown": self.fail("Countdown error") elif check == "notfound": diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py index bf394f340..0e3bdd227 100644 --- a/module/plugins/hoster/IfileIt.py +++ b/module/plugins/hoster/IfileIt.py @@ -19,8 +19,8 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.common.json_layer import json_loads -from module.plugins.ReCaptcha import ReCaptcha -from module.network.RequestFactory import getURL +from module.plugins.internal.CaptchaService import ReCaptcha + class IfileIt(SimpleHoster): __name__ = "IfileIt" @@ -37,17 +37,17 @@ class IfileIt(SimpleHoster): FILE_INFO_PATTERN = r'<span style="cursor: default;[^>]*>\s*(?P<N>.*?)\s* \s*<strong>\s*(?P<S>[0-9.]+)\s*(?P<U>[kKMG])i?B\s*</strong>\s*</span>' FILE_OFFLINE_PATTERN = r'<span style="cursor: default;[^>]*>\s* \s*<strong>\s*</strong>\s*</span>' TEMP_OFFLINE_PATTERN = r'<span class="msg_red">Downloading of this file is temporarily disabled</span>' - - def handleFree(self): + + def handleFree(self): ukey = re.search(self.__pattern__, self.pyfile.url).group(1) json_url = 'http://ifile.it/new_download-request.json' - post_data = {"ukey" : ukey, "ab": "0"} - - json_response = json_loads(self.load(json_url, post = post_data)) + post_data = {"ukey": ukey, "ab": "0"} + + json_response = json_loads(self.load(json_url, post=post_data)) self.logDebug(json_response) if json_response['status'] == 3: self.offline() - + if json_response["captcha"]: captcha_key = re.search(self.RECAPTCHA_KEY_PATTERN, self.html).group(1) recaptcha = ReCaptcha(self) @@ -55,9 +55,9 @@ class IfileIt(SimpleHoster): for i in range(5): post_data["recaptcha_challenge"], post_data["recaptcha_response"] = recaptcha.challenge(captcha_key) - json_response = json_loads(self.load(json_url, post = post_data)) + json_response = json_loads(self.load(json_url, post=post_data)) self.logDebug(json_response) - + if json_response["retry"]: self.invalidCaptcha() else: @@ -71,4 +71,5 @@ class IfileIt(SimpleHoster): self.download(json_response["ticket_url"]) -getInfo = create_getInfo(IfileIt)
\ No newline at end of file + +getInfo = create_getInfo(IfileIt) diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py index 6accbc524..dc1ef8fe2 100644 --- a/module/plugins/hoster/IfolderRu.py +++ b/module/plugins/hoster/IfolderRu.py @@ -17,9 +17,8 @@ """ import re -from urllib import quote from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.network.RequestFactory import getURL + class IfolderRu(SimpleHoster): __name__ = "IfolderRu" @@ -34,7 +33,7 @@ class IfolderRu(SimpleHoster): FILE_NAME_PATTERN = ur'(?:<div><span>)?Название:(?:</span>)? <b>(?P<N>[^<]+)</b><(?:/div|br)>' FILE_SIZE_PATTERN = ur'(?:<div><span>)?Размер:(?:</span>)? <b>(?P<S>[^<]+)</b><(?:/div|br)>' FILE_OFFLINE_PATTERN = ur'<p>Файл номер <b>[^<]*</b> (не найден|удален) !!!</p>' - + SESSION_ID_PATTERN = r'<a href=(http://ints.(?:rusfolder.com|ifolder.ru)/ints/sponsor/\?bi=\d*&session=([^&]+)&u=[^>]+)>' INTS_SESSION_PATTERN = r'\(\'ints_session\'\);\s*if\(tag\)\{tag.value = "([^"]+)";\}' HIDDEN_INPUT_PATTERN = r"var v = .*?name='([^']+)' value='1'" @@ -52,7 +51,7 @@ class IfolderRu(SimpleHoster): url = re.search('<a href="(http://ints\..*?=)"', self.html).group(1) self.html = self.load(url, cookies=True, decode=True) - + url, session_id = re.search(self.SESSION_ID_PATTERN, self.html).groups() self.html = self.load(url, cookies=True, decode=True) @@ -68,23 +67,22 @@ class IfolderRu(SimpleHoster): action, inputs = self.parseHtmlForm('ID="Form1"') inputs['ints_session'] = re.search(self.INTS_SESSION_PATTERN, self.html).group(1) inputs[re.search(self.HIDDEN_INPUT_PATTERN, self.html).group(1)] = '1' - inputs['confirmed_number'] = self.decryptCaptcha(captcha_url, cookies = True) + inputs['confirmed_number'] = self.decryptCaptcha(captcha_url, cookies=True) inputs['action'] = '1' self.logDebug(inputs) - self.html = self.load(url, decode = True, cookies = True, post = inputs) + self.html = self.load(url, decode=True, cookies=True, post=inputs) if self.WRONG_CAPTCHA_PATTERN in self.html: self.invalidCaptcha() else: - break; + break else: self.fail("Invalid captcha") - #self.html = self.load("http://rusfolder.com/%s?ints_code=%s" % (file_id, session_id), decode=True, cookies = True) - download_url = re.search(self.DOWNLOAD_LINK_PATTERN, self.html).group(1) self.correctCaptcha() self.logDebug("Download URL: %s" % download_url) self.download(download_url) -getInfo = create_getInfo(IfolderRu)
\ No newline at end of file + +getInfo = create_getInfo(IfolderRu) diff --git a/module/plugins/hoster/JumbofilesCom.py b/module/plugins/hoster/JumbofilesCom.py index 9e8adb512..93885a6a3 100644 --- a/module/plugins/hoster/JumbofilesCom.py +++ b/module/plugins/hoster/JumbofilesCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.utils import html_unescape + class JumbofilesCom(SimpleHoster): __name__ = "JumbofilesCom" @@ -11,7 +11,7 @@ class JumbofilesCom(SimpleHoster): __description__ = """JumboFiles.com hoster plugin""" __author_name__ = ("godofdream") __author_mail__ = ("soilfiction@gmail.com") - + FILE_INFO_PATTERN = '<TR><TD>(?P<N>[^<]+?)\s*<small>\((?P<S>[\d.]+)\s*(?P<U>[KMG][bB])\)</small></TD></TR>' FILE_OFFLINE_PATTERN = 'Not Found or Deleted / Disabled due to inactivity or DMCA' DIRECT_LINK_PATTERN = '<meta http-equiv="refresh" content="10;url=(.+)">' @@ -22,10 +22,11 @@ class JumbofilesCom(SimpleHoster): def handleFree(self): ukey = re.search(self.__pattern__, self.pyfile.url).group(1) - post_data = {"id" : ukey, "op": "download3", "rand": ""} - html = self.load(self.pyfile.url, post = post_data, decode=True) + post_data = {"id": ukey, "op": "download3", "rand": ""} + html = self.load(self.pyfile.url, post=post_data, decode=True) url = re.search(self.DIRECT_LINK_PATTERN, html).group(1) self.logDebug("Download " + url) self.download(url) - + + getInfo = create_getInfo(JumbofilesCom) diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py index c63272f27..8748817eb 100644 --- a/module/plugins/hoster/LetitbitNet.py +++ b/module/plugins/hoster/LetitbitNet.py @@ -19,7 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.common.json_layer import json_loads -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha class LetitbitNet(SimpleHoster): @@ -55,23 +55,21 @@ class LetitbitNet(SimpleHoster): self.html = self.load(self.DOMAIN + action, post=inputs, cookies=True) - """ - action, inputs = self.parseHtmlForm('id="d3_form"') - if not action: self.parseError("page 2 / d3_form") - #self.logDebug(action, inputs) - - self.html = self.load(action, post = inputs, cookies = True) - - try: - ajax_check_url, captcha_url = re.search(self.CHECK_URL_PATTERN, self.html).groups() - found = re.search(self.SECONDS_PATTERN, self.html) - seconds = int(found.group(1)) if found else 60 - self.setWait(seconds+1) - self.wait() - except Exception, e: - self.logError(e) - self.parseError("page 3 / js") - """ + # action, inputs = self.parseHtmlForm('id="d3_form"') + # if not action: self.parseError("page 2 / d3_form") + # #self.logDebug(action, inputs) + # + # self.html = self.load(action, post = inputs, cookies = True) + # + # try: + # ajax_check_url, captcha_url = re.search(self.CHECK_URL_PATTERN, self.html).groups() + # found = re.search(self.SECONDS_PATTERN, self.html) + # seconds = int(found.group(1)) if found else 60 + # self.setWait(seconds+1) + # self.wait() + # except Exception, e: + # self.logError(e) + # self.parseError("page 3 / js") found = re.search(self.SECONDS_PATTERN, self.html) seconds = int(found.group(1)) if found else 60 @@ -89,7 +87,8 @@ class LetitbitNet(SimpleHoster): recaptcha = ReCaptcha(self) challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY) - post_data = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": response, "recaptcha_control_field": recaptcha_control_field} + post_data = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": response, + "recaptcha_control_field": recaptcha_control_field} self.logDebug("Post data to send", post_data) response = self.load('%s/ajax/check_recaptcha.php' % self.DOMAIN, post=post_data, cookies=True) self.logDebug(response) @@ -122,4 +121,5 @@ class LetitbitNet(SimpleHoster): else: self.fail("Download did not finish correctly") + getInfo = create_getInfo(LetitbitNet) diff --git a/module/plugins/hoster/LuckyShareNet.py b/module/plugins/hoster/LuckyShareNet.py index a1e866089..08e44d9f6 100644 --- a/module/plugins/hoster/LuckyShareNet.py +++ b/module/plugins/hoster/LuckyShareNet.py @@ -1,72 +1,72 @@ -# -*- coding: utf-8 -*-
-
-import re
-from module.lib.bottle import json_loads
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.plugins.ReCaptcha import ReCaptcha
-
-
-class LuckyShareNet(SimpleHoster):
- __name__ = "LuckyShareNet"
- __type__ = "hoster"
- __pattern__ = r"https?://(www\.)?luckyshare.net/(?P<ID>\d{10,})"
- __version__ = "0.02"
- __description__ = """LuckyShare.net Download Hoster"""
- __author_name__ = ("stickell")
- __author_mail__ = ("l.stickell@yahoo.it")
-
- FILE_INFO_PATTERN = r"<h1 class='file_name'>(?P<N>\S+)</h1>\s*<span class='file_size'>Filesize: (?P<S>[\d.]+)(?P<U>\w+)</span>"
- FILE_OFFLINE_PATTERN = 'There is no such file available'
- RECAPTCHA_KEY = '6LdivsgSAAAAANWh-d7rPE1mus4yVWuSQIJKIYNw'
-
- def parseJson(self, rep):
- if 'AJAX Error' in rep:
- html = self.load(self.pyfile.url, decode=True)
- m = re.search(r"waitingtime = (\d+);", html)
- if m:
- waittime = int(m.group(1))
- self.logDebug('You have to wait %d seconds between free downloads' % waittime)
- self.retry(wait_time=waittime)
- else:
- self.parseError('Unable to detect wait time between free downloads')
- elif 'Hash expired' in rep:
- self.retry(reason='Hash expired')
- return json_loads(rep)
-
- # TODO: There should be a filesize limit for free downloads
- # TODO: Some files could not be downloaded in free mode
- def handleFree(self):
- file_id = re.search(self.__pattern__, self.pyfile.url).group('ID')
- self.logDebug('File ID: ' + file_id)
- rep = self.load(r"http://luckyshare.net/download/request/type/time/file/" + file_id, decode=True)
- self.logDebug('JSON: ' + rep)
- json = self.parseJson(rep)
-
- self.setWait(int(json['time']))
- self.wait()
-
- recaptcha = ReCaptcha(self)
- for i in xrange(5):
- challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY)
- rep = self.load(r"http://luckyshare.net/download/verify/challenge/%s/response/%s/hash/%s" %
- (challenge, response, json['hash']), decode=True)
- self.logDebug('JSON: ' + rep)
- if 'link' in rep:
- json.update(self.parseJson(rep))
- self.correctCaptcha()
- break
- elif 'Verification failed' in rep:
- self.logInfo('Wrong captcha')
- self.invalidCaptcha()
- else:
- self.parseError('Unable to get downlaod link')
-
- if not json['link']:
- self.fail("No Download url retrieved/all captcha attempts failed")
-
- self.logDebug('Direct URL: ' + json['link'])
- self.download(json['link'])
-
-
-getInfo = create_getInfo(LuckyShareNet)
+# -*- coding: utf-8 -*- + +import re +from module.lib.bottle import json_loads + +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo +from module.plugins.internal.CaptchaService import ReCaptcha + + +class LuckyShareNet(SimpleHoster): + __name__ = "LuckyShareNet" + __type__ = "hoster" + __pattern__ = r"https?://(www\.)?luckyshare.net/(?P<ID>\d{10,})" + __version__ = "0.02" + __description__ = """LuckyShare.net Download Hoster""" + __author_name__ = ("stickell") + __author_mail__ = ("l.stickell@yahoo.it") + + FILE_INFO_PATTERN = r"<h1 class='file_name'>(?P<N>\S+)</h1>\s*<span class='file_size'>Filesize: (?P<S>[\d.]+)(?P<U>\w+)</span>" + FILE_OFFLINE_PATTERN = 'There is no such file available' + RECAPTCHA_KEY = '6LdivsgSAAAAANWh-d7rPE1mus4yVWuSQIJKIYNw' + + def parseJson(self, rep): + if 'AJAX Error' in rep: + html = self.load(self.pyfile.url, decode=True) + m = re.search(r"waitingtime = (\d+);", html) + if m: + waittime = int(m.group(1)) + self.logDebug('You have to wait %d seconds between free downloads' % waittime) + self.retry(wait_time=waittime) + else: + self.parseError('Unable to detect wait time between free downloads') + elif 'Hash expired' in rep: + self.retry(reason='Hash expired') + return json_loads(rep) + + # TODO: There should be a filesize limit for free downloads + # TODO: Some files could not be downloaded in free mode + def handleFree(self): + file_id = re.search(self.__pattern__, self.pyfile.url).group('ID') + self.logDebug('File ID: ' + file_id) + rep = self.load(r"http://luckyshare.net/download/request/type/time/file/" + file_id, decode=True) + self.logDebug('JSON: ' + rep) + json = self.parseJson(rep) + + self.setWait(int(json['time'])) + self.wait() + + recaptcha = ReCaptcha(self) + for i in xrange(5): + challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY) + rep = self.load(r"http://luckyshare.net/download/verify/challenge/%s/response/%s/hash/%s" % + (challenge, response, json['hash']), decode=True) + self.logDebug('JSON: ' + rep) + if 'link' in rep: + json.update(self.parseJson(rep)) + self.correctCaptcha() + break + elif 'Verification failed' in rep: + self.logInfo('Wrong captcha') + self.invalidCaptcha() + else: + self.parseError('Unable to get downlaod link') + + if not json['link']: + self.fail("No Download url retrieved/all captcha attempts failed") + + self.logDebug('Direct URL: ' + json['link']) + self.download(json['link']) + + +getInfo = create_getInfo(LuckyShareNet) diff --git a/module/plugins/hoster/MegaNz.py b/module/plugins/hoster/MegaNz.py index e5be4eeb7..db97f6859 100644 --- a/module/plugins/hoster/MegaNz.py +++ b/module/plugins/hoster/MegaNz.py @@ -9,17 +9,18 @@ from base64 import standard_b64decode from Crypto.Cipher import AES from Crypto.Util import Counter -from module.common.json_layer import json +from module.common.json_layer import json_loads, json_dumps from module.plugins.Hoster import Hoster #def getInfo(urls): # pass + class MegaNz(Hoster): __name__ = "MegaNz" __type__ = "hoster" __pattern__ = r"https?://([a-z0-9]+\.)?mega\.co\.nz/#!([a-zA-Z0-9!_\-]+)" - __version__ = "0.12" + __version__ = "0.13" __description__ = """mega.co.nz hoster plugin""" __author_name__ = ("RaNaN", ) __author_mail__ = ("ranan@pyload.org", ) @@ -42,9 +43,9 @@ class MegaNz(Hoster): # generate a session id, no idea where to obtain elsewhere uid = random.randint(10 << 9, 10 ** 10) - resp = self.load(self.API_URL % uid, post=json.dumps([kwargs])) + resp = self.load(self.API_URL % uid, post=json_dumps([kwargs])) self.logDebug("Api Response: " + resp) - return json.loads(resp) + return json_loads(resp) def decryptAttr(self, data, key): @@ -55,7 +56,7 @@ class MegaNz(Hoster): self.fail(_("Decryption failed")) # Data is padded, 0-bytes must be stripped - return json.loads(attr.replace("MEGA", "").rstrip("\0").strip()) + return json_loads(attr.replace("MEGA", "").rstrip("\0").strip()) def decryptFile(self, key): """ Decrypts the file at lastDownload` """ @@ -64,7 +65,7 @@ class MegaNz(Hoster): n = key[16:24] # convert counter to long and shift bytes - ctr = Counter.new(128, initial_value=long(n.encode("hex"),16) << 64) + ctr = Counter.new(128, initial_value=long(n.encode("hex"), 16) << 64) cipher = AES.new(self.getCipherKey(key), AES.MODE_CTR, counter=ctr) self.pyfile.setStatus("decrypting") @@ -73,10 +74,11 @@ class MegaNz(Hoster): # TODO: calculate CBC-MAC for checksum - size = 2 ** 15 # buffer size, 32k + size = 2 ** 15 # buffer size, 32k while True: buf = f.read(size) - if not buf: break + if not buf: + break df.write(cipher.decrypt(buf)) diff --git a/module/plugins/hoster/MegacrypterCom.py b/module/plugins/hoster/MegacrypterCom.py index 9f012e5be..c166146dd 100644 --- a/module/plugins/hoster/MegacrypterCom.py +++ b/module/plugins/hoster/MegacrypterCom.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import re -from module.common.json_layer import json +from module.common.json_layer import json_loads, json_dumps from module.plugins.hoster.MegaNz import MegaNz @@ -9,7 +9,7 @@ class MegacrypterCom(MegaNz): __name__ = "MegacrypterCom" __type__ = "hoster" __pattern__ = r"(https?://[a-z0-9]{0,10}\.?megacrypter\.com/[a-zA-Z0-9!_\-]+)" - __version__ = "0.1" + __version__ = "0.2" __description__ = """megacrypter plugin, based and inherits from RaNaN's MegaNz plugin""" __author_name__ = ("GonzaloSR", ) __author_mail__ = ("gonzalo@gonzalosr.com", ) @@ -17,35 +17,27 @@ class MegacrypterCom(MegaNz): API_URL = "http://megacrypter.com/api" FILE_SUFFIX = ".crypted" - def callApi(self, **kwargs): """ Dispatch a call to the api, see megacrypter.com/api_doc """ - self.logDebug("JSON request: " + json.dumps(kwargs)) - resp = self.load(self.API_URL, post=json.dumps(kwargs)) + self.logDebug("JSON request: " + json_dumps(kwargs)) + resp = self.load(self.API_URL, post=json_dumps(kwargs)) self.logDebug("API Response: " + resp) - return json.loads(resp) + return json_loads(resp) - def process(self, pyfile): - - key = None - # match is guaranteed because plugin was chosen to handle url node = re.search(self.__pattern__, pyfile.url).group(1) - # get Mega.co.nz link info info = self.callApi(link=node, m="info") - + # get crypted file URL dl = self.callApi(link=node, m="dl") - # TODO: map error codes, implement password protection # if info["pass"] == true: # crypted_file_key, md5_file_key = info["key"].split("#") - key = self.b64_decode(info["key"]) pyfile.name = info["name"] + self.FILE_SUFFIX @@ -55,5 +47,3 @@ class MegacrypterCom(MegaNz): # Everything is finished and final name can be set pyfile.name = info["name"] - - diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py index 3fac633bc..3a66f356a 100644 --- a/module/plugins/hoster/MegasharesCom.py +++ b/module/plugins/hoster/MegasharesCom.py @@ -20,20 +20,21 @@ import re from time import time from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class MegasharesCom(SimpleHoster): __name__ = "MegasharesCom" __type__ = "hoster" __pattern__ = r"http://(\w+\.)?megashares.com/.*" - __version__ = "0.21" + __version__ = "0.22" __description__ = """megashares.com plugin - free only""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") FILE_NAME_PATTERN = '<h1 class="black xxl"[^>]*title="(?P<N>[^"]+)">' FILE_SIZE_PATTERN = '<strong><span class="black">Filesize:</span></strong> (?P<S>[0-9.]+) (?P<U>[kKMG])i?B<br />' - DOWNLOAD_URL_PATTERN = '<div id="show_download_button_%d"[^>]*>\s*<a href="([^"]+)">' - PASSPORT_LEFT_PATTERN = 'Your Download Passport is: <[^>]*>(\w+).*\s*You have\s*<[^>]*>\s*([0-9.]+) ([kKMG]i?B)' - PASSPORT_RENEW_PATTERN = 'Your download passport will renew in\s*<strong>(\d+)</strong>:<strong>(\d+)</strong>:<strong>(\d+)</strong>' + DOWNLOAD_URL_PATTERN = r'<div id="show_download_button_%d"[^>]*>\s*<a href="([^"]+)">' + PASSPORT_LEFT_PATTERN = r'Your Download Passport is: <[^>]*>(\w+).*\s*You have\s*<[^>]*>\s*([0-9.]+) ([kKMG]i?B)' + PASSPORT_RENEW_PATTERN = r'Your download passport will renew in\s*<strong>(\d+)</strong>:<strong>(\d+)</strong>:<strong>(\d+)</strong>' REACTIVATE_NUM_PATTERN = r'<input[^>]*id="random_num" value="(\d+)" />' REACTIVATE_PASSPORT_PATTERN = r'<input[^>]*id="passport_num" value="(\w+)" />' REQUEST_URI_PATTERN = r'var request_uri = "([^"]+)";' @@ -43,16 +44,16 @@ class MegasharesCom(SimpleHoster): def setup(self): self.resumeDownload = True self.multiDL = True if self.premium else False - + def handlePremium(self): self.handleDownload(True) def handleFree(self): self.html = self.load(self.pyfile.url, decode=True) - + if self.NO_SLOTS_PATTERN in self.html: - self.retry(wait_time = 300) - + self.retry(wait_time=300) + self.getFileInfo() #if self.pyfile.size > 576716800: self.fail("This file is too large for free download") @@ -62,15 +63,16 @@ class MegasharesCom(SimpleHoster): passport_num = found.group(1) request_uri = re.search(self.REQUEST_URI_PATTERN, self.html).group(1) - for i in range(5): + for _ in range(5): random_num = re.search(self.REACTIVATE_NUM_PATTERN, self.html).group(1) - verifyinput = self.decryptCaptcha("http://megashares.com/index.php?secgfx=gfx&random_num=%s" % random_num) + verifyinput = self.decryptCaptcha( + "http://megashares.com/index.php?secgfx=gfx&random_num=%s" % random_num) self.logInfo("Reactivating passport %s: %s %s" % (passport_num, random_num, verifyinput)) url = "http://d01.megashares.com%s&rs=check_passport_renewal" % request_uri + \ - "&rsargs[]=%s&rsargs[]=%s&rsargs[]=%s" % (verifyinput, random_num, passport_num) + \ - "&rsargs[]=replace_sec_pprenewal&rsrnd=%s" % str(int(time()*1000)) + "&rsargs[]=%s&rsargs[]=%s&rsargs[]=%s" % (verifyinput, random_num, passport_num) + \ + "&rsargs[]=replace_sec_pprenewal&rsrnd=%s" % str(int(time() * 1000)) self.logDebug(url) response = self.load(url) @@ -79,30 +81,34 @@ class MegasharesCom(SimpleHoster): self.retry(0) else: self.invalidCaptcha() - else: self.fail("Failed to reactivate passport") + else: + self.fail("Failed to reactivate passport") # Check traffic left on passport found = re.search(self.PASSPORT_LEFT_PATTERN, self.html) - if not found: self.fail('Passport not found') + if not found: + self.fail('Passport not found') self.logInfo("Download passport: %s" % found.group(1)) data_left = float(found.group(2)) * 1024 ** {'KB': 1, 'MB': 2, 'GB': 3}[found.group(3)] self.logInfo("Data left: %s %s (%d MB needed)" % (found.group(2), found.group(3), self.pyfile.size / 1048576)) - + if not data_left: found = re.search(self.PASSPORT_RENEW_PATTERN, self.html) renew = (found.group(1) + 60 * (found.group(2) + 60 * found.group(3))) if found else 600 self.retry(renew, 15, "Unable to get passport") - + self.handleDownload(False) - - def handleDownload(self, premium = False): + + def handleDownload(self, premium=False): # Find download link; found = re.search(self.DOWNLOAD_URL_PATTERN % (1 if premium else 2), self.html) msg = '%s download URL' % ('Premium' if premium else 'Free') - if not found: self.parseError(msg) - + if not found: + self.parseError(msg) + download_url = found.group(1) self.logDebug("%s: %s" % (msg, download_url)) self.download(download_url) + getInfo = create_getInfo(MegasharesCom)
\ No newline at end of file diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 6f5f1d3f1..2fbff66a6 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -4,103 +4,107 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.utils import html_unescape from module.network.RequestFactory import getURL + class MovReelCom(SimpleHoster): - __name__ = "MovReelCom" - __type__ = "hoster" - __pattern__ = r"http://movreel.com/.*" - __version__ = "1.00" - __description__ = """MovReel.com hoster plugin""" - __author_name__ = ("JorisV83") - __author_mail__ = ("jorisv83-pyload@yahoo.com") - - FILE_INFO_PATTERN = r'You have requested <font color="red">http://movreel.com/.*/(?P<N>.+?)</font>.*\((?P<S>[\d.]+) (?P<U>..)\)</font>' - FILE_OFFLINE_PATTERN = r'<b>File Not Found</b>' - - def setup(self): - self.resumeDownload = True - self.multiDL = False - - def handleFree(self): - - # Define search patterns - op_pattern = '<input type="hidden" name="op" value="(.*)">' - id_pattern = '<input type="hidden" name="id" value="(.*)">' - fn_pattern = '<input type="hidden" name="fname" value="(.*)">' - re_pattern = '<input type="hidden" name="referer" value="(.*)">' - ul_pattern = '<input type="hidden" name="usr_login" value="(.*)">' - rand_pattern = '<input type="hidden" name="rand" value="(.*)">' - link_pattern = "var file_link = '(.*)';" - downlimit_pattern = '<br><p class="err">You have reached the download-limit: .*</p>' - - # Get HTML source - self.logDebug("Getting first HTML source") - html = self.load(self.pyfile.url) - self.logDebug(" > Done") - - op_val = re.search(op_pattern, html).group(1) - id_val = re.search(id_pattern, html).group(1) - fn_val = re.search(fn_pattern, html).group(1) - re_val = re.search(re_pattern, html).group(1) - ul_val = re.search(ul_pattern, html).group(1) - - # Debug values - self.logDebug(" > Op " + op_val) - self.logDebug(" > Id " + id_val) - self.logDebug(" > Fname " + fn_val) - self.logDebug(" > Referer " + re_val) - self.logDebug(" > User Login " + ul_val) - - # Create post data - post_data = {"op" : op_val, "usr_login" : ul_val, "id" : id_val, "fname" : fn_val, "referer" : re_val, "method_free" : "+Free+Download"} - - # Post and get new HTML source - self.logDebug("Getting second HTML source") - html = self.load(self.pyfile.url, post = post_data, decode=True) - self.logDebug(" > Done") - - # Check download limit - if re.search(downlimit_pattern, html) is not None: - self.retry(3, 7200, "Download limit reached, wait 2h") - - # Retrieve data - if re.search(op_pattern, html) is not None: - op_val = re.search(op_pattern, html).group(1) - else: - self.retry(3, 10, "Second html: no op found!!") - - if re.search(id_pattern, html) is not None: - id_val = re.search(id_pattern, html).group(1) - else: - self.retry(3, 10, "Second html: no id found!!") - - if re.search(rand_pattern, html) is not None: - rand_val = re.search(rand_pattern, html).group(1) - else: - self.retry(3, 10, "Second html: no rand found!!") - - re_val = self.pyfile.url - - # Debug values - self.logDebug(" > Op " + op_val) - self.logDebug(" > Id " + id_val) - self.logDebug(" > Rand " + rand_val) - self.logDebug(" > Referer " + re_val) - - # Create post data - post_data = {"op" : op_val, "id" : id_val, "rand" : rand_val, "referer" : re_val, "method_free" : "+Free+Download", "method_premium" : "", "down_direct" : "1"} - - # Post and get new HTML source - self.logDebug("Getting third HTML source") - html = self.load(self.pyfile.url, post = post_data, decode=True) - self.logDebug(" > Done") - - # Get link value - if re.search(link_pattern, html) is not None: - link_val = re.search(link_pattern, html).group(1) - self.logDebug(" > Link " + link_val) - self.download(link_val) - else: - self.logDebug("No link found!!") - self.retry(3, 10, "No link found!!") - -getInfo = create_getInfo(MovReelCom)
\ No newline at end of file + __name__ = "MovReelCom" + __type__ = "hoster" + __pattern__ = r"http://movreel.com/.*" + __version__ = "1.00" + __description__ = """MovReel.com hoster plugin""" + __author_name__ = ("JorisV83") + __author_mail__ = ("jorisv83-pyload@yahoo.com") + + FILE_INFO_PATTERN = r'You have requested <font color="red">http://movreel.com/.*/(?P<N>.+?)</font>.*\((?P<S>[\d.]+) (?P<U>..)\)</font>' + FILE_OFFLINE_PATTERN = r'<b>File Not Found</b>' + + def setup(self): + self.resumeDownload = True + self.multiDL = False + + def handleFree(self): + + # Define search patterns + op_pattern = '<input type="hidden" name="op" value="(.*)">' + id_pattern = '<input type="hidden" name="id" value="(.*)">' + fn_pattern = '<input type="hidden" name="fname" value="(.*)">' + re_pattern = '<input type="hidden" name="referer" value="(.*)">' + ul_pattern = '<input type="hidden" name="usr_login" value="(.*)">' + rand_pattern = '<input type="hidden" name="rand" value="(.*)">' + link_pattern = "var file_link = '(.*)';" + downlimit_pattern = '<br><p class="err">You have reached the download-limit: .*</p>' + + # Get HTML source + self.logDebug("Getting first HTML source") + html = self.load(self.pyfile.url) + self.logDebug(" > Done") + + op_val = re.search(op_pattern, html).group(1) + id_val = re.search(id_pattern, html).group(1) + fn_val = re.search(fn_pattern, html).group(1) + re_val = re.search(re_pattern, html).group(1) + ul_val = re.search(ul_pattern, html).group(1) + + # Debug values + self.logDebug(" > Op " + op_val) + self.logDebug(" > Id " + id_val) + self.logDebug(" > Fname " + fn_val) + self.logDebug(" > Referer " + re_val) + self.logDebug(" > User Login " + ul_val) + + # Create post data + post_data = {"op": op_val, "usr_login": ul_val, "id": id_val, "fname": fn_val, "referer": re_val, + "method_free": "+Free+Download"} + + # Post and get new HTML source + self.logDebug("Getting second HTML source") + html = self.load(self.pyfile.url, post=post_data, decode=True) + self.logDebug(" > Done") + + # Check download limit + if re.search(downlimit_pattern, html) is not None: + self.retry(3, 7200, "Download limit reached, wait 2h") + + # Retrieve data + if re.search(op_pattern, html) is not None: + op_val = re.search(op_pattern, html).group(1) + else: + self.retry(3, 10, "Second html: no op found!!") + + if re.search(id_pattern, html) is not None: + id_val = re.search(id_pattern, html).group(1) + else: + self.retry(3, 10, "Second html: no id found!!") + + if re.search(rand_pattern, html) is not None: + rand_val = re.search(rand_pattern, html).group(1) + else: + self.retry(3, 10, "Second html: no rand found!!") + + re_val = self.pyfile.url + + # Debug values + self.logDebug(" > Op " + op_val) + self.logDebug(" > Id " + id_val) + self.logDebug(" > Rand " + rand_val) + self.logDebug(" > Referer " + re_val) + + # Create post data + post_data = {"op": op_val, "id": id_val, "rand": rand_val, "referer": re_val, "method_free": "+Free+Download", + "method_premium": "", "down_direct": "1"} + + # Post and get new HTML source + self.logDebug("Getting third HTML source") + html = self.load(self.pyfile.url, post=post_data, decode=True) + self.logDebug(" > Done") + + # Get link value + if re.search(link_pattern, html) is not None: + link_val = re.search(link_pattern, html).group(1) + self.logDebug(" > Link " + link_val) + self.download(link_val) + else: + self.logDebug("No link found!!") + self.retry(3, 10, "No link found!!") + + +getInfo = create_getInfo(MovReelCom) diff --git a/module/plugins/hoster/MultiDebridCom.py b/module/plugins/hoster/MultiDebridCom.py index ca98e8a0e..7280504cb 100644 --- a/module/plugins/hoster/MultiDebridCom.py +++ b/module/plugins/hoster/MultiDebridCom.py @@ -23,7 +23,7 @@ from module.common.json_layer import json_loads class MultiDebridCom(Hoster): __name__ = "MultiDebridCom" - __version__ = "0.01" + __version__ = "0.02" __type__ = "hoster" __pattern__ = r"http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/" __description__ = """Multi-debrid.com hoster plugin""" @@ -36,7 +36,7 @@ class MultiDebridCom(Hoster): def process(self, pyfile): if not self.account: - self.logError("Please enter your Multi-debrid.com account or deactivate this plugin") + self.logError(_("Please enter your %s account or deactivate this plugin") % "Multi-debrid.com") self.fail("No Multi-debrid.com account provided") self.logDebug("Original URL: %s" % pyfile.url) diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py index a0dda30b8..f9289a923 100644 --- a/module/plugins/hoster/MultishareCz.py +++ b/module/plugins/hoster/MultishareCz.py @@ -20,6 +20,7 @@ import re from random import random from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class MultishareCz(SimpleHoster): __name__ = "MultishareCz" __type__ = "hoster" @@ -31,50 +32,51 @@ class MultishareCz(SimpleHoster): FILE_INFO_PATTERN = ur'(?:<li>Název|Soubor): <strong>(?P<N>[^<]+)</strong><(?:/li><li|br)>Velikost: <strong>(?P<S>[^<]+)</strong>' FILE_OFFLINE_PATTERN = ur'<h1>Stáhnout soubor</h1><p><strong>Požadovaný soubor neexistuje.</strong></p>' FILE_SIZE_REPLACEMENTS = [(' ', '')] - + def process(self, pyfile): msurl = re.match(self.__pattern__, pyfile.url) if msurl: - self.fileID = msurl.group('ID') - self.html = self.load(pyfile.url, decode = True) + self.fileID = msurl.group('ID') + self.html = self.load(pyfile.url, decode=True) self.getFileInfo() - + if self.premium: self.handlePremium() else: - self.handleFree() - else: - self.handleOverriden() + self.handleFree() + else: + self.handleOverriden() def handleFree(self): self.download("http://www.multishare.cz/html/download_free.php?ID=%s" % self.fileID) - + def handlePremium(self): if not self.checkCredit(): self.logWarning("Not enough credit left to download file") - self.resetAccount() - + self.resetAccount() + self.download("http://www.multishare.cz/html/download_premium.php?ID=%s" % self.fileID) - + def handleOverriden(self): - if not self.premium: + if not self.premium: self.fail("Only premium users can download from other hosters") - - self.html = self.load('http://www.multishare.cz/html/mms_ajax.php', post = {"link": self.pyfile.url}, decode = True) - self.getFileInfo() - + + self.html = self.load('http://www.multishare.cz/html/mms_ajax.php', post={"link": self.pyfile.url}, decode=True) + self.getFileInfo() + if not self.checkCredit(): self.fail("Not enough credit left to download file") - - url = "http://dl%d.mms.multishare.cz/html/mms_process.php" % round(random()*10000*random()) - params = {"u_ID" : self.acc_info["u_ID"], "u_hash" : self.acc_info["u_hash"], "link" : self.pyfile.url} + + url = "http://dl%d.mms.multishare.cz/html/mms_process.php" % round(random() * 10000 * random()) + params = {"u_ID": self.acc_info["u_ID"], "u_hash": self.acc_info["u_hash"], "link": self.pyfile.url} self.logDebug(url, params) - self.download(url, get = params) - - def checkCredit(self): + self.download(url, get=params) + + def checkCredit(self): self.acc_info = self.account.getAccountInfo(self.user, True) - self.logInfo("User %s has %i MB left" % (self.user, self.acc_info["trafficleft"]/1024)) - + self.logInfo("User %s has %i MB left" % (self.user, self.acc_info["trafficleft"] / 1024)) + return self.pyfile.size / 1024 <= self.acc_info["trafficleft"] -getInfo = create_getInfo(MultishareCz)
\ No newline at end of file + +getInfo = create_getInfo(MultishareCz) diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py index f2d2082a7..e32fee5c8 100644 --- a/module/plugins/hoster/MyvideoDe.py +++ b/module/plugins/hoster/MyvideoDe.py @@ -4,6 +4,7 @@ import re from module.plugins.Hoster import Hoster from module.unescape import unescape + class MyvideoDe(Hoster): __name__ = "MyvideoDe" __type__ = "hoster" @@ -12,10 +13,10 @@ class MyvideoDe(Hoster): __description__ = """Myvideo.de Video Download Hoster""" __author_name__ = ("spoob") __author_mail__ = ("spoob@pyload.org") - + def setup(self): self.html = None - + def process(self, pyfile): self.pyfile = pyfile self.download_html() diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py index 335860de9..590268910 100644 --- a/module/plugins/hoster/NarodRu.py +++ b/module/plugins/hoster/NarodRu.py @@ -20,6 +20,7 @@ import re from random import random from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class NarodRu(SimpleHoster): __name__ = "NarodRu" __type__ = "hoster" @@ -31,10 +32,11 @@ class NarodRu(SimpleHoster): FILE_NAME_PATTERN = r'<dt class="name">(?:<[^<]*>)*(?P<N>[^<]+)</dt>' FILE_SIZE_PATTERN = r'<dd class="size">(?P<S>\d[^<]*)</dd>' FILE_OFFLINE_PATTERN = r'<title>404</title>|Файл удален с сервиса|Закончился срок хранения файла\.' - + FILE_SIZE_REPLACEMENTS = [(u'КБ', 'KB'), (u'МБ', 'MB'), (u'ГБ', 'GB')] - FILE_URL_REPLACEMENTS = [("narod.yandex.ru/", "narod.ru/"), (r"/start/[0-9]+\.\w+-narod\.yandex\.ru/([0-9]{6,15})/\w+/(\w+)", r"/disk/\1/\2")] - + FILE_URL_REPLACEMENTS = [("narod.yandex.ru/", "narod.ru/"), + (r"/start/[0-9]+\.\w+-narod\.yandex\.ru/([0-9]{6,15})/\w+/(\w+)", r"/disk/\1/\2")] + CAPTCHA_PATTERN = r'<number url="(.*?)">(\w+)</number>' DOWNLOAD_LINK_PATTERN = r'<a class="h-link" rel="yandex_bar" href="(.+?)">' @@ -42,12 +44,13 @@ class NarodRu(SimpleHoster): for i in range(5): self.html = self.load('http://narod.ru/disk/getcapchaxml/?rnd=%d' % int(random() * 777)) found = re.search(self.CAPTCHA_PATTERN, self.html) - if not found: self.parseError('Captcha') + if not found: + self.parseError('Captcha') post_data = {"action": "sendcapcha"} captcha_url, post_data['key'] = found.groups() post_data['rep'] = self.decryptCaptcha(captcha_url) - - self.html = self.load(self.pyfile.url, post = post_data, decode = True) + + self.html = self.load(self.pyfile.url, post=post_data, decode=True) found = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) if found: url = 'http://narod.ru' + found.group(1) @@ -59,8 +62,9 @@ class NarodRu(SimpleHoster): self.parseError('Download link') else: self.fail("No valid captcha code entered") - + self.logDebug('Download link: ' + url) - self.download(url) + self.download(url) + -getInfo = create_getInfo(NarodRu)
\ No newline at end of file +getInfo = create_getInfo(NarodRu) diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index e616badc2..d150443f0 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -4,16 +4,13 @@ import re from time import sleep, time - from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.plugins.Plugin import chunks - def getInfo(urls): - ## returns list of tupels (name, size (in bytes), status (see FileDatabase), url) - + ## returns list of tupels (name, size (in bytes), status (see FileDatabase), url) apiurl = "http://api.netload.in/info.php?auth=Zf9SnQh9WiReEsb18akjvQGqT0I830e8&bz=1&md5=1&file_id=" id_regex = re.compile(NetloadIn.__pattern__) @@ -24,9 +21,9 @@ def getInfo(urls): for url in chunk: match = id_regex.search(url) if match: - ids = ids + match.group(1) +";" + ids = ids + match.group(1) + ";" - api = getURL(apiurl+ids, decode = True) + api = getURL(apiurl + ids, decode=True) if api is None or len(api) < 10: print "Netload prefetch: failed " @@ -44,18 +41,19 @@ def getInfo(urls): size = int(tmp[2]) except: size = 0 - result.append( (tmp[1], size, 2 if tmp[3] == "online" else 1, chunk[i] ) ) + result.append((tmp[1], size, 2 if tmp[3] == "online" else 1, chunk[i] )) except: print "Netload prefetch: Error while processing response: " print r yield result + class NetloadIn(Hoster): __name__ = "NetloadIn" __type__ = "hoster" __pattern__ = r"https?://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)" - __version__ = "0.42" + __version__ = "0.44" __description__ = """Netload.in Download Hoster""" __author_name__ = ("spoob", "RaNaN", "Gregy") __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "gregy@gregy.cz") @@ -80,7 +78,7 @@ class NetloadIn(Hoster): self.pyfile.name = self.api_data["filename"] if self.premium: - self.log.debug("Netload: Use Premium Account") + self.logDebug("Netload: Use Premium Account") return True if self.download_html(): @@ -88,7 +86,7 @@ class NetloadIn(Hoster): else: self.fail("Failed") return False - + def download_api_data(self, n=0): url = self.url id_regex = re.compile(self.__pattern__) @@ -103,13 +101,15 @@ class NetloadIn(Hoster): return apiurl = "http://api.netload.in/info.php" - src = self.load(apiurl, cookies=False, get={"file_id": match.group(1), "auth": "Zf9SnQh9WiReEsb18akjvQGqT0I830e8", "bz": "1", "md5": "1"}, decode = True).strip() + src = self.load(apiurl, cookies=False, + get={"file_id": match.group(1), "auth": "Zf9SnQh9WiReEsb18akjvQGqT0I830e8", "bz": "1", + "md5": "1"}, decode=True).strip() if not src and n <= 3: sleep(0.2) - self.download_api_data(n+1) - return + self.download_api_data(n + 1) + return - self.log.debug("Netload: APIDATA: "+src) + self.logDebug("Netload: APIDATA: " + src) self.api_data = {} if src and ";" in src and src not in ("unknown file_data", "unknown_server_data", "No input file specified."): lines = src.split(";") @@ -121,31 +121,31 @@ class NetloadIn(Hoster): if self.api_data["status"] == "online": self.api_data["checksum"] = lines[4].strip() else: - self.api_data = False #check manually since api data is useless sometimes + self.api_data = False # check manually since api data is useless sometimes - if lines[0] == lines[1] and lines[2] == "0": #useless api data + if lines[0] == lines[1] and lines[2] == "0": # useless api data self.api_data = False else: self.api_data = False - + def final_wait(self, page): wait_time = self.get_wait_time(page) self.setWait(wait_time) - self.log.debug("Netload: final wait %d seconds" % wait_time) + self.logDebug("Netload: final wait %d seconds" % wait_time) self.wait() self.url = self.get_file_url(page) def download_html(self): - self.log.debug("Netload: Entering download_html") + self.logDebug("Netload: Entering download_html") page = self.load(self.url, decode=True) t = time() + 30 - + if "/share/templates/download_hddcrash.tpl" in page: - self.log.error("Netload HDD Crash") + self.logError("Netload HDD Crash") self.fail(_("File temporarily not available")) - + if not self.api_data: - self.log.debug("API Data may be useless, get details from html page") + self.logDebug("API Data may be useless, get details from html page") if "* The file was deleted" in page: self.offline() @@ -163,34 +163,34 @@ class NetloadIn(Hoster): if not page: page = self.load(self.url) t = time() + 30 - + if "/share/templates/download_hddcrash.tpl" in page: - self.log.error("Netload HDD Crash") + self.logError("Netload HDD Crash") self.fail(_("File temporarily not available")) - - self.log.debug("Netload: try number %d " % i) + + self.logDebug("Netload: try number %d " % i) if ">Your download is being prepared.<" in page: - self.log.debug("Netload: We will prepare your download") + self.logDebug("Netload: We will prepare your download") self.final_wait(page) return True if ">An access request has been made from IP address <" in page: wait = self.get_wait_time(page) if wait == 0: - self.log.debug("Netload: Wait was 0 setting 30") + self.logDebug("Netload: Wait was 0 setting 30") wait = 30 - self.log.info(_("Netload: waiting between downloads %d s." % wait)) + self.logInfo(_("Netload: waiting between downloads %d s." % wait)) self.wantReconnect = True self.setWait(wait) self.wait() return self.download_html() - - self.log.debug("Netload: Trying to find captcha") + self.logDebug("Netload: Trying to find captcha") try: - url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&.*&captcha=1)', page).group(1).replace("amp;", "") + url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&.*&captcha=1)', + page).group(1).replace("amp;", "") except: page = None continue @@ -199,25 +199,27 @@ class NetloadIn(Hoster): page = self.load(url_captcha_html, cookies=True) captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', page).group(1) except: - self.log.debug("Netload: Could not find captcha, try again from beginning") + self.logDebug("Netload: Could not find captcha, try again from beginning") captchawaited = False continue file_id = re.search('<input name="file_id" type="hidden" value="(.*)" />', page).group(1) if not captchawaited: wait = self.get_wait_time(page) - if i == 0: self.pyfile.waitUntil = time() # dont wait contrary to time on website - else: self.pyfile.waitUntil = t - self.log.info(_("Netload: waiting for captcha %d s.") % (self.pyfile.waitUntil - time())) + if i == 0: + self.pyfile.waitUntil = time() # dont wait contrary to time on website + else: + self.pyfile.waitUntil = t + self.logInfo(_("Netload: waiting for captcha %d s.") % (self.pyfile.waitUntil - time())) #self.setWait(wait) self.wait() captchawaited = True captcha = self.decryptCaptcha(captcha_url) - page = self.load("http://netload.in/index.php?id=10", post={"file_id": file_id, "captcha_check": captcha}, cookies=True) + page = self.load("http://netload.in/index.php?id=10", post={"file_id": file_id, "captcha_check": captcha}, + cookies=True) return False - def get_file_url(self, page): try: @@ -226,21 +228,20 @@ class NetloadIn(Hoster): if attempt is not None: return attempt.group(1) else: - self.log.debug("Netload: Backup try for final link") + self.logDebug("Netload: Backup try for final link") file_url_pattern = r"<a href=\"(.+)\" class=\"Orange_Link\">Click here" attempt = re.search(file_url_pattern, page) - return "http://netload.in/"+attempt.group(1) + return "http://netload.in/" + attempt.group(1) except: - self.log.debug("Netload: Getting final link failed") + self.logDebug("Netload: Getting final link failed") return None def get_wait_time(self, page): wait_seconds = int(re.search(r"countdown\((.+),'change\(\)'\)", page).group(1)) / 100 return wait_seconds - def proceed(self, url): - self.log.debug("Netload: Downloading..") + self.logDebug("Netload: Downloading..") self.download(url, disposition=True) @@ -251,4 +252,3 @@ class NetloadIn(Hoster): self.retry() elif check == "offline": self.offline() - diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py index dfd18761c..6457734e5 100644 --- a/module/plugins/hoster/NovafileCom.py +++ b/module/plugins/hoster/NovafileCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class NovafileCom(XFileSharingPro): __name__ = "NovafileCom" __type__ = "hoster" @@ -9,16 +10,17 @@ class NovafileCom(XFileSharingPro): __description__ = """novafile.com hoster plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + FILE_SIZE_PATTERN = r'<div class="size">(?P<S>.+?)</div>' #FILE_OFFLINE_PATTERN = '<b>"File Not Found"</b>|File has been removed due to Copyright Claim' FORM_PATTERN = r'name="F\d+"' ERROR_PATTERN = r'class="alert[^"]*alert-separate"[^>]*>\s*(?:<p>)?(.*?)\s*</' DIRECT_LINK_PATTERN = r'<a href="(http://s\d+\.novafile\.com/.*?)" class="btn btn-green">Download File</a>' - - HOSTER_NAME = "novafile.com" - + + HOSTER_NAME = "novafile.com" + def setup(self): - self.multiDL = False + self.multiDL = False + -getInfo = create_getInfo(NovafileCom)
\ No newline at end of file +getInfo = create_getInfo(NovafileCom) diff --git a/module/plugins/hoster/NowDownloadEu.py b/module/plugins/hoster/NowDownloadEu.py index 126ca3d89..4e4c32373 100644 --- a/module/plugins/hoster/NowDownloadEu.py +++ b/module/plugins/hoster/NowDownloadEu.py @@ -17,10 +17,10 @@ """ import re -from random import random from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.utils import fixup + class NowDownloadEu(SimpleHoster): __name__ = "NowDownloadEu" __type__ = "hoster" @@ -46,21 +46,25 @@ class NowDownloadEu(SimpleHoster): def handleFree(self): tokenlink = re.search(self.FILE_TOKEN_PATTERN, self.html) continuelink = re.search(self.FILE_CONTINUE_PATTERN, self.html) - if (not tokenlink) or (not continuelink): self.fail('Plugin out of Date') + if (not tokenlink) or (not continuelink): + self.fail('Plugin out of Date') wait = 60 found = re.search(self.FILE_WAIT_PATTERN, self.html) - if found: wait = int(found.group(1)) + if found: + wait = int(found.group(1)) self.html = self.load("http://www.nowdownload.eu" + str(tokenlink.group(1))) self.setWait(wait) - self.wait() + self.wait() self.html = self.load("http://www.nowdownload.eu" + str(continuelink.group(1))) url = re.search(self.FILE_DOWNLOAD_LINK, self.html) - if not url: self.fail('Download Link not Found (Plugin out of Date?)') + if not url: + self.fail('Download Link not Found (Plugin out of Date?)') self.logDebug('Download link: ' + str(url.group(1))) - self.download(str(url.group(1))) + self.download(str(url.group(1))) + getInfo = create_getInfo(NowDownloadEu) diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py index c7c3384e9..9e2f53fd2 100644 --- a/module/plugins/hoster/OneFichierCom.py +++ b/module/plugins/hoster/OneFichierCom.py @@ -3,56 +3,59 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + 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.47" __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") - + __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 :</th>\s*<td>(?P<N>[^<]+)</td>' FILE_SIZE_PATTERN = r'<th>File size :</th>\s*<td>(?P<S>[^<]+)</td>' - FILE_OFFLINE_PATTERN = r'The (requested)? file (could not be found|has been deleted)' + 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'<br/> <br/> <br/> \s+<a href="(?P<url>http://.*?)"' + + DOWNLOAD_LINK_PATTERN = r'<br/> <br/> <br/> \s+<a href="(?P<url>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." + 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) - + file_id = found.group(2) + url = "http://%s.%s/en/" % (found.group(2), found.group(3)) + self.html = self.load(url, decode=True) + found = re.search(self.WAITING_PATTERN, self.html) if found: self.waitAndRetry(int(found.group(1)) * 60) - + self.getFileInfo() - + url, inputs = self.parseHtmlForm('action="http://%s' % file_id) if not url or not inputs: self.parseError("Download link not found") - + # Check for protection if "pass" in inputs: inputs['pass'] = self.getPassword() - - self.download(url, post = inputs) - + + self.download(url, post=inputs) + # Check download self.checkDownloadedFile() - + def checkDownloadedFile(self): check = self.checkDownload({"wait": self.WAITING_PATTERN}) if check == "wait": self.waitAndRetry(int(self.lastcheck.group(1)) * 60) - + def waitAndRetry(self, wait_time): self.setWait(wait_time, True) self.wait() self.retry() - + + getInfo = create_getInfo(OneFichierCom) diff --git a/module/plugins/hoster/PornhostCom.py b/module/plugins/hoster/PornhostCom.py index a4124c4a4..d443c6a0a 100644 --- a/module/plugins/hoster/PornhostCom.py +++ b/module/plugins/hoster/PornhostCom.py @@ -1,76 +1,75 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-
-class PornhostCom(Hoster):
- __name__ = "PornhostCom"
- __type__ = "hoster"
- __pattern__ = r'http://[\w\.]*?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)'
- __version__ = "0.2"
- __description__ = """Pornhost.com Download Hoster"""
- __author_name__ = ("jeix")
- __author_mail__ = ("jeix@hasnomail.de")
-
- def process(self, pyfile):
- self.download_html()
- if not self.file_exists():
- self.offline()
-
- pyfile.name = self.get_file_name()
- self.download(self.get_file_url())
-
-
- ### old interface
- def download_html(self):
- url = self.pyfile.url
- self.html = self.load(url)
-
- def get_file_url(self):
- """ returns the absolute downloadable filepath
- """
- if self.html is None:
- self.download_html()
-
- file_url = re.search(r'download this file</label>.*?<a href="(.*?)"', self.html)
- if not file_url:
- file_url = re.search(r'"(http://dl[0-9]+\.pornhost\.com/files/.*?/.*?/.*?/.*?/.*?/.*?\..*?)"', self.html)
- if not file_url:
- file_url = re.search(r'width: 894px; height: 675px">.*?<img src="(.*?)"', self.html)
- if not file_url:
- file_url = re.search(r'"http://file[0-9]+\.pornhost\.com/[0-9]+/.*?"', self.html) # TODO: fix this one since it doesn't match
-
- file_url = file_url.group(1).strip()
-
- return file_url
-
- def get_file_name(self):
- if self.html is None:
- self.download_html()
-
- name = re.search(r'<title>pornhost\.com - free file hosting with a twist - gallery(.*?)</title>', self.html)
- if not name:
- name = re.search(r'id="url" value="http://www\.pornhost\.com/(.*?)/"', self.html)
- if not name:
- name = re.search(r'<title>pornhost\.com - free file hosting with a twist -(.*?)</title>', self.html)
- if not name:
- name = re.search(r'"http://file[0-9]+\.pornhost\.com/.*?/(.*?)"', self.html)
-
- name = name.group(1).strip() + ".flv"
-
- return name
-
- def file_exists(self):
- """ returns True or False
- """
- if self.html is None:
- self.download_html()
-
- if re.search(r'gallery not found', self.html) is not None \
- or re.search(r'You will be redirected to', self.html) is not None:
- return False
- else:
- return True
-
-
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +from module.plugins.Hoster import Hoster + + +class PornhostCom(Hoster): + __name__ = "PornhostCom" + __type__ = "hoster" + __pattern__ = r'http://[\w\.]*?pornhost\.com/([0-9]+/[0-9]+\.html|[0-9]+)' + __version__ = "0.2" + __description__ = """Pornhost.com Download Hoster""" + __author_name__ = ("jeix") + __author_mail__ = ("jeix@hasnomail.de") + + def process(self, pyfile): + self.download_html() + if not self.file_exists(): + self.offline() + + pyfile.name = self.get_file_name() + self.download(self.get_file_url()) + + ### old interface + def download_html(self): + url = self.pyfile.url + self.html = self.load(url) + + def get_file_url(self): + """ returns the absolute downloadable filepath + """ + if self.html is None: + self.download_html() + + file_url = re.search(r'download this file</label>.*?<a href="(.*?)"', self.html) + if not file_url: + file_url = re.search(r'"(http://dl[0-9]+\.pornhost\.com/files/.*?/.*?/.*?/.*?/.*?/.*?\..*?)"', self.html) + if not file_url: + file_url = re.search(r'width: 894px; height: 675px">.*?<img src="(.*?)"', self.html) + if not file_url: + file_url = re.search(r'"http://file[0-9]+\.pornhost\.com/[0-9]+/.*?"', + self.html) # TODO: fix this one since it doesn't match + + file_url = file_url.group(1).strip() + + return file_url + + def get_file_name(self): + if self.html is None: + self.download_html() + + name = re.search(r'<title>pornhost\.com - free file hosting with a twist - gallery(.*?)</title>', self.html) + if not name: + name = re.search(r'id="url" value="http://www\.pornhost\.com/(.*?)/"', self.html) + if not name: + name = re.search(r'<title>pornhost\.com - free file hosting with a twist -(.*?)</title>', self.html) + if not name: + name = re.search(r'"http://file[0-9]+\.pornhost\.com/.*?/(.*?)"', self.html) + + name = name.group(1).strip() + ".flv" + + return name + + def file_exists(self): + """ returns True or False + """ + if self.html is None: + self.download_html() + + if re.search(r'gallery not found', self.html) is not None \ + or re.search(r'You will be redirected to', self.html) is not None: + return False + else: + return True diff --git a/module/plugins/hoster/PornhubCom.py b/module/plugins/hoster/PornhubCom.py index e1ed612b9..7bbb8d919 100644 --- a/module/plugins/hoster/PornhubCom.py +++ b/module/plugins/hoster/PornhubCom.py @@ -1,83 +1,84 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-
-class PornhubCom(Hoster):
- __name__ = "PornhubCom"
- __type__ = "hoster"
- __pattern__ = r'http://[\w\.]*?pornhub\.com/view_video\.php\?viewkey=[\w\d]+'
- __version__ = "0.5"
- __description__ = """Pornhub.com Download Hoster"""
- __author_name__ = ("jeix")
- __author_mail__ = ("jeix@hasnomail.de")
-
- def process(self, pyfile):
- self.download_html()
- if not self.file_exists():
- self.offline()
-
- pyfile.name = self.get_file_name()
- self.download(self.get_file_url())
-
- def download_html(self):
- url = self.pyfile.url
- self.html = self.load(url)
-
- def get_file_url(self):
- """ returns the absolute downloadable filepath
- """
- if self.html is None:
- self.download_html()
-
- url = "http://www.pornhub.com//gateway.php"
- video_id = self.pyfile.url.split('=')[-1]
- # thanks to jD team for this one v
- post_data = "\x00\x03\x00\x00\x00\x01\x00\x0c\x70\x6c\x61\x79\x65\x72\x43\x6f\x6e\x66\x69\x67\x00\x02\x2f\x31\x00\x00\x00\x44\x0a\x00\x00\x00\x03\x02\x00"
- post_data += chr(len(video_id))
- post_data += video_id
- post_data += "\x02\x00\x02\x2d\x31\x02\x00\x20"
- post_data += "add299463d4410c6d1b1c418868225f7"
-
- content = self.req.load(url, post=str(post_data))
-
- new_content = ""
- for x in content:
- if ord(x) < 32 or ord(x) > 176:
- new_content += '#'
- else:
- new_content += x
-
- content = new_content
-
- file_url = re.search(r'flv_url.*(http.*?)##post_roll', content).group(1)
-
- return file_url
-
- def get_file_name(self):
- if self.html is None:
- self.download_html()
-
- match = re.search(r'<title[^>]+>([^<]+) - ', self.html)
- if match:
- name = match.group(1)
- else:
- matches = re.findall('<h1>(.*?)</h1>', self.html)
- if len(matches) > 1:
- name = matches[1]
- else:
- name = matches[0]
-
- return name + '.flv'
-
- def file_exists(self):
- """ returns True or False
- """
- if self.html is None:
- self.download_html()
-
- if re.search(r'This video is no longer in our database or is in conversion', self.html) is not None:
- return False
- else:
- return True
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +from module.plugins.Hoster import Hoster + + +class PornhubCom(Hoster): + __name__ = "PornhubCom" + __type__ = "hoster" + __pattern__ = r'http://[\w\.]*?pornhub\.com/view_video\.php\?viewkey=[\w\d]+' + __version__ = "0.5" + __description__ = """Pornhub.com Download Hoster""" + __author_name__ = ("jeix") + __author_mail__ = ("jeix@hasnomail.de") + + def process(self, pyfile): + self.download_html() + if not self.file_exists(): + self.offline() + + pyfile.name = self.get_file_name() + self.download(self.get_file_url()) + + def download_html(self): + url = self.pyfile.url + self.html = self.load(url) + + def get_file_url(self): + """ returns the absolute downloadable filepath + """ + if self.html is None: + self.download_html() + + url = "http://www.pornhub.com//gateway.php" + video_id = self.pyfile.url.split('=')[-1] + # thanks to jD team for this one v + post_data = "\x00\x03\x00\x00\x00\x01\x00\x0c\x70\x6c\x61\x79\x65\x72\x43\x6f\x6e\x66\x69\x67\x00\x02\x2f\x31\x00\x00\x00\x44\x0a\x00\x00\x00\x03\x02\x00" + post_data += chr(len(video_id)) + post_data += video_id + post_data += "\x02\x00\x02\x2d\x31\x02\x00\x20" + post_data += "add299463d4410c6d1b1c418868225f7" + + content = self.req.load(url, post=str(post_data)) + + new_content = "" + for x in content: + if ord(x) < 32 or ord(x) > 176: + new_content += '#' + else: + new_content += x + + content = new_content + + file_url = re.search(r'flv_url.*(http.*?)##post_roll', content).group(1) + + return file_url + + def get_file_name(self): + if self.html is None: + self.download_html() + + match = re.search(r'<title[^>]+>([^<]+) - ', self.html) + if match: + name = match.group(1) + else: + matches = re.findall('<h1>(.*?)</h1>', self.html) + if len(matches) > 1: + name = matches[1] + else: + name = matches[0] + + return name + '.flv' + + def file_exists(self): + """ returns True or False + """ + if self.html is None: + self.download_html() + + if re.search(r'This video is no longer in our database or is in conversion', self.html) is not None: + return False + else: + return True diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py index 4058c707a..9a359b9cb 100644 --- a/module/plugins/hoster/Premium4Me.py +++ b/module/plugins/hoster/Premium4Me.py @@ -1,70 +1,70 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from urllib import quote
-from os.path import exists
-from os import remove
-
-from module.plugins.Hoster import Hoster
-from module.utils import fs_encode
-
-
-class Premium4Me(Hoster):
- __name__ = "Premium4Me"
- __version__ = "0.07"
- __type__ = "hoster"
-
- __pattern__ = r"http://premium.to/.*"
- __description__ = """Premium.to hoster plugin"""
- __author_name__ = ("RaNaN", "zoidberg", "stickell")
- __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
-
- def setup(self):
- self.resumeDownload = True
- self.chunkLimit = 1
-
- def process(self, pyfile):
- if not self.account:
- self.logError(_("Please enter your premium.to account or deactivate this plugin"))
- self.fail("No premium.to account provided")
-
- self.logDebug("premium.to: Old URL: %s" % pyfile.url)
-
- tra = self.getTraffic()
-
- #raise timeout to 2min
- self.req.setOption("timeout", 120)
-
- self.download(
- "http://premium.to/api/getfile.php?authcode=%s&link=%s" % (self.account.authcode, quote(pyfile.url, "")),
- disposition=True)
-
- check = self.checkDownload({"nopremium": "No premium account available"})
-
- if check == "nopremium":
- self.retry(60, 300, 'No premium account available')
-
- err = ''
- if self.req.http.code == '420':
- # Custom error code send - fail
- lastDownload = fs_encode(self.lastDownload)
-
- if exists(lastDownload):
- f = open(lastDownload, "rb")
- err = f.read(256).strip()
- f.close()
- remove(lastDownload)
- else:
- err = 'File does not exist'
-
- trb = self.getTraffic()
- self.logInfo("Filesize: %d, Traffic used %d, traffic left %d" % (pyfile.size, tra - trb, trb))
-
- if err: self.fail(err)
-
- def getTraffic(self):
- try:
- traffic = int(self.load("http://premium.to/api/traffic.php?authcode=%s" % self.account.authcode))
- except:
- traffic = 0
- return traffic
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +from urllib import quote +from os.path import exists +from os import remove + +from module.plugins.Hoster import Hoster +from module.utils import fs_encode + + +class Premium4Me(Hoster): + __name__ = "Premium4Me" + __version__ = "0.08" + __type__ = "hoster" + + __pattern__ = r"http://premium.to/.*" + __description__ = """Premium.to hoster plugin""" + __author_name__ = ("RaNaN", "zoidberg", "stickell") + __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") + + def setup(self): + self.resumeDownload = True + self.chunkLimit = 1 + + def process(self, pyfile): + if not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "premium.to") + self.fail("No premium.to account provided") + + self.logDebug("premium.to: Old URL: %s" % pyfile.url) + + tra = self.getTraffic() + + #raise timeout to 2min + self.req.setOption("timeout", 120) + + self.download( + "http://premium.to/api/getfile.php?authcode=%s&link=%s" % (self.account.authcode, quote(pyfile.url, "")), + disposition=True) + + check = self.checkDownload({"nopremium": "No premium account available"}) + + if check == "nopremium": + self.retry(60, 300, 'No premium account available') + + err = '' + if self.req.http.code == '420': + # Custom error code send - fail + lastDownload = fs_encode(self.lastDownload) + + if exists(lastDownload): + f = open(lastDownload, "rb") + err = f.read(256).strip() + f.close() + remove(lastDownload) + else: + err = 'File does not exist' + + trb = self.getTraffic() + self.logInfo("Filesize: %d, Traffic used %d, traffic left %d" % (pyfile.size, tra - trb, trb)) + + if err: self.fail(err) + + def getTraffic(self): + try: + traffic = int(self.load("http://premium.to/api/traffic.php?authcode=%s" % self.account.authcode)) + except: + traffic = 0 + return traffic diff --git a/module/plugins/hoster/PremiumizeMe.py b/module/plugins/hoster/PremiumizeMe.py index 4ae59d198..c5c09857f 100644 --- a/module/plugins/hoster/PremiumizeMe.py +++ b/module/plugins/hoster/PremiumizeMe.py @@ -1,50 +1,55 @@ -from module.plugins.Hoster import Hoster
-
-from module.common.json_layer import json_loads
-
-class PremiumizeMe(Hoster):
- __name__ = "PremiumizeMe"
- __version__ = "0.11"
- __type__ = "hoster"
- __description__ = """Premiumize.Me hoster plugin"""
-
- # Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady create the regex patterns for us using getHosters in our PremiumizeMe hook.
- __pattern__ = None
-
- __author_name__ = ("Florian Franzen")
- __author_mail__ = ("FlorianFranzen@gmail.com")
-
- def process(self, pyfile):
- # Check account
- if not self.account or not self.account.canUse():
- self.logError(_("Please enter a valid premiumize.me account or deactivate this plugin"))
- self.fail("No valid premiumize.me account provided")
-
- # In some cases hostsers do not supply us with a filename at download, so we are going to set a fall back filename (e.g. for freakshare or xfileshare)
- self.pyfile.name = self.pyfile.name.split('/').pop() # Remove everthing before last slash
-
- # Correction for automatic assigned filename: Removing html at end if needed
- suffix_to_remove = ["html", "htm", "php", "php3", "asp", "shtm", "shtml", "cfml", "cfm"]
- temp = self.pyfile.name.split('.')
- if temp.pop() in suffix_to_remove:
- self.pyfile.name = ".".join(temp)
-
- # Get account data
- (user, data) = self.account.selectAccount()
-
- # Get rewritten link using the premiumize.me api v1 (see https://secure.premiumize.me/?show=api)
- answer = self.load("https://api.premiumize.me/pm-api/v1.php?method=directdownloadlink¶ms[login]=%s¶ms[pass]=%s¶ms[link]=%s" % (user, data['password'], self.pyfile.url))
- data = json_loads(answer)
-
- # Check status and decide what to do
- status = data['status']
- if status == 200:
- self.download(data['result']['location'], disposition=True)
- elif status == 400:
- self.fail("Invalid link")
- elif status == 404:
- self.offline()
- elif status >= 500:
- self.tempOffline()
- else:
- self.fail(data['statusmessage'])
+from module.plugins.Hoster import Hoster + +from module.common.json_layer import json_loads + + +class PremiumizeMe(Hoster): + __name__ = "PremiumizeMe" + __version__ = "0.12" + __type__ = "hoster" + __description__ = """Premiumize.Me hoster plugin""" + + # Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady + # create the regex patterns for us using getHosters in our PremiumizeMe hook. + __pattern__ = None + + __author_name__ = ("Florian Franzen") + __author_mail__ = ("FlorianFranzen@gmail.com") + + def process(self, pyfile): + # Check account + if not self.account or not self.account.canUse(): + self.logError(_("Please enter your %s account or deactivate this plugin") % "premiumize.me") + self.fail("No valid premiumize.me account provided") + + # In some cases hostsers do not supply us with a filename at download, so we + # are going to set a fall back filename (e.g. for freakshare or xfileshare) + self.pyfile.name = self.pyfile.name.split('/').pop() # Remove everthing before last slash + + # Correction for automatic assigned filename: Removing html at end if needed + suffix_to_remove = ["html", "htm", "php", "php3", "asp", "shtm", "shtml", "cfml", "cfm"] + temp = self.pyfile.name.split('.') + if temp.pop() in suffix_to_remove: + self.pyfile.name = ".".join(temp) + + # Get account data + (user, data) = self.account.selectAccount() + + # Get rewritten link using the premiumize.me api v1 (see https://secure.premiumize.me/?show=api) + answer = self.load( + "https://api.premiumize.me/pm-api/v1.php?method=directdownloadlink¶ms[login]=%s¶ms[pass]=%s¶ms[link]=%s" % ( + user, data['password'], self.pyfile.url)) + data = json_loads(answer) + + # Check status and decide what to do + status = data['status'] + if status == 200: + self.download(data['result']['location'], disposition=True) + elif status == 400: + self.fail("Invalid link") + elif status == 404: + self.offline() + elif status >= 500: + self.tempOffline() + else: + self.fail(data['statusmessage']) diff --git a/module/plugins/hoster/PutlockerCom.py b/module/plugins/hoster/PutlockerCom.py index b2016472d..0f62ea96d 100644 --- a/module/plugins/hoster/PutlockerCom.py +++ b/module/plugins/hoster/PutlockerCom.py @@ -28,7 +28,7 @@ class PutlockerCom(SimpleHoster): __name__ = "PutlockerCom" __type__ = "hoster" __pattern__ = r'http://(www\.)?putlocker\.com/(file|embed)/[A-Z0-9]+' - __version__ = "0.25" + __version__ = "0.27" __description__ = """Putlocker.Com""" __author_name__ = ("jeix", "stickell") __author_mail__ = ("l.stickell@yahoo.it") @@ -37,6 +37,9 @@ class PutlockerCom(SimpleHoster): FILE_INFO_PATTERN = r'site-content">\s*<h1>(?P<N>.+)<strong>\( (?P<S>[^)]+) \)</strong></h1>' def handleFree(self): + self.multiDL = True + self.chunkLimit = -1 + self.resumeDownload = True self.pyfile.url = re.sub(r'http://putlocker\.com', r'http://www.putlocker.com', self.pyfile.url) self.html = self.load(self.pyfile.url, decode=True) diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py index 4932c4702..a781d7eff 100644 --- a/module/plugins/hoster/QuickshareCz.py +++ b/module/plugins/hoster/QuickshareCz.py @@ -17,9 +17,11 @@ """ import re -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from pycurl import FOLLOWLOCATION +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + class QuickshareCz(SimpleHoster): __name__ = "QuickshareCz" __type__ = "hoster" @@ -33,14 +35,14 @@ class QuickshareCz(SimpleHoster): FILE_OFFLINE_PATTERN = r'<script type="text/javascript">location.href=\'/chyba\';</script>' def process(self, pyfile): - self.html = self.load(pyfile.url, decode = True) + self.html = self.load(pyfile.url, decode=True) self.getFileInfo() - + # parse js variables - self.jsvars = dict((x, y.strip("'")) for x,y in re.findall(r"var (\w+) = ([0-9.]+|'[^']*')", self.html)) - self.logDebug(self.jsvars) + self.jsvars = dict((x, y.strip("'")) for x, y in re.findall(r"var (\w+) = ([0-9.]+|'[^']*')", self.html)) + self.logDebug(self.jsvars) pyfile.name = self.jsvars['ID3'] - + # determine download type - free or premium if self.premium: if 'UU_prihlasen' in self.jsvars: @@ -51,32 +53,33 @@ class QuickshareCz(SimpleHoster): elif float(self.jsvars['UU_kredit']) < float(self.jsvars['kredit_odecet']): self.logWarning('Not enough credit left') self.premium = False - + if self.premium: self.handlePremium() else: self.handleFree() - + check = self.checkDownload({"err": re.compile(r"\AChyba!")}, max_size=100) if check == "err": self.fail("File not found or plugin defect") - - def handleFree(self): + + def handleFree(self): # get download url download_url = '%s/download.php' % self.jsvars['server'] data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ('ID1', 'ID2', 'ID3', 'ID4')) self.logDebug("FREE URL1:" + download_url, data) - - self.req.http.c.setopt(FOLLOWLOCATION, 0) + + self.req.http.c.setopt(FOLLOWLOCATION, 0) self.load(download_url, post=data) - self.header = self.req.http.header + self.header = self.req.http.header self.req.http.c.setopt(FOLLOWLOCATION, 1) - + found = re.search("Location\s*:\s*(.*)", self.header, re.I) - if not found: self.fail('File not found') - download_url = found.group(1) + if not found: + self.fail('File not found') + download_url = found.group(1) self.logDebug("FREE URL2:" + download_url) - + # check errors found = re.search(r'/chyba/(\d+)', download_url) if found: @@ -88,12 +91,13 @@ class QuickshareCz(SimpleHoster): self.fail('Error %d' % found.group(1)) # download file - self.download(download_url) - + self.download(download_url) + def handlePremium(self): download_url = '%s/download_premium.php' % self.jsvars['server'] data = dict((x, self.jsvars[x]) for x in self.jsvars if x in ('ID1', 'ID2', 'ID4', 'ID5')) self.logDebug("PREMIUM URL:" + download_url, data) self.download(download_url, get=data) + getInfo = create_getInfo(QuickshareCz) diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 3c4611446..543d73966 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -29,13 +29,14 @@ class RapidgatorNet(SimpleHoster): __name__ = "RapidgatorNet" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?(rapidgator.net)/file/(\w+)" - __version__ = "0.18" + __version__ = "0.19" __description__ = """rapidgator.net""" __author_name__ = ("zoidberg", "chrox", "stickell") API_URL = 'http://rapidgator.net/api/file' - FILE_INFO_PATTERN = r'Downloading:(\s*<[^>]*>)*\s*(?P<N>.*?)(\s*<[^>]*>)*\s*File size:\s*<strong>(?P<S>.*?)</strong>' + FILE_NAME_PATTERN = r'Downloading:(?:\s*<[^>]*>)*\s*(?P<N>.*?)(?:\s*<[^>]*>)' + FILE_SIZE_PATTERN = r'File size:\s*<strong>(?P<S>.*?)</strong>' FILE_OFFLINE_PATTERN = r'<title>File not found</title>' JSVARS_PATTERN = r"\s+var\s*(startTimerUrl|getDownloadUrl|captchaUrl|fid|secs)\s*=\s*'?(.*?)'?;" diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py index 8b31dd42c..9d40b867f 100644 --- a/module/plugins/hoster/RapidshareCom.py +++ b/module/plugins/hoster/RapidshareCom.py @@ -1,4 +1,3 @@ - #!/usr/bin/env python # -*- coding: utf-8 -*- @@ -14,6 +13,7 @@ import re from module.network.RequestFactory import getURL from module.plugins.Hoster import Hoster + def getInfo(urls): ids = "" names = "" @@ -23,26 +23,29 @@ def getInfo(urls): for url in urls: r = p.search(url) if r.group("name"): - ids+= ","+r.group("id") - names+= ","+r.group("name") + ids += "," + r.group("id") + names += "," + r.group("name") elif r.group("name_new"): - ids+= ","+r.group("id_new") - names+= ","+r.group("name_new") - + ids += "," + r.group("id_new") + names += "," + r.group("name_new") + url = "http://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=checkfiles&files=%s&filenames=%s" % (ids[1:], names[1:]) - + api = getURL(url) result = [] i = 0 for res in api.split(): tmp = res.split(",") - if tmp[4] in ("0", "4", "5"): status = 1 - elif tmp[4] == "1": status = 2 - else: status = 3 - - result.append( (tmp[1], tmp[2], status, urls[i]) ) + if tmp[4] in ("0", "4", "5"): + status = 1 + elif tmp[4] == "1": + status = 2 + else: + status = 3 + + result.append((tmp[1], tmp[2], status, urls[i])) i += 1 - + yield result @@ -50,9 +53,11 @@ class RapidshareCom(Hoster): __name__ = "RapidshareCom" __type__ = "hoster" __pattern__ = r"https?://[\w\.]*?rapidshare.com/(?:files/(?P<id>\d*?)/(?P<name>[^?]+)|#!download\|(?:\w+)\|(?P<id_new>\d+)\|(?P<name_new>[^|]+))" - __version__ = "1.38" + __version__ = "1.39" __description__ = """Rapidshare.com Download Hoster""" - __config__ = [["server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None"]] + __config__ = [["server", + "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", + "Preferred Server", "None"]] __author_name__ = ("spoob", "RaNaN", "mkaay") __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de") @@ -65,14 +70,14 @@ class RapidshareCom(Hoster): self.id = None self.name = None - - self.chunkLimit = -1 if self.premium else 1 + + self.chunkLimit = -1 if self.premium else 1 self.multiDL = self.resumeDownload = self.premium def process(self, pyfile): - self.url = self.pyfile.url + self.url = self.pyfile.url self.prepare() - + def prepare(self): m = re.search(self.__pattern__, self.url) @@ -93,12 +98,12 @@ class RapidshareCom(Hoster): self.handleFree() elif self.api_data["status"] == "2": - self.log.info(_("Rapidshare: Traffic Share (direct download)")) + self.logInfo(_("Rapidshare: Traffic Share (direct download)")) self.pyfile.name = self.get_file_name() - self.download(self.pyfile.url, get={"directstart":1}) - - elif self.api_data["status"] in ("0","4","5"): + self.download(self.pyfile.url, get={"directstart": 1}) + + elif self.api_data["status"] in ("0", "4", "5"): self.offline() elif self.api_data["status"] == "3": self.tempOffline() @@ -113,27 +118,26 @@ class RapidshareCom(Hoster): #tmp = "#!download|%(server)s|%(id)s|%(name)s|%(size)s" download = "http://%(host)s/cgi-bin/rsapi.cgi?sub=download&editparentlocation=0&bin=1&fileid=%(id)s&filename=%(name)s&dlauth=%(auth)s" % self.dl_dict - self.log.debug("RS API Request: %s" % download) + self.logDebug("RS API Request: %s" % download) self.download(download, ref=False) - check = self.checkDownload({"ip" : "You need RapidPro to download more files from your IP address", - "auth" : "Download auth invalid"}) + check = self.checkDownload({"ip": "You need RapidPro to download more files from your IP address", + "auth": "Download auth invalid"}) if check == "ip": self.setWait(60) - self.log.info(_("Already downloading from this ip address, waiting 60 seconds")) + self.logInfo(_("Already downloading from this ip address, waiting 60 seconds")) self.wait() self.handleFree() elif check == "auth": - self.log.info(_("Invalid Auth Code, download will be restarted")) + self.logInfo(_("Invalid Auth Code, download will be restarted")) self.offset += 5 self.handleFree() def handlePremium(self): info = self.account.getAccountInfo(self.user, True) - self.log.debug("%s: Use Premium Account" % self.__name__) + self.logDebug("%s: Use Premium Account" % self.__name__) url = self.api_data["mirror"] - self.download(url, get={"directstart":1}) - + self.download(url, get={"directstart": 1}) def download_api_data(self, force=False): """ @@ -144,20 +148,21 @@ class RapidshareCom(Hoster): api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi" api_param_file = {"sub": "checkfiles", "incmd5": "1", "files": self.id, "filenames": self.name} src = self.load(api_url_base, cookies=False, get=api_param_file).strip() - self.log.debug("RS INFO API: %s" % src) + self.logDebug("RS INFO API: %s" % src) if src.startswith("ERROR"): return fields = src.split(",") - """ - status codes: - 0=File not found - 1=File OK (Anonymous downloading) - 3=Server down - 4=File marked as illegal - 5=Anonymous file locked, because it has more than 10 downloads already - 50+n=File OK (TrafficShare direct download type "n" without any logging.) - 100+n=File OK (TrafficShare direct download type "n" with logging. Read our privacy policy to see what is logged.) - """ + + # status codes: + # 0=File not found + # 1=File OK (Anonymous downloading) + # 3=Server down + # 4=File marked as illegal + # 5=Anonymous file locked, because it has more than 10 downloads already + # 50+n=File OK (TrafficShare direct download type "n" without any logging.) + # 100+n=File OK (TrafficShare direct download type "n" with logging. + # Read our privacy policy to see what is logged.) + self.api_data = {"fileid": fields[0], "filename": fields[1], "size": int(fields[2]), "serverid": fields[3], "status": fields[4], "shorthost": fields[5], "checksum": fields[6].strip().lower()} @@ -166,7 +171,8 @@ class RapidshareCom(Hoster): elif int(self.api_data["status"]) > 50: self.api_data["status"] = str(int(self.api_data["status"]) - 50) - self.api_data["mirror"] = "http://rs%(serverid)s%(shorthost)s.rapidshare.com/files/%(fileid)s/%(filename)s" % self.api_data + self.api_data["mirror"] = \ + "http://rs%(serverid)s%(shorthost)s.rapidshare.com/files/%(fileid)s/%(filename)s" % self.api_data def freeWait(self): """downloads html with the important information @@ -176,21 +182,23 @@ class RapidshareCom(Hoster): id = self.id name = self.name - prepare = "https://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&fileid=%(id)s&filename=%(name)s&try=1&cbf=RSAPIDispatcher&cbid=1" % {"name": name, "id" : id} + prepare = "https://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&fileid=%(id)s&filename=%(name)s&try=1&cbf=RSAPIDispatcher&cbid=1" % { + "name": name, "id": id} - self.log.debug("RS API Request: %s" % prepare) + self.logDebug("RS API Request: %s" % prepare) result = self.load(prepare, ref=False) - self.log.debug("RS API Result: %s" % result) + self.logDebug("RS API Result: %s" % result) between_wait = re.search("You need to wait (\d+) seconds", result) if "You need RapidPro to download more files from your IP address" in result: self.setWait(60) - self.log.info(_("Already downloading from this ip address, waiting 60 seconds")) + self.logInfo(_("Already downloading from this ip address, waiting 60 seconds")) self.wait() - elif "Too many users downloading from this server right now" in result or "All free download slots are full" in result: + elif "Too many users downloading from this server right now" in result or \ + "All free download slots are full" in result: self.setWait(120) - self.log.info(_("RapidShareCom: No free slots")) + self.logInfo(_("RapidShareCom: No free slots")) self.wait() elif "This file is too big to download it for free" in result: self.fail(_("You need a premium account for this file")) @@ -207,19 +215,17 @@ class RapidshareCom(Hoster): data = info.split(",") dl_dict = {"id": id, - "name": name, - "host": data[0], - "auth": data[1], - "server": self.api_data["serverid"], - "size": self.api_data["size"] - } - self.setWait(int(data[2])+2+self.offset) + "name": name, + "host": data[0], + "auth": data[1], + "server": self.api_data["serverid"], + "size": self.api_data["size"]} + self.setWait(int(data[2]) + 2 + self.offset) self.wait() return dl_dict - def get_file_name(self): if self.api_data["filename"]: return self.api_data["filename"] - return self.url.split("/")[-1]
\ No newline at end of file + return self.url.split("/")[-1] diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py index a0f5930b5..1ede51953 100644 --- a/module/plugins/hoster/RarefileNet.py +++ b/module/plugins/hoster/RarefileNet.py @@ -27,8 +27,9 @@ class RarefileNet(XFileSharingPro): captcha_div = re.search(r'<b>Enter code.*?<div.*?>(.*?)</div>', self.html, re.S).group(1) self.logDebug(captcha_div) numerals = re.findall('<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div)) - inputs['code'] = "".join([a[1] for a in sorted(numerals, key = lambda num: int(num[0]))]) + inputs['code'] = "".join([a[1] for a in sorted(numerals, key=lambda num: int(num[0]))]) self.logDebug("CAPTCHA", inputs['code'], numerals) return 3 + getInfo = create_getInfo(RarefileNet) diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index ff4843afd..fd91b89b7 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -1,88 +1,90 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from time import time
-from urllib import quote, unquote
-from random import randrange
-
-from module.utils import parseFileSize, remove_chars
-from module.common.json_layer import json_loads
-from module.plugins.Hoster import Hoster
-
-class RealdebridCom(Hoster):
- __name__ = "RealdebridCom"
- __version__ = "0.49"
- __type__ = "hoster"
-
- __pattern__ = r"https?://.*real-debrid\..*"
- __description__ = """Real-Debrid.com hoster plugin"""
- __author_name__ = ("Devirex, Hazzard")
- __author_mail__ = ("naibaf_11@yahoo.de")
-
- def getFilename(self, url):
- try:
- name = unquote(url.rsplit("/", 1)[1])
- except IndexError:
- name = "Unknown_Filename..."
- if not name or name.endswith(".."): #incomplete filename, append random stuff
- name += "%s.tmp" % randrange(100,999)
- return name
-
- def init(self):
- self.tries = 0
- self.chunkLimit = 3
- self.resumeDownload = True
-
-
- def process(self, pyfile):
- if not self.account:
- self.logError(_("Please enter your Real-debrid account or deactivate this plugin"))
- self.fail("No Real-debrid account provided")
-
- self.log.debug("Real-Debrid: Old URL: %s" % pyfile.url)
- if re.match(self.__pattern__, pyfile.url):
- new_url = pyfile.url
- else:
- password = self.getPassword().splitlines()
- if not password: password = ""
- else: password = password[0]
-
- url = "http://real-debrid.com/ajax/unrestrict.php?lang=en&link=%s&password=%s&time=%s" % (quote(pyfile.url, ""), password, int(time()*1000))
- page = self.load(url)
- data = json_loads(page)
-
- self.logDebug("Returned Data: %s" % data)
-
- if data["error"] != 0:
- if data["message"] == "Your file is unavailable on the hoster.":
- self.offline()
- else:
- self.logWarning(data["message"])
- self.tempOffline()
- else:
- if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data["file_name"]:
- self.pyfile.name = data["file_name"]
- self.pyfile.size = parseFileSize(data["file_size"])
- new_url = data['generated_links'][0][-1]
-
- if self.getConfig("https"):
- new_url = new_url.replace("http://", "https://")
- else:
- new_url = new_url.replace("https://", "http://")
-
- self.log.debug("Real-Debrid: New URL: %s" % new_url)
-
- if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'):
- #only use when name wasnt 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</title>"})
-
- if check == "error":
- #usual this download can safely be retried
- self.retry(reason="An error occured while generating link.", wait_time=60)
-
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +from time import time +from urllib import quote, unquote +from random import randrange + +from module.utils import parseFileSize +from module.common.json_layer import json_loads +from module.plugins.Hoster import Hoster + + +class RealdebridCom(Hoster): + __name__ = "RealdebridCom" + __version__ = "0.51" + __type__ = "hoster" + + __pattern__ = r"https?://.*real-debrid\..*" + __description__ = """Real-Debrid.com hoster plugin""" + __author_name__ = ("Devirex, Hazzard") + __author_mail__ = ("naibaf_11@yahoo.de") + + def getFilename(self, url): + try: + name = unquote(url.rsplit("/", 1)[1]) + except IndexError: + name = "Unknown_Filename..." + if not name or name.endswith(".."): # incomplete filename, append random stuff + name += "%s.tmp" % randrange(100, 999) + return name + + def init(self): + self.tries = 0 + self.chunkLimit = 3 + self.resumeDownload = True + + def process(self, pyfile): + if not self.account: + self.logError(_("Please enter your %s account or deactivate this plugin") % "Real-debrid") + self.fail("No Real-debrid account provided") + + self.logDebug("Real-Debrid: Old URL: %s" % pyfile.url) + if re.match(self.__pattern__, pyfile.url): + new_url = pyfile.url + else: + password = self.getPassword().splitlines() + if not password: + password = "" + else: + password = password[0] + + url = "http://real-debrid.com/ajax/unrestrict.php?lang=en&link=%s&password=%s&time=%s" % ( + quote(pyfile.url, ""), password, int(time() * 1000)) + page = self.load(url) + data = json_loads(page) + + self.logDebug("Returned Data: %s" % data) + + if data["error"] != 0: + if data["message"] == "Your file is unavailable on the hoster.": + self.offline() + else: + self.logWarning(data["message"]) + self.tempOffline() + else: + if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data["file_name"]: + self.pyfile.name = data["file_name"] + self.pyfile.size = parseFileSize(data["file_size"]) + new_url = data['generated_links'][0][-1] + + if self.getConfig("https"): + new_url = new_url.replace("http://", "https://") + else: + new_url = new_url.replace("https://", "http://") + + self.logDebug("Real-Debrid: New URL: %s" % new_url) + + if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'): + #only use when name wasnt 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</title>"}) + + if check == "error": + #usual this download can safely be retried + self.retry(reason="An error occured while generating link.", wait_time=60) diff --git a/module/plugins/hoster/RedtubeCom.py b/module/plugins/hoster/RedtubeCom.py index 9ffafd905..caf33eeac 100644 --- a/module/plugins/hoster/RedtubeCom.py +++ b/module/plugins/hoster/RedtubeCom.py @@ -1,56 +1,56 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-from module.plugins.Hoster import Hoster
-from module.unescape import unescape
-
-class RedtubeCom(Hoster):
- __name__ = "RedtubeCom"
- __type__ = "hoster"
- __pattern__ = r'http://[\w\.]*?redtube\.com/\d+'
- __version__ = "0.2"
- __description__ = """Redtube.com Download Hoster"""
- __author_name__ = ("jeix")
- __author_mail__ = ("jeix@hasnomail.de")
-
- def process(self, pyfile):
- self.download_html()
- if not self.file_exists():
- self.offline()
-
- pyfile.name = self.get_file_name()
- self.download(self.get_file_url())
-
- def download_html(self):
- url = self.pyfile.url
- self.html = self.load(url)
-
- def get_file_url(self):
- """ returns the absolute downloadable filepath
- """
- if self.html is None:
- self.download_html()
-
- file_url = unescape(re.search(r'hashlink=(http.*?)"', self.html).group(1))
-
- return file_url
-
- def get_file_name(self):
- if self.html is None:
- self.download_html()
-
- name = re.search('<title>(.*?)- RedTube - Free Porn Videos</title>', self.html).group(1).strip() + ".flv"
- return name
-
- def file_exists(self):
- """ returns True or False
- """
- if self.html is None:
- self.download_html()
-
- if re.search(r'This video has been removed.', self.html) is not None:
- return False
- else:
- return True
-
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +from module.plugins.Hoster import Hoster +from module.unescape import unescape + + +class RedtubeCom(Hoster): + __name__ = "RedtubeCom" + __type__ = "hoster" + __pattern__ = r'http://[\w\.]*?redtube\.com/\d+' + __version__ = "0.2" + __description__ = """Redtube.com Download Hoster""" + __author_name__ = ("jeix") + __author_mail__ = ("jeix@hasnomail.de") + + def process(self, pyfile): + self.download_html() + if not self.file_exists(): + self.offline() + + pyfile.name = self.get_file_name() + self.download(self.get_file_url()) + + def download_html(self): + url = self.pyfile.url + self.html = self.load(url) + + def get_file_url(self): + """ returns the absolute downloadable filepath + """ + if self.html is None: + self.download_html() + + file_url = unescape(re.search(r'hashlink=(http.*?)"', self.html).group(1)) + + return file_url + + def get_file_name(self): + if self.html is None: + self.download_html() + + name = re.search('<title>(.*?)- RedTube - Free Porn Videos</title>', self.html).group(1).strip() + ".flv" + return name + + def file_exists(self): + """ returns True or False + """ + if self.html is None: + self.download_html() + + if re.search(r'This video has been removed.', self.html) is not None: + return False + else: + return True diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py index 141dcb8c8..bb6110415 100644 --- a/module/plugins/hoster/RehostTo.py +++ b/module/plugins/hoster/RehostTo.py @@ -4,9 +4,10 @@ from urllib import quote, unquote from module.plugins.Hoster import Hoster + class RehostTo(Hoster): __name__ = "RehostTo" - __version__ = "0.11" + __version__ = "0.13" __type__ = "hoster" __pattern__ = r"https?://.*rehost.to\..*" __description__ = """rehost.com hoster plugin""" @@ -22,16 +23,16 @@ class RehostTo(Hoster): def process(self, pyfile): if not self.account: - self.log.error(_("Please enter your rehost.to account or deactivate this plugin")) + self.logError(_("Please enter your %s account or deactivate this plugin") % "rehost.to") self.fail("No rehost.to account provided") data = self.account.getAccountInfo(self.user) long_ses = data["long_ses"] - self.log.debug("Rehost.to: Old URL: %s" % pyfile.url) + self.logDebug("Rehost.to: Old URL: %s" % pyfile.url) new_url = "http://rehost.to/process_download.php?user=cookie&pass=%s&dl=%s" % (long_ses, quote(pyfile.url, "")) #raise timeout to 2min self.req.setOption("timeout", 120) - self.download(new_url, disposition=True)
\ No newline at end of file + self.download(new_url, disposition=True) diff --git a/module/plugins/hoster/ReloadCc.py b/module/plugins/hoster/ReloadCc.py index 7dc6d9bb6..2295c792a 100644 --- a/module/plugins/hoster/ReloadCc.py +++ b/module/plugins/hoster/ReloadCc.py @@ -1,16 +1,18 @@ -from module.plugins.Hoster import Hoster +from module.plugins.Hoster import Hoster from module.common.json_layer import json_loads from module.network.HTTPRequest import BadHeader + class ReloadCc(Hoster): __name__ = "ReloadCc" - __version__ = "0.4" + __version__ = "0.5" __type__ = "hoster" __description__ = """Reload.Cc hoster plugin""" - # Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady create the regex patterns for us using getHosters in our ReloadCc hook. + # Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady + # create the regex patterns for us using getHosters in our ReloadCc hook. __pattern__ = None __author_name__ = ("Reload Team") @@ -19,11 +21,12 @@ class ReloadCc(Hoster): def process(self, pyfile): # Check account if not self.account or not self.account.canUse(): - self.logError("Please enter a valid reload.cc account or deactivate this plugin") + self.logError(_("Please enter your %s account or deactivate this plugin") % "reload.cc") self.fail("No valid reload.cc account provided") - # In some cases hostsers do not supply us with a filename at download, so we are going to set a fall back filename (e.g. for freakshare or xfileshare) - self.pyfile.name = self.pyfile.name.split('/').pop() # Remove everthing before last slash + # In some cases hostsers do not supply us with a filename at download, so we + # are going to set a fall back filename (e.g. for freakshare or xfileshare) + self.pyfile.name = self.pyfile.name.split('/').pop() # Remove everthing before last slash # Correction for automatic assigned filename: Removing html at end if needed suffix_to_remove = ["html", "htm", "php", "php3", "asp", "shtm", "shtml", "cfml", "cfm"] @@ -62,11 +65,15 @@ class ReloadCc(Hoster): # Wait for 6 hours and retry up to 4 times => one day self.retry(max_retries=4, wait_time=(3600 * 6), reason="Limited hoster traffic limit exceeded") elif e.code == 429: - self.retry(max_retries=5, wait_time=120, reason="Too many concurrent connections") # Too many connections, wait 2 minutes and try again + # Too many connections, wait 2 minutes and try again + self.retry(max_retries=5, wait_time=120, reason="Too many concurrent connections") elif e.code == 503: - self.retry(wait_time=600, reason="Reload.cc is currently in maintenance mode! Please check again later.") # Retry in 10 minutes + # Retry in 10 minutes + self.retry(wait_time=600, + reason="Reload.cc is currently in maintenance mode! Please check again later.") else: - self.fail("Internal error within Reload.cc. Please contact the Reload.cc support for further information.") + self.fail( + "Internal error within Reload.cc. Please contact the Reload.cc support for further information.") return data = json_loads(answer) @@ -95,9 +102,12 @@ class ReloadCc(Hoster): elif e.code == 417: self.fail("Password required for file access") elif e.code == 429: - self.retry(max_retries=5, wait_time=120, reason="Too many concurrent connections") # Too many connections, wait 2 minutes and try again + # Too many connections, wait 2 minutes and try again + self.retry(max_retries=5, wait_time=120, reason="Too many concurrent connections") else: - self.fail("Internal error within Reload.cc. Please contact the Reload.cc support for further information.") + self.fail( + "Internal error within Reload.cc. Please contact the Reload.cc support for further information." + ) return else: self.fail("Internal error within Reload.cc. Please contact the Reload.cc support for further information.") diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py index 7bfe4e8fe..eff9a6140 100644 --- a/module/plugins/hoster/RyushareCom.py +++ b/module/plugins/hoster/RyushareCom.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo import re +from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class RyushareCom(XFileSharingPro): __name__ = "RyushareCom" @@ -27,10 +28,10 @@ class RyushareCom(XFileSharingPro): def getDownloadLink(self): self.html = self.load(self.pyfile.url) action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")}) - if inputs.has_key('method_premium'): + if 'method_premium' in inputs: del inputs['method_premium'] - self.html = self.load(self.pyfile.url, post = inputs) + self.html = self.load(self.pyfile.url, post=inputs) action, inputs = self.parseHtmlForm('F1') for i in xrange(10): @@ -45,11 +46,12 @@ class RyushareCom(XFileSharingPro): self.setWait(waittime) self.wait() - self.html = self.load(self.pyfile.url, post = inputs) + self.html = self.load(self.pyfile.url, post=inputs) if 'Click here to download' in self.html: m = re.search(self.DIRECT_LINK_PATTERN, self.html) return m.group(1) self.parseError('No direct link within 10 retries') + getInfo = create_getInfo(RyushareCom) diff --git a/module/plugins/hoster/SecureUploadEu.py b/module/plugins/hoster/SecureUploadEu.py index b9a900d96..dc220c508 100644 --- a/module/plugins/hoster/SecureUploadEu.py +++ b/module/plugins/hoster/SecureUploadEu.py @@ -15,4 +15,5 @@ class SecureUploadEu(XFileSharingPro): FILE_INFO_PATTERN = '<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>' FILE_OFFLINE_PATTERN = 'The file was removed|File Not Found' + getInfo = create_getInfo(SecureUploadEu) diff --git a/module/plugins/hoster/SendmywayCom.py b/module/plugins/hoster/SendmywayCom.py index fcbac850a..9b4fc14bc 100644 --- a/module/plugins/hoster/SendmywayCom.py +++ b/module/plugins/hoster/SendmywayCom.py @@ -15,4 +15,5 @@ class SendmywayCom(XFileSharingPro): FILE_SIZE_PATTERN = r'<small>\((?P<S>\d+) bytes\)</small>' HOSTER_NAME = "sendmyway.com" + getInfo = create_getInfo(SendmywayCom) diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py index 22abaff56..729ee17bc 100644 --- a/module/plugins/hoster/SendspaceCom.py +++ b/module/plugins/hoster/SendspaceCom.py @@ -19,6 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class SendspaceCom(SimpleHoster): __name__ = "SendspaceCom" __type__ = "hoster" @@ -33,35 +34,37 @@ class SendspaceCom(SimpleHoster): FILE_OFFLINE_PATTERN = r'<div class="msg error" style="cursor: default">Sorry, the file you requested is not available.</div>' CAPTCHA_PATTERN = r'<td><img src="(/captchas/captcha.php?captcha=([^"]+))"></td>' USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha.php?user=([^"]+))"></td>' - + def handleFree(self): params = {} for i in range(3): found = re.search(self.DOWNLOAD_URL_PATTERN, self.html) if found: - if params.has_key('captcha_hash'): self.correctCaptcha() + if 'captcha_hash' in params: + self.correctCaptcha() download_url = found.group(1) break found = re.search(self.CAPTCHA_PATTERN, self.html) if found: - if params.has_key('captcha_hash'): self.invalidCaptcha() + if 'captcha_hash' in params: + self.invalidCaptcha() captcha_url1 = "http://www.sendspace.com/" + found.group(1) found = re.search(self.USER_CAPTCHA_PATTERN, self.html) captcha_url2 = "http://www.sendspace.com/" + found.group(1) - params = {'captcha_hash' : found.group(2), + params = {'captcha_hash': found.group(2), 'captcha_submit': 'Verify', - 'captcha_answer': self.decryptCaptcha(captcha_url1) + " " + self.decryptCaptcha(captcha_url2) - } + 'captcha_answer': self.decryptCaptcha(captcha_url1) + " " + self.decryptCaptcha(captcha_url2)} else: params = {'download': "Regular Download"} self.logDebug(params) - self.html = self.load(self.pyfile.url, post = params) + self.html = self.load(self.pyfile.url, post=params) else: self.fail("Download link not found") self.logDebug("Download URL: %s" % download_url) self.download(download_url) -create_getInfo(SendspaceCom)
\ No newline at end of file + +create_getInfo(SendspaceCom) diff --git a/module/plugins/hoster/Share4webCom.py b/module/plugins/hoster/Share4webCom.py index ef9c2acf8..ead808024 100644 --- a/module/plugins/hoster/Share4webCom.py +++ b/module/plugins/hoster/Share4webCom.py @@ -3,6 +3,7 @@ from module.plugins.hoster.UnibytesCom import UnibytesCom from module.plugins.internal.SimpleHoster import create_getInfo + class Share4webCom(UnibytesCom): __name__ = "Share4webCom" __type__ = "hoster" @@ -10,7 +11,8 @@ class Share4webCom(UnibytesCom): __version__ = "0.1" __description__ = """Share4web.com""" __author_name__ = ("zoidberg") - + DOMAIN = 'http://www.share4web.com' -getInfo = create_getInfo(UnibytesCom)
\ No newline at end of file + +getInfo = create_getInfo(UnibytesCom) diff --git a/module/plugins/hoster/Share76Com.py b/module/plugins/hoster/Share76Com.py index db850cb73..aaa8cd950 100644 --- a/module/plugins/hoster/Share76Com.py +++ b/module/plugins/hoster/Share76Com.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class Share76Com(XFileSharingPro): __name__ = "Share76Com" __type__ = "hoster" @@ -16,4 +17,5 @@ class Share76Com(XFileSharingPro): self.resumeDownload = self.multiDL = self.premium self.chunkLimit = 1 + getInfo = create_getInfo(Share76Com) diff --git a/module/plugins/hoster/ShareFilesCo.py b/module/plugins/hoster/ShareFilesCo.py index ee44b0a1f..245e20ea6 100644 --- a/module/plugins/hoster/ShareFilesCo.py +++ b/module/plugins/hoster/ShareFilesCo.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo import re +from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + + class ShareFilesCo(XFileSharingPro): __name__ = "ShareFilesCo" __type__ = "hoster" @@ -17,8 +19,10 @@ class ShareFilesCo(XFileSharingPro): link = link.strip() if link.startswith('http://adf.ly'): link = re.sub('http://adf.ly/\d+/', '', link) - if self.captcha: self.correctCaptcha() + if self.captcha: + self.correctCaptcha() self.logDebug('DIRECT LINK: %s' % link) self.download(link) + getInfo = create_getInfo(ShareFilesCo) diff --git a/module/plugins/hoster/ShareRapidCom.py b/module/plugins/hoster/ShareRapidCom.py index 5a08fed1f..42bdaa4e3 100644 --- a/module/plugins/hoster/ShareRapidCom.py +++ b/module/plugins/hoster/ShareRapidCom.py @@ -8,8 +8,9 @@ from module.network.HTTPRequest import BadHeader from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo from module.common.json_layer import json_loads -def checkFile(url): - response = getURL("http://share-rapid.com/checkfiles.php", post = {"files": url}, decode = True) + +def checkFile(url): + response = getURL("http://share-rapid.com/checkfiles.php", post={"files": url}, decode=True) info = json_loads(response) if "error" in info: @@ -17,28 +18,30 @@ def checkFile(url): info['name'] = info['filename'] info['status'] = 2 elif info['msg'] == "Not found": - info['status'] = 1 #offline + info['status'] = 1 # offline elif info['msg'] == "Service Unavailable": - info['status'] = 6 #temp.offline + info['status'] = 6 # temp.offline return info - + + def getInfo(urls): for url in urls: info = checkFile(url) if "filename" in info: yield info['name'], info['size'], info['status'], url - else: + else: file_info = (url, 0, 3, url) h = getRequest() try: h.c.setopt(HTTPHEADER, ["Accept: text/html"]) - html = h.load(url, cookies = True, decode = True) - file_info = parseFileInfo(ShareRapidCom, url, html) + html = h.load(url, cookies=True, decode=True) + file_info = parseFileInfo(ShareRapidCom, url, html) finally: h.close() yield file_info + class ShareRapidCom(SimpleHoster): __name__ = "ShareRapidCom" __type__ = "hoster" @@ -51,11 +54,11 @@ class ShareRapidCom(SimpleHoster): FILE_NAME_PATTERN = r'<h1[^>]*><span[^>]*>(?:<a[^>]*>)?(?P<N>[^<]+)' FILE_SIZE_PATTERN = r'<td class="i">Velikost:</td>\s*<td class="h"><strong>\s*(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</strong></td>' FILE_OFFLINE_PATTERN = ur'Nastala chyba 404|Soubor byl smazán' - + DOWNLOAD_URL_PATTERN = r'<a href="([^"]+)" title="Stahnout">([^<]+)</a>' ERR_LOGIN_PATTERN = ur'<div class="error_div"><strong>Stahování je přístupné pouze přihlášeným uživatelům' ERR_CREDIT_PATTERN = ur'<div class="error_div"><strong>Stahování zdarma je možné jen přes náš' - + FILE_URL_REPLACEMENTS = [(__pattern__, r'http://share-rapid.com/stahuj/\1')] def setup(self): @@ -63,23 +66,24 @@ class ShareRapidCom(SimpleHoster): self.resumeDownload = True def process(self, pyfile): - if not self.account: self.fail("User not logged in") - + if not self.account: + self.fail("User not logged in") + self.info = checkFile(pyfile.url) self.logDebug(self.info) - - pyfile.status = self.info['status'] - + + pyfile.status = self.info['status'] + if pyfile.status == 2: pyfile.name = self.info['name'] pyfile.size = self.info['size'] - elif pyfile.status == 1: + elif pyfile.status == 1: self.offline() elif pyfile.status == 6: self.tempOffline() else: self.fail("Unexpected file status") - + url = "http://share-rapid.com/stahuj/%s" % self.info['filepath'] try: self.html = self.load(url, decode=True) @@ -89,15 +93,15 @@ class ShareRapidCom(SimpleHoster): found = re.search(self.DOWNLOAD_URL_PATTERN, self.html) if found is not None: - link = found.group(1) + link = found.group(1) self.logDebug("Premium link: %s" % link) - + self.check_data = {"size": pyfile.size} self.download(link) else: if re.search(self.ERR_LOGIN_PATTERN, self.html): self.relogin(self.user) - self.retry(3,0,"User login failed") + self.retry(3, 0, "User login failed") elif re.search(self.ERR_CREDIT_PATTERN, self.html): self.fail("Not enough credit left") else: diff --git a/module/plugins/hoster/SharebeesCom.py b/module/plugins/hoster/SharebeesCom.py index f5bacc5b0..cc1173fea 100644 --- a/module/plugins/hoster/SharebeesCom.py +++ b/module/plugins/hoster/SharebeesCom.py @@ -16,4 +16,5 @@ class SharebeesCom(XFileSharingPro): FORM_PATTERN = 'F1' HOSTER_NAME = "sharebees.com" + getInfo = create_getInfo(SharebeesCom) diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index e1867168b..7c0f9c069 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -10,34 +10,39 @@ from time import time, sleep from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.plugins.Plugin import chunks -from module.plugins.ReCaptcha import ReCaptcha as _ReCaptcha - +from module.plugins.internal.CaptchaService import ReCaptcha as _ReCaptcha + + def getInfo(urls): api_url_base = "http://api.share-online.biz/linkcheck.php" - + 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 + 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 src = getURL(api_url_base, post=api_param_file, decode=True) result = [] for i, res in enumerate(src.split("\n")): if not res: continue fields = res.split(";") - + if fields[1] == "OK": status = 2 elif fields[1] in ("DELETED", "NOT FOUND"): status = 1 else: status = 3 - + result.append((fields[2], int(fields[3]), status, chunk[i])) 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") + return self.plugin.decryptCaptcha("%simage" % server, get={"c": challenge}, + cookies=True, forceUser=True, imgtype="jpg") + class ShareonlineBiz(Hoster): __name__ = "ShareonlineBiz" @@ -47,7 +52,7 @@ class ShareonlineBiz(Hoster): __description__ = """Shareonline.biz Download Hoster""" __author_name__ = ("spoob", "mkaay", "zoidberg") __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz") - + ERROR_INFO_PATTERN = r'<p class="b">Information:</p>\s*<div>\s*<strong>(.*?)</strong>' def setup(self): @@ -60,133 +65,134 @@ class ShareonlineBiz(Hoster): self.resumeDownload = self.premium self.multiDL = False #self.chunkLimit = 1 - + self.check_data = None - def process(self, pyfile): + def process(self, pyfile): if self.premium: self.handleAPIPremium() #web-download fallback removed - didn't work anyway else: self.handleFree() - - """ - check = self.checkDownload({"failure": re.compile(self.ERROR_INFO_PATTERN)}) - if check == "failure": - try: - self.retry(reason = self.lastCheck.group(1).decode("utf8")) - except: - self.retry(reason = "Unknown error") - """ - - if self.api_data: + + # check = self.checkDownload({"failure": re.compile(self.ERROR_INFO_PATTERN)}) + # if check == "failure": + # try: + # self.retry(reason = self.lastCheck.group(1).decode("utf8")) + # except: + # self.retry(reason = "Unknown error") + + if self.api_data: self.check_data = {"size": int(self.api_data['size']), "md5": self.api_data['md5']} def downloadAPIData(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.pyfile.url.replace( + "http://www.share-online.biz/dl/", "")} # api only supports old style links src = self.load(api_url_base, cookies=False, post=api_param_file, decode=True) - + fields = src.split(";") self.api_data = {"fileid": fields[0], "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 + self.api_data["size"] = fields[3] # in bytes + self.api_data["md5"] = fields[4].strip().lower().replace("\n\n", "") # md5 - def handleFree(self): + def handleFree(self): self.downloadAPIData() self.pyfile.name = self.api_data["filename"] self.pyfile.size = int(self.api_data["size"]) - - self.html = self.load(self.pyfile.url, cookies = True) #refer, stuff + + self.html = self.load(self.pyfile.url, cookies=True) # refer, stuff self.setWait(3) self.wait() - - self.html = self.load("%s/free/" % self.pyfile.url, post={"dl_free":"1", "choice": "free"}, decode = True) + + self.html = self.load("%s/free/" % self.pyfile.url, post={"dl_free": "1", "choice": "free"}, decode=True) self.checkErrors() - - found = re.search(r'var wait=(\d+);', self.html) - + + found = re.search(r'var wait=(\d+);', self.html) + recaptcha = ReCaptcha(self) - for i in range(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 = { + for i in range(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={ 'dl_free': '1', 'recaptcha_challenge_field': challenge, 'recaptcha_response_field': response}) - + if not response == '0': break - else: self.fail("No valid captcha solution received") - + else: + self.fail("No valid captcha solution received") + download_url = response.decode("base64") self.logDebug(download_url) if not download_url.startswith("http://"): self.parseError("download url") - - self.wait() + + self.wait() self.download(download_url) # check download check = self.checkDownload({ "cookie": re.compile(r'<div id="dl_failure"'), "fail": re.compile(r"<title>Share-Online") - }) + }) if check == "cookie": self.retry(5, 60, "Cookie failure") 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") - + 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'): + if err in 'invalid': self.fail(msg or "File not available") - elif err in ('server'): + elif err in 'server': self.setWait(600, False) - elif err in ('expired'): + elif err in 'expired': self.setWait(30, False) - else: + else: self.setWait(300, True) - + self.wait() - self.retry(max_tries=25, reason = msg) - - def handleAPIPremium(self): #should be working better + self.retry(max_tries=25, reason=msg) + + def handleAPIPremium(self): # should be working better 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"], "act": "download", "lid": self.file_id}) + {"username": self.user, "password": self.account.accounts[self.user]["password"], + "act": "download", "lid": self.file_id}) self.api_data = dlinfo = {} for line in src.splitlines(): key, value = line.split(": ") dlinfo[key.lower()] = value - + self.logDebug(dlinfo) if not dlinfo["status"] == "online": self.offline() - + 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) - + def checksum(self, local_file): if self.api_data and "md5" in self.api_data and self.api_data["md5"]: h = hashlib.md5() diff --git a/module/plugins/hoster/ShareplaceCom.py b/module/plugins/hoster/ShareplaceCom.py index 7f0dee0e5..5f23f9708 100644 --- a/module/plugins/hoster/ShareplaceCom.py +++ b/module/plugins/hoster/ShareplaceCom.py @@ -1,84 +1,84 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-from module.plugins.Hoster import Hoster
-
-class ShareplaceCom(Hoster):
- __name__ = "ShareplaceCom"
- __type__ = "hoster"
- __pattern__ = r"(http://)?(www\.)?shareplace\.(com|org)/\?[a-zA-Z0-9]+"
- __version__ = "0.1"
- __description__ = """Shareplace.com Download Hoster"""
- __author_name__ = ("ACCakut, based on YourfilesTo by jeix and skydancer")
- __author_mail__ = ("none")
-
- def setup(self):
- self.html = None
- self.multiDL = True
-
- def process(self,pyfile):
- self.pyfile = pyfile
- self.prepare()
- self.download(self.get_file_url())
-
- def prepare(self):
- if not self.file_exists():
- self.offline()
-
- self.pyfile.name = self.get_file_name()
-
- wait_time = self.get_waiting_time()
- self.setWait(wait_time)
- self.log.debug("%s: Waiting %d seconds." % (self.__name__,wait_time))
- self.wait()
-
- def get_waiting_time(self):
- if self.html is None:
- self.download_html()
-
- #var zzipitime = 15;
- m = re.search(r'var zzipitime = (\d+);', self.html)
- if m:
- sec = int(m.group(1))
- else:
- sec = 0
-
- return sec
-
- def download_html(self):
- url = re.sub("shareplace.com\/\?", "shareplace.com//index1.php/?a=", self.pyfile.url)
- self.html = self.load(url, decode=True)
-
- def get_file_url(self):
- """ returns the absolute downloadable filepath
- """
- url = re.search(r"var beer = '(.*?)';", self.html)
- if url:
- url = url.group(1)
- url = urllib.unquote(url.replace("http://http:/", "").replace("vvvvvvvvv", "").replace("lllllllll", "").replace("teletubbies", ""))
- self.logDebug("URL: %s" % url)
- return url
- else:
- self.fail("absolute filepath could not be found. offline? ")
-
- def get_file_name(self):
- if self.html is None:
- self.download_html()
-
- return re.search("<title>\s*(.*?)\s*</title>", self.html).group(1)
-
- def file_exists(self):
- """ returns True or False
- """
- if self.html is None:
- self.download_html()
-
- if re.search(r"HTTP Status 404", self.html) is not None:
- return False
- else:
- return True
-
-
-
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +import urllib +from module.plugins.Hoster import Hoster + + +class ShareplaceCom(Hoster): + __name__ = "ShareplaceCom" + __type__ = "hoster" + __pattern__ = r"(http://)?(www\.)?shareplace\.(com|org)/\?[a-zA-Z0-9]+" + __version__ = "0.11" + __description__ = """Shareplace.com Download Hoster""" + __author_name__ = ("ACCakut, based on YourfilesTo by jeix and skydancer") + __author_mail__ = ("none") + + def setup(self): + self.html = None + self.multiDL = True + + def process(self, pyfile): + self.pyfile = pyfile + self.prepare() + self.download(self.get_file_url()) + + def prepare(self): + if not self.file_exists(): + self.offline() + + self.pyfile.name = self.get_file_name() + + wait_time = self.get_waiting_time() + self.setWait(wait_time) + self.logDebug("%s: Waiting %d seconds." % (self.__name__, wait_time)) + self.wait() + + def get_waiting_time(self): + if self.html is None: + self.download_html() + + #var zzipitime = 15; + m = re.search(r'var zzipitime = (\d+);', self.html) + if m: + sec = int(m.group(1)) + else: + sec = 0 + + return sec + + def download_html(self): + url = re.sub("shareplace.com\/\?", "shareplace.com//index1.php/?a=", self.pyfile.url) + self.html = self.load(url, decode=True) + + def get_file_url(self): + """ returns the absolute downloadable filepath + """ + url = re.search(r"var beer = '(.*?)';", self.html) + if url: + url = url.group(1) + url = urllib.unquote( + url.replace("http://http:/", "").replace("vvvvvvvvv", "").replace("lllllllll", "").replace( + "teletubbies", "")) + self.logDebug("URL: %s" % url) + return url + else: + self.fail("absolute filepath could not be found. offline? ") + + def get_file_name(self): + if self.html is None: + self.download_html() + + return re.search("<title>\s*(.*?)\s*</title>", self.html).group(1) + + def file_exists(self): + """ returns True or False + """ + if self.html is None: + self.download_html() + + if re.search(r"HTTP Status 404", self.html) is not None: + return False + else: + return True diff --git a/module/plugins/hoster/ShragleCom.py b/module/plugins/hoster/ShragleCom.py index 99f9f2366..2a2738974 100644 --- a/module/plugins/hoster/ShragleCom.py +++ b/module/plugins/hoster/ShragleCom.py @@ -6,34 +6,35 @@ from pycurl import FOLLOWLOCATION from module.plugins.Hoster import Hoster from module.plugins.internal.SimpleHoster import parseHtmlForm -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.network.RequestFactory import getURL API_KEY = "078e5ca290d728fd874121030efb4a0d" + def parseFileInfo(self, url): file_id = re.match(self.__pattern__, url).group('ID') - - data = getURL( - "http://www.cloudnator.com/api.php?key=%s&action=getStatus&fileID=%s" % (API_KEY, file_id), - decode = True - ).split() - + + data = getURL("http://www.cloudnator.com/api.php?key=%s&action=getStatus&fileID=%s" % (API_KEY, file_id), + decode=True).split() + if len(data) == 4: name, size, md5, status = data size = int(size) - + if hasattr(self, "check_data"): - self.checkdata = {"size": size, "md5": md5} - + self.checkdata = {"size": size, "md5": md5} + return name, size, 2 if status == "0" else 1, url else: return url, 0, 1, url + def getInfo(urls): for url in urls: file_info = parseFileInfo(ShragleCom, url) - yield file_info + yield file_info + class ShragleCom(Hoster): __name__ = "ShragleCom" @@ -48,38 +49,38 @@ class ShragleCom(Hoster): self.html = None self.multiDL = False self.check_data = None - + def process(self, pyfile): #get file status and info self.pyfile.name, self.pyfile.size, status = parseFileInfo(self, pyfile.url)[:3] - if status != 2: + if status != 2: self.offline() - + self.handleFree() - + def handleFree(self): self.html = self.load(self.pyfile.url) - + #get wait time found = re.search('\s*var\sdownloadWait\s=\s(\d+);', self.html) self.setWait(int(found.group(1)) if found else 30) - + #parse download form action, inputs = parseHtmlForm('id="download', self.html) - + #solve captcha found = re.search('recaptcha/api/(?:challenge|noscript)?k=(.+?)', self.html) captcha_key = found.group(1) if found else "6LdEFb0SAAAAAAwM70vnYo2AkiVkCx-xmfniatHz" - + recaptcha = ReCaptcha(self) - + inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key) self.wait() - + #validate self.req.http.c.setopt(FOLLOWLOCATION, 0) - self.html = self.load(action, post = inputs) - + self.html = self.load(action, post=inputs) + found = re.search(r"Location\s*:\s*(\S*)", self.req.http.header, re.I) if found: self.correctCaptcha() @@ -87,20 +88,18 @@ class ShragleCom(Hoster): else: if "Sicherheitscode falsch" in self.html: self.invalidCaptcha() - self.retry(max_tries = 5, reason = "Invalid captcha") + self.retry(max_tries=5, reason="Invalid captcha") else: self.fail("Invalid session") - + #download self.req.http.c.setopt(FOLLOWLOCATION, 1) self.download(download_url) - + check = self.checkDownload({ "ip_blocked": re.compile(r'<div class="error".*IP.*loading') - }) + }) if check == "ip_blocked": self.setWait(1800, True) self.wait() self.retry() - - diff --git a/module/plugins/hoster/SpeedLoadOrg.py b/module/plugins/hoster/SpeedLoadOrg.py index 32e7baf13..17354864f 100644 --- a/module/plugins/hoster/SpeedLoadOrg.py +++ b/module/plugins/hoster/SpeedLoadOrg.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class SpeedLoadOrg(XFileSharingPro): __name__ = "SpeedLoadOrg" __type__ = "hoster" @@ -16,6 +17,7 @@ class SpeedLoadOrg(XFileSharingPro): HOSTER_NAME = "speedload.org" def handlePremium(self): - self.download(self.pyfile.url, post = self.getPostParameters()) + self.download(self.pyfile.url, post=self.getPostParameters()) + getInfo = create_getInfo(SpeedLoadOrg) diff --git a/module/plugins/hoster/SpeedfileCz.py b/module/plugins/hoster/SpeedfileCz.py index bfd316dfa..3475ea29e 100644 --- a/module/plugins/hoster/SpeedfileCz.py +++ b/module/plugins/hoster/SpeedfileCz.py @@ -19,6 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class SpeedfileCz(SimpleHoster): __name__ = "SpeedFileCz" __type__ = "hoster" @@ -60,6 +61,7 @@ class SpeedfileCz(SimpleHoster): self.setWait(int(found.group(2)) - int(found.group(1))) self.wait() - self.download(download_url) + self.download(download_url) + -create_getInfo(SpeedfileCz)
\ No newline at end of file +create_getInfo(SpeedfileCz) diff --git a/module/plugins/hoster/StreamCz.py b/module/plugins/hoster/StreamCz.py index ca1033502..a575b205e 100644 --- a/module/plugins/hoster/StreamCz.py +++ b/module/plugins/hoster/StreamCz.py @@ -20,19 +20,21 @@ import re from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL + def getInfo(urls): result = [] - + for url in urls: - + html = getURL(url) if re.search(StreamCz.FILE_OFFLINE_PATTERN, html): # File offline result.append((url, 0, 1, url)) else: - result.append((url, 0, 2, url)) + result.append((url, 0, 2, url)) yield result - + + class StreamCz(Hoster): __name__ = "StreamCz" __type__ = "hoster" @@ -40,7 +42,7 @@ class StreamCz(Hoster): __version__ = "0.1" __description__ = """stream.cz""" __author_name__ = ("zoidberg") - + FILE_OFFLINE_PATTERN = r'<h1 class="commonTitle">Str.nku nebylo mo.n. nal.zt \(404\)</h1>' FILE_NAME_PATTERN = r'<link rel="video_src" href="http://www.stream.cz/\w+/(\d+)-([^"]+)" />' CDN_PATTERN = r'<param name="flashvars" value="[^"]*&id=(?P<ID>\d+)(?:&cdnLQ=(?P<cdnLQ>\d*))?(?:&cdnHQ=(?P<cdnHQ>\d*))?(?:&cdnHD=(?P<cdnHD>\d*))?&' @@ -49,28 +51,30 @@ class StreamCz(Hoster): self.multiDL = True self.resumeDownload = True - def process(self, pyfile): - + def process(self, pyfile): + self.html = self.load(pyfile.url, decode=True) - - if re.search(self.FILE_OFFLINE_PATTERN, self.html): + + if re.search(self.FILE_OFFLINE_PATTERN, self.html): self.offline() - + found = re.search(self.CDN_PATTERN, self.html) - if found is None: self.fail("Parse error (CDN)") + if found is None: + self.fail("Parse error (CDN)") cdn = found.groupdict() self.logDebug(cdn) for cdnkey in ("cdnHD", "cdnHQ", "cdnLQ"): - if cdn.has_key(cdnkey) and cdn[cdnkey] > '': + if cdnkey in cdn and cdn[cdnkey] > '': cdnid = cdn[cdnkey] break - else: + else: self.fail("Stream URL not found") - + found = re.search(self.FILE_NAME_PATTERN, self.html) - if found is None: self.fail("Parse error (NAME)") + if found is None: + self.fail("Parse error (NAME)") pyfile.name = "%s-%s.%s.mp4" % (found.group(2), found.group(1), cdnkey[-2:]) - + download_url = "http://cdn-dispatcher.stream.cz/?id=" + cdnid self.logInfo("STREAM (%s): %s" % (cdnkey[-2:], download_url)) self.download(download_url) diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index 73c0465f8..dd9bf9429 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- -from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo -from module.network.HTTPRequest import HTTPRequest from time import sleep import re +from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +from module.network.HTTPRequest import HTTPRequest + + class StreamcloudEu(XFileSharingPro): __name__ = "StreamcloudEu" __type__ = "hoster" @@ -31,7 +33,7 @@ class StreamcloudEu(XFileSharingPro): httpRequest = HTTPRequest(options=self.req.options) httpRequest.cj = self.req.cj sleep(10) - self.html = httpRequest.load(self.pyfile.url, post = data, referer=False, cookies=True, decode = True) + self.html = httpRequest.load(self.pyfile.url, post=data, referer=False, cookies=True, decode=True) self.header = httpRequest.header found = re.search("Location\s*:\s*(.*)", self.header, re.I) @@ -52,9 +54,10 @@ class StreamcloudEu(XFileSharingPro): def getPostParameters(self): for i in range(3): - if not self.errmsg: self.checkErrors() + if not self.errmsg: + self.checkErrors() - if hasattr(self,"FORM_PATTERN"): + if hasattr(self, "FORM_PATTERN"): action, inputs = self.parseHtmlForm(self.FORM_PATTERN) else: action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")}) @@ -86,7 +89,8 @@ class StreamcloudEu(XFileSharingPro): self.captcha = self.handleCaptcha(inputs) - if wait_time: self.wait() + if wait_time: + self.wait() self.errmsg = None self.logDebug("getPostParameters {0}".format(i)) @@ -97,15 +101,18 @@ class StreamcloudEu(XFileSharingPro): if self.premium: inputs['method_premium'] = "Premium Download" - if 'method_free' in inputs: del inputs['method_free'] + if 'method_free' in inputs: + del inputs['method_free'] else: inputs['method_free'] = "Free 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, ref = False) + self.html = self.load(self.pyfile.url, post=inputs, ref=False) self.errmsg = None - else: self.parseError('FORM: %s' % (inputs['op'] if 'op' in inputs else 'UNKNOWN')) + else: + self.parseError('FORM: %s' % (inputs['op'] if 'op' in inputs else 'UNKNOWN')) getInfo = create_getInfo(StreamcloudEu) diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index 09ce46a31..5fe42bba7 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -23,14 +23,14 @@ import re import random from urllib import quote from binascii import hexlify, unhexlify -from Crypto.Cipher import ARC4 import time +from pycurl import HTTPHEADER +from Crypto.Cipher import ARC4 from module.network.RequestFactory import getURL from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha -from pycurl import HTTPHEADER class TurbobitNet(SimpleHoster): __name__ = "TurbobitNet" @@ -41,10 +41,12 @@ class TurbobitNet(SimpleHoster): __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - FILE_INFO_PATTERN = r"<span class='file-icon1[^>]*>(?P<N>[^<]+)</span>\s*\((?P<S>[^\)]+)\)\s*</h1>" #long filenames are shortened - FILE_NAME_PATTERN = r'<meta name="keywords" content="\s+(?P<N>[^,]+)' #full name but missing on page2 + # long filenames are shortened + FILE_INFO_PATTERN = r"<span class='file-icon1[^>]*>(?P<N>[^<]+)</span>\s*\((?P<S>[^\)]+)\)\s*</h1>" + FILE_NAME_PATTERN = r'<meta name="keywords" content="\s+(?P<N>[^,]+)' # full name but missing on page2 FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>|html\(\'File (?:was )?not found' - FILE_URL_REPLACEMENTS = [(r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*", "http://turbobit.net/\g<ID>.html")] + FILE_URL_REPLACEMENTS = [(r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*", + "http://turbobit.net/\g<ID>.html")] SH_COOKIES = [("turbobit.net", "user_lang", "en")] CAPTCHA_KEY_PATTERN = r'src="http://api\.recaptcha\.net/challenge\?k=([^"]+)"' @@ -59,7 +61,7 @@ class TurbobitNet(SimpleHoster): rtUpdate = self.getRtUpdate() self.solveCaptcha() - self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"]) + self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"]) self.url = self.getDownloadUrl(rtUpdate) self.wait() @@ -67,7 +69,7 @@ class TurbobitNet(SimpleHoster): self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With:"]) self.downloadFile() - def solveCaptcha(self): + def solveCaptcha(self): for i in range(5): found = re.search(self.LIMIT_WAIT_PATTERN, self.html) if found: @@ -77,41 +79,47 @@ class TurbobitNet(SimpleHoster): self.retry() action, inputs = self.parseHtmlForm("action='#'") - if not inputs: self.parseError("captcha form") + if not inputs: + self.parseError("captcha form") self.logDebug(inputs) if inputs['captcha_type'] == 'recaptcha': recaptcha = ReCaptcha(self) found = re.search(self.CAPTCHA_KEY_PATTERN, self.html) captcha_key = found.group(1) if found else '6LcTGLoSAAAAAHCWY9TTIrQfjUlxu6kZlTYP50_c' - inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key) + inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge( + captcha_key) else: found = re.search(self.CAPTCHA_SRC_PATTERN, self.html) - if not found: self.parseError('captcha') + if not found: + self.parseError('captcha') captcha_url = found.group(1) inputs['captcha_response'] = self.decryptCaptcha(captcha_url) self.logDebug(inputs) - self.html = self.load(self.url, post = inputs) + self.html = self.load(self.url, post=inputs) if not "<div class='download-timer-header'>" in self.html: self.invalidCaptcha() else: self.correctCaptcha() break - else: self.fail("Invalid captcha") + else: + self.fail("Invalid captcha") def getRtUpdate(self): rtUpdate = self.getStorage("rtUpdate") if not rtUpdate: - if self.getStorage("version") != self.__version__ or int(self.getStorage("timestamp", 0)) + 86400000 < timestamp(): + if self.getStorage("version") != self.__version__ or int( + self.getStorage("timestamp", 0)) + 86400000 < timestamp(): # that's right, we are even using jdownloader updates rtUpdate = getURL("http://update0.jdownloader.org/pluginstuff/tbupdate.js") rtUpdate = self.decrypt(rtUpdate.splitlines()[1]) # but we still need to fix the syntax to work with other engines than rhino - rtUpdate = re.sub(r'for each\(var (\w+) in(\[[^\]]+\])\)\{',r'zza=\2;for(var zzi=0;zzi<zza.length;zzi++){\1=zza[zzi];',rtUpdate) - rtUpdate = re.sub(r"for\((\w+)=",r"for(var \1=", rtUpdate) - + rtUpdate = re.sub(r'for each\(var (\w+) in(\[[^\]]+\])\)\{', + r'zza=\2;for(var zzi=0;zzi<zza.length;zzi++){\1=zza[zzi];', rtUpdate) + rtUpdate = re.sub(r"for\((\w+)=", r"for(var \1=", rtUpdate) + self.logDebug("rtUpdate") self.setStorage("rtUpdate", rtUpdate) self.setStorage("timestamp", timestamp()) @@ -126,14 +134,16 @@ class TurbobitNet(SimpleHoster): self.req.http.lastURL = self.url found = re.search("(/\w+/timeout\.js\?\w+=)([^\"\'<>]+)", self.html) - url = "http://turbobit.net%s%s" % (found.groups() if found else ('/files/timeout.js?ver=', ''.join(random.choice('0123456789ABCDEF') for x in range(32)))) + url = "http://turbobit.net%s%s" % (found.groups() if found else ( + '/files/timeout.js?ver=', ''.join(random.choice('0123456789ABCDEF') for x in range(32)))) fun = self.load(url) self.setWait(65, False) - for b in [1,3]: - self.jscode = "var id = \'%s\';var b = %d;var inn = \'%s\';%sout" % (self.file_info['ID'], b, quote(fun), rtUpdate) - + for b in [1, 3]: + self.jscode = "var id = \'%s\';var b = %d;var inn = \'%s\';%sout" % ( + self.file_info['ID'], b, quote(fun), rtUpdate) + try: out = self.js.eval(self.jscode) self.logDebug("URL", self.js.engine, out) @@ -150,11 +160,11 @@ class TurbobitNet(SimpleHoster): def decrypt(self, data): cipher = ARC4.new(hexlify('E\x15\xa1\x9e\xa3M\xa0\xc6\xa0\x84\xb6H\x83\xa8o\xa0')) return unhexlify(cipher.encrypt(unhexlify(data))) - + def getLocalTimeString(self): lt = time.localtime() - tz = time.altzone if lt.tm_isdst else time.timezone - return "%s GMT%+03d%02d" % (time.strftime("%a %b %d %Y %H:%M:%S", lt), -tz // 3600, tz % 3600) + tz = time.altzone if lt.tm_isdst else time.timezone + return "%s GMT%+03d%02d" % (time.strftime("%a %b %d %Y %H:%M:%S", lt), -tz // 3600, tz % 3600) def handlePremium(self): self.logDebug("Premium download as user %s" % self.user) @@ -162,9 +172,11 @@ class TurbobitNet(SimpleHoster): def downloadFile(self): found = re.search(self.DOWNLOAD_URL_PATTERN, self.html) - if not found: self.parseError("download link") + if not found: + self.parseError("download link") self.url = "http://turbobit.net" + found.group('url') self.logDebug(self.url) self.download(self.url) + getInfo = create_getInfo(TurbobitNet) diff --git a/module/plugins/hoster/TurbouploadCom.py b/module/plugins/hoster/TurbouploadCom.py index 6e81c6319..12dad7906 100644 --- a/module/plugins/hoster/TurbouploadCom.py +++ b/module/plugins/hoster/TurbouploadCom.py @@ -18,8 +18,7 @@ import re from module.plugins.internal.DeadHoster import DeadHoster as EasybytezCom, create_getInfo -#from module.plugins.internal.SimpleHoster import create_getInfo -#from module.plugins.hoster.EasybytezCom import EasybytezCom + class TurbouploadCom(EasybytezCom): __name__ = "TurbouploadCom" @@ -29,17 +28,19 @@ class TurbouploadCom(EasybytezCom): __description__ = """turboupload.com""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + # shares code with EasybytezCom - + DIRECT_LINK_PATTERN = r'<a href="(http://turboupload.com/files/[^"]+)">\1</a>' def handleFree(self): - self.html = self.load(self.pyfile.url, post = self.getPostParameters(), ref = True, cookies = True) + self.html = self.load(self.pyfile.url, post=self.getPostParameters(), ref=True, cookies=True) found = re.search(self.DIRECT_LINK_PATTERN, self.html) - if not found: self.parseError('Download Link') + if not found: + self.parseError('Download Link') url = found.group(1) self.logDebug('URL: ' + url) self.download(url) -getInfo = create_getInfo(TurbouploadCom)
\ No newline at end of file + +getInfo = create_getInfo(TurbouploadCom) diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py index 517df8561..a155439b2 100644 --- a/module/plugins/hoster/TusfilesNet.py +++ b/module/plugins/hoster/TusfilesNet.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class TusfilesNet(XFileSharingPro): __name__ = "TusfilesNet" __type__ = "hoster" @@ -15,4 +16,5 @@ class TusfilesNet(XFileSharingPro): HOSTER_NAME = "tusfiles.net" + getInfo = create_getInfo(TusfilesNet) diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py index 8401e0cb0..5d1cd835b 100644 --- a/module/plugins/hoster/TwoSharedCom.py +++ b/module/plugins/hoster/TwoSharedCom.py @@ -1,9 +1,11 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo import re +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + class TwoSharedCom(SimpleHoster): __name__ = "TwoSharedCom" __type__ = "hoster" @@ -17,17 +19,18 @@ class TwoSharedCom(SimpleHoster): FILE_SIZE_PATTERN = r'<span class="dtitle">File size:</span>\s*(?P<S>[0-9,.]+) (?P<U>[kKMG])i?B' FILE_OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted\.' DOWNLOAD_URL_PATTERN = r"window.location ='([^']+)';" - + def setup(self): self.resumeDownload = self.multiDL = True - def handleFree(self): + def handleFree(self): found = re.search(self.DOWNLOAD_URL_PATTERN, self.html) - if not found: self.parseError('Download link') + if not found: + self.parseError('Download link') link = found.group(1) self.logDebug("Download URL %s" % link) - + self.download(link) + getInfo = create_getInfo(TwoSharedCom) -
\ No newline at end of file diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py index 5c38fdaad..fe0bc671e 100644 --- a/module/plugins/hoster/UlozTo.py +++ b/module/plugins/hoster/UlozTo.py @@ -19,15 +19,17 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + def convertDecimalPrefix(m): # decimal prefixes used in filesize and traffic - return ("%%.%df" % {'k':3,'M':6,'G':9}[m.group(2)] % float(m.group(1))).replace('.','') + return ("%%.%df" % {'k': 3, 'M': 6, 'G': 9}[m.group(2)] % float(m.group(1))).replace('.', '') + class UlozTo(SimpleHoster): __name__ = "UlozTo" __type__ = "hoster" __pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(?:live/)?(?P<id>\w+/[^/?]*)" - __version__ = "0.92" + __version__ = "0.93" __description__ = """uloz.to""" __author_name__ = ("zoidberg") @@ -44,20 +46,20 @@ class UlozTo(SimpleHoster): PREMIUM_URL_PATTERN = r'<div class="downloadForm"><form action="([^"]+)"' def setup(self): - self.multiDL = self.premium + self.multiDL = self.premium self.resumeDownload = True 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) + self.html = self.load(pyfile.url, decode=True, cookies=True) passwords = self.getPassword().splitlines() while self.PASSWD_PATTERN in self.html: if passwords: password = passwords.pop(0) self.logInfo("Password protected link, trying " + password) - self.html = self.load(pyfile.url, get = {"do": "passwordProtectedForm-submit"}, - post={"password": password, "password_send": 'Send'}, cookies=True) + self.html = self.load(pyfile.url, get={"do": "passwordProtectedForm-submit"}, + post={"password": password, "password_send": 'Send'}, cookies=True) else: self.fail("No or incorrect password") @@ -70,47 +72,45 @@ class UlozTo(SimpleHoster): self.handlePremium() else: self.handleFree() - + self.doCheckDownload() def handleFree(self): action, inputs = self.parseHtmlForm('id="frm-downloadDialog-freeDownloadForm"') if not action or not inputs: - self.parseError("free download form") - + self.parseError("free download form") + # get and decrypt captcha captcha_id_field = captcha_text_field = None - - for key in inputs.keys(): + + for key in inputs.keys(): found = re.match("captcha.*(id|text|value)", key) if found: if found.group(1) == "id": captcha_id_field = key else: captcha_text_field = key - + if not captcha_id_field or not captcha_text_field: - self.parseError("CAPTCHA form changed") - - """ - captcha_id = self.getStorage("captcha_id") - captcha_text = self.getStorage("captcha_text") - - if not captcha_id or not captcha_text: - """ + self.parseError("CAPTCHA form changed") + + # captcha_id = self.getStorage("captcha_id") + # captcha_text = self.getStorage("captcha_text") + # + # if not captcha_id or not captcha_text: + captcha_id = inputs[captcha_id_field] captcha_text = self.decryptCaptcha("http://img.uloz.to/captcha/%s.png" % captcha_id) - self.log.debug(' CAPTCHA ID:' + captcha_id + ' CAPTCHA TEXT:' + captcha_text) - - """ - self.setStorage("captcha_id", captcha_id) - self.setStorage("captcha_text", captcha_text) - """ + self.logDebug(' CAPTCHA ID:' + captcha_id + ' CAPTCHA TEXT:' + captcha_text) + + # self.setStorage("captcha_id", captcha_id) + # self.setStorage("captcha_text", captcha_text) + self.multiDL = True inputs.update({captcha_id_field: captcha_id, captcha_text_field: captcha_text}) - + self.download("http://www.ulozto.net" + action, post=inputs, cookies=True, disposition=True) def handlePremium(self): @@ -121,7 +121,8 @@ class UlozTo(SimpleHoster): def findDownloadURL(self, premium=False): msg = "%s link" % ("Premium" if premium else "Free") found = re.search(self.PREMIUM_URL_PATTERN if premium else self.FREE_URL_PATTERN, self.html) - if not found: self.parseError(msg) + if not found: + self.parseError(msg) parsed_url = "http://www.ulozto.net" + found.group(1) self.logDebug("%s: %s" % (msg, parsed_url)) return parsed_url @@ -131,7 +132,7 @@ class UlozTo(SimpleHoster): "wrong_captcha": re.compile(r'<ul class="error">\s*<li>Error rewriting the text.</li>'), "offline": re.compile(self.FILE_OFFLINE_PATTERN), "passwd": self.PASSWD_PATTERN, - "server_error": 'src="http://img.ulozto.cz/error403/vykricnik.jpg"', #paralell dl, server overload etc. + "server_error": 'src="http://img.ulozto.cz/error403/vykricnik.jpg"', # paralell dl, server overload etc. "not_found": "<title>Ulož.to</title>" }) @@ -153,4 +154,5 @@ class UlozTo(SimpleHoster): elif check == "not_found": self.fail("Server error - file not downloadable") + getInfo = create_getInfo(UlozTo) diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py index c607e7a5b..7060dff65 100644 --- a/module/plugins/hoster/UloziskoSk.py +++ b/module/plugins/hoster/UloziskoSk.py @@ -19,6 +19,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError + class UloziskoSk(SimpleHoster): __name__ = "UloziskoSk" __type__ = "hoster" @@ -38,7 +39,7 @@ class UloziskoSk(SimpleHoster): def process(self, pyfile): self.html = self.load(pyfile.url, decode=True) self.getFileInfo() - + found = re.search(self.IMG_PATTERN, self.html) if found: url = "http://ulozisko.sk" + found.group(1) @@ -48,17 +49,20 @@ class UloziskoSk(SimpleHoster): def handleFree(self): found = re.search(self.URL_PATTERN, self.html) - if found is None: raise PluginParseError('URL') + if found is None: + raise PluginParseError('URL') parsed_url = 'http://www.ulozisko.sk' + found.group(1) found = re.search(self.ID_PATTERN, self.html) - if found is None: raise PluginParseError('ID') + if found is None: + raise PluginParseError('ID') id = found.group(1) self.logDebug('URL:' + parsed_url + ' ID:' + id) found = re.search(self.CAPTCHA_PATTERN, self.html) - if found is None: raise PluginParseError('CAPTCHA') + if found is None: + raise PluginParseError('CAPTCHA') captcha_url = 'http://www.ulozisko.sk' + found.group(1) captcha = self.decryptCaptcha(captcha_url, cookies=True) @@ -72,4 +76,5 @@ class UloziskoSk(SimpleHoster): "but": "++++STIAHNI+S%DABOR++++" }) + getInfo = create_getInfo(UloziskoSk) diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py index 3c8552271..d13f01ef3 100644 --- a/module/plugins/hoster/UnibytesCom.py +++ b/module/plugins/hoster/UnibytesCom.py @@ -20,6 +20,7 @@ import re from pycurl import FOLLOWLOCATION from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class UnibytesCom(SimpleHoster): __name__ = "UnibytesCom" __type__ = "hoster" @@ -30,28 +31,28 @@ class UnibytesCom(SimpleHoster): FILE_INFO_PATTERN = r'<span[^>]*?id="fileName"[^>]*>(?P<N>[^>]+)</span>\s*\((?P<S>\d.*?)\)' DOMAIN = 'http://www.unibytes.com' - + WAIT_PATTERN = r'Wait for <span id="slowRest">(\d+)</span> sec' DOWNLOAD_LINK_PATTERN = r'<a href="([^"]+)">Download</a>' def handleFree(self): - action, post_data = self.parseHtmlForm('id="startForm"') + action, post_data = self.parseHtmlForm('id="startForm"') self.req.http.c.setopt(FOLLOWLOCATION, 0) - + for i in range(8): self.logDebug(action, post_data) - self.html = self.load(self.DOMAIN + action, post = post_data) - + self.html = self.load(self.DOMAIN + action, post=post_data) + found = re.search(r'location:\s*(\S+)', self.req.http.header, re.I) if found: url = found.group(1) break - - if '>Somebody else is already downloading using your IP-address<' in self.html: + + if '>Somebody else is already downloading using your IP-address<' in self.html: self.setWait(600, True) self.wait() self.retry() - + if post_data['step'] == 'last': found = re.search(self.DOWNLOAD_LINK_PATTERN, self.html) if found: @@ -60,21 +61,22 @@ class UnibytesCom(SimpleHoster): break else: self.invalidCaptcha() - - last_step = post_data['step'] + + last_step = post_data['step'] action, post_data = self.parseHtmlForm('id="stepForm"') - - if last_step == 'timer': + + if last_step == 'timer': found = re.search(self.WAIT_PATTERN, self.html) self.setWait(int(found.group(1)) if found else 60, False) - self.wait() + self.wait() elif last_step in ('captcha', 'last'): post_data['captcha'] = self.decryptCaptcha(self.DOMAIN + '/captcha.jpg') else: - self.fail("No valid captcha code entered") - + self.fail("No valid captcha code entered") + self.logDebug('Download link: ' + url) - self.req.http.c.setopt(FOLLOWLOCATION, 1) - self.download(url) + self.req.http.c.setopt(FOLLOWLOCATION, 1) + self.download(url) + -getInfo = create_getInfo(UnibytesCom)
\ No newline at end of file +getInfo = create_getInfo(UnibytesCom) diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py index e866a9269..358e493b1 100644 --- a/module/plugins/hoster/UnrestrictLi.py +++ b/module/plugins/hoster/UnrestrictLi.py @@ -35,7 +35,7 @@ def secondsToMidnight(): class UnrestrictLi(Hoster): __name__ = "UnrestrictLi" - __version__ = "0.03" + __version__ = "0.09" __type__ = "hoster" __pattern__ = r"https?://.*(unrestrict|unr)\.li" __description__ = """Unrestrict.li hoster plugin""" @@ -43,12 +43,12 @@ class UnrestrictLi(Hoster): __author_mail__ = ("l.stickell@yahoo.it") def init(self): - self.chunkLimit = -1 + self.chunkLimit = 16 self.resumeDownload = True def process(self, pyfile): if not self.account: - self.logError("Please enter your Unrestrict.li account or deactivate this plugin") + self.logError(_("Please enter your %s account or deactivate this plugin") % "Unrestrict.li") self.fail("No Unrestrict.li account provided") self.logDebug("Old URL: %s" % pyfile.url) @@ -61,7 +61,12 @@ class UnrestrictLi(Hoster): self.logDebug("JSON data: " + page) if page != '': break - if "You are not allowed to download from this host" in page: + if "File offline" in page: + self.offline() + elif "ERROR_HOSTER_TEMPORARILY_UNAVAILABLE" in page: + self.logInfo("Hoster temporarily unavailable, waiting 1 minute and retry") + self.retry(5, 60, "Hoster is temporarily unavailable") + elif "You are not allowed to download from this host" in page: self.fail("You are not allowed to download from this host") elif "You have reached your daily limit for this host" in page: self.logInfo("Reached daily limit for this host. Waiting until 00:10 GMT+2") @@ -72,8 +77,17 @@ class UnrestrictLi(Hoster): self.logDebug("New URL: " + new_url) + if hasattr(self, 'api_data'): + self.setNameSize() + self.download(new_url, disposition=True) if self.getConfig("history"): self.load("https://unrestrict.li/history/&delete=all") self.logInfo("Download history deleted") + + def setNameSize(self): + if 'name' in self.api_data: + self.pyfile.name = self.api_data['name'] + if 'size' in self.api_data: + self.pyfile.size = self.api_data['size'] diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py index d24682e4d..2831facac 100644 --- a/module/plugins/hoster/UploadStationCom.py +++ b/module/plugins/hoster/UploadStationCom.py @@ -1,21 +1,25 @@ -# -*- coding: utf-8 -*-
-from module.plugins.hoster.FileserveCom import FileserveCom, checkFile
-from module.plugins.Plugin import chunks
-
-class UploadStationCom(FileserveCom):
- __name__ = "UploadStationCom"
- __type__ = "hoster"
- __pattern__ = r"http://(?:www\.)?uploadstation\.com/file/(?P<id>[A-Za-z0-9]+)"
- __version__ = "0.51"
- __description__ = """UploadStation.Com File Download Hoster"""
- __author_name__ = ("fragonib", "zoidberg")
- __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "zoidberg@mujmail.cz")
-
- URLS = ['http://www.uploadstation.com/file/', 'http://www.uploadstation.com/check-links.php', 'http://www.uploadstation.com/checkReCaptcha.php']
- LINKCHECK_TR = r'<div class="details (?:white|grey)">(.*?)\t{9}</div>'
- LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<[^>]*>| )*([^<]*)'
-
- LONG_WAIT_PATTERN = r'<h1>You have to wait (\d+) (\w+) to download the next file\.</h1>'
-
-def getInfo(urls):
- for chunk in chunks(urls, 100): yield checkFile(UploadStationCom, chunk)
\ No newline at end of file +# -*- coding: utf-8 -*- +from module.plugins.hoster.FileserveCom import FileserveCom, checkFile +from module.plugins.Plugin import chunks + + +class UploadStationCom(FileserveCom): + __name__ = "UploadStationCom" + __type__ = "hoster" + __pattern__ = r"http://(?:www\.)?uploadstation\.com/file/(?P<id>[A-Za-z0-9]+)" + __version__ = "0.51" + __description__ = """UploadStation.Com File Download Hoster""" + __author_name__ = ("fragonib", "zoidberg") + __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "zoidberg@mujmail.cz") + + URLS = ['http://www.uploadstation.com/file/', 'http://www.uploadstation.com/check-links.php', + 'http://www.uploadstation.com/checkReCaptcha.php'] + LINKCHECK_TR = r'<div class="details (?:white|grey)">(.*?)\t{9}</div>' + LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<[^>]*>| )*([^<]*)' + + LONG_WAIT_PATTERN = r'<h1>You have to wait (\d+) (\w+) to download the next file\.</h1>' + + +def getInfo(urls): + for chunk in chunks(urls, 100): + yield checkFile(UploadStationCom, chunk) diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 21a9812ab..6ac3320c0 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -12,7 +12,7 @@ from module.utils import html_unescape, parseFileSize from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.plugins.Plugin import chunks -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha key = "bGhGMkllZXByd2VEZnU5Y2NXbHhYVlZ5cEE1bkEzRUw=".decode('base64') @@ -52,7 +52,8 @@ def getAPIData(urls): def parseFileInfo(self, url='', html=''): - if not html and hasattr(self, "html"): html = self.html + if not html and hasattr(self, "html"): + html = self.html name, size, status, found, fileid = url, 0, 3, None, None if re.search(self.FILE_OFFLINE_PATTERN, html): @@ -88,10 +89,11 @@ class UploadedTo(Hoster): __name__ = "UploadedTo" __type__ = "hoster" __pattern__ = r"https?://[\w\.-]*?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)" - __version__ = "0.70" + __version__ = "0.71" __description__ = """Uploaded.net Download Hoster""" __author_name__ = ("spoob", "mkaay", "zoidberg", "netpok", "stickell") - __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz", "netpok@gmail.com", "l.stickell@yahoo.it") + __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz", + "netpok@gmail.com", "l.stickell@yahoo.it") FILE_INFO_PATTERN = r'<a href="file/(?P<ID>\w+)" id="filename">(?P<N>[^<]+)</a> \s*<small[^>]*>(?P<S>[^<]+)</small>' FILE_OFFLINE_PATTERN = r'<small class="cL">Error: 404</small>' @@ -151,13 +153,12 @@ class UploadedTo(Hoster): else: self.handleFree() - def handlePremium(self): info = self.account.getAccountInfo(self.user, True) - self.log.debug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__, - "left": info["trafficleft"] / 1024 / 1024}) + self.logDebug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__, + "left": info["trafficleft"] / 1024 / 1024}) if int(self.data[1]) / 1024 > info["trafficleft"]: - self.log.info(_("%s: Not enough traffic left" % self.__name__)) + self.logInfo(_("%s: Not enough traffic left" % self.__name__)) self.account.empty(self.user) self.resetAccount() self.fail(_("Traffic exceeded")) diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index a2348b9f9..79bca748e 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -22,11 +22,12 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + class UploadheroCom(SimpleHoster): __name__ = "UploadheroCom" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?uploadhero\.com?/dl/\w+" - __version__ = "0.13" + __version__ = "0.14" __description__ = """UploadHero.com plugin""" __author_name__ = ("mcmyst", "zoidberg") __author_mail__ = ("mcmyst@hotmail.fr", "zoidberg@mujmail.cz") @@ -35,26 +36,27 @@ class UploadheroCom(SimpleHoster): FILE_NAME_PATTERN = r'<div class="nom_de_fichier">(?P<N>.*?)</div>' FILE_SIZE_PATTERN = r'Taille du fichier : </span><strong>(?P<S>.*?)</strong>' FILE_OFFLINE_PATTERN = r'<p class="titre_dl_2">|<div class="raison"><strong>Le lien du fichier ci-dessus n\'existe plus.' - + DOWNLOAD_URL_PATTERN = r'<a href="([^"]+)" id="downloadnow"' - + IP_BLOCKED_PATTERN = r'href="(/lightbox_block_download.php\?min=.*?)"' IP_WAIT_PATTERN = r'<span id="minutes">(\d+)</span>.*\s*<span id="seconds">(\d+)</span>' CAPTCHA_PATTERN = r'"(/captchadl\.php\?[a-z0-9]+)"' FREE_URL_PATTERN = r'var magicomfg = \'<a href="(http://[^<>"]*?)"|"(http://storage\d+\.uploadhero\.com/\?d=[A-Za-z0-9]+/[^<>"/]+)"' - + def handleFree(self): - self.checkErrors() - + self.checkErrors() + found = re.search(self.CAPTCHA_PATTERN, self.html) - if not found: self.parseError("Captcha URL") + if not found: + self.parseError("Captcha URL") captcha_url = "http://uploadhero.com" + found.group(1) - + for i in range(5): - captcha = self.decryptCaptcha(captcha_url) - self.html = self.load(self.pyfile.url, get = {"code": captcha}) - found = re.search(self.FREE_URL_PATTERN, self.html) + captcha = self.decryptCaptcha(captcha_url) + self.html = self.load(self.pyfile.url, get={"code": captcha}) + found = re.search(self.FREE_URL_PATTERN, self.html) if found: self.correctCaptcha() download_url = found.group(1) or found.group(2) @@ -62,26 +64,27 @@ class UploadheroCom(SimpleHoster): else: self.invalidCaptcha() else: - self.fail("No valid captcha code entered") - + self.fail("No valid captcha code entered") + self.download(download_url) - + def handlePremium(self): - self.log.debug("%s: Use Premium Account" % self.__name__) + self.logDebug("%s: Use Premium Account" % self.__name__) self.html = self.load(self.pyfile.url) link = re.search(self.DOWNLOAD_URL_PATTERN, self.html).group(1) - self.log.debug("Downloading link : '%s'" % link) - self.download(link) - + self.logDebug("Downloading link : '%s'" % link) + self.download(link) + def checkErrors(self): found = re.search(self.IP_BLOCKED_PATTERN, self.html) if found: self.html = self.load("http://uploadhero.com%s" % found.group(1)) - + found = re.search(self.IP_WAIT_PATTERN, self.html) wait_time = (int(found.group(1)) * 60 + int(found.group(2))) if found else 300 self.setWait(wait_time, True) self.wait() self.retry() - + + getInfo = create_getInfo(UploadheroCom) diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py index 4a157a787..1da571460 100644 --- a/module/plugins/hoster/UploadingCom.py +++ b/module/plugins/hoster/UploadingCom.py @@ -1,110 +1,113 @@ -#!/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
- 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
-"""
-
-import re
-from pycurl import HTTPHEADER
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp
-from module.common.json_layer import json_loads
-
-class UploadingCom(SimpleHoster):
- __name__ = "UploadingCom"
- __type__ = "hoster"
- __pattern__ = r"http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>[\w\d]+)"
- __version__ = "0.32"
- __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</title>'
- FILE_SIZE_PATTERN = r'<span>File size: (?P<S>.*?)</span>'
- FILE_OFFLINE_PATTERN = r'<h2.*?>The requested file is not found</h2>'
-
- def process(self, pyfile):
- # set lang to english
- self.req.cj.setCookie("uploading.com", "lang", "1")
- self.req.cj.setCookie("uploading.com", "language", "1")
- self.req.cj.setCookie("uploading.com", "setlang", "en")
- self.req.cj.setCookie("uploading.com", "_lang", "en")
-
- if not "/get/" in self.pyfile.url:
- self.pyfile.url = self.pyfile.url.replace("/files", "/files/get")
-
- self.html = self.load(pyfile.url, decode = True)
- self.file_info = self.getFileInfo()
-
- if self.premium:
- self.handlePremium()
- else:
- self.handleFree()
-
- def handlePremium(self):
- postData = {'action': 'get_link',
- 'code': self.file_info['ID'],
- 'pass': 'undefined'}
-
- self.html = self.load('http://uploading.com/files/get/?JsHttpRequest=%d-xml' % timestamp(), post=postData)
- url = re.search(r'"link"\s*:\s*"(.*?)"', self.html)
- if url:
- url = url.group(1).replace("\\/", "/")
- self.download(url)
-
- raise Exception("Plugin defect.")
-
- def handleFree(self):
- found = re.search('<h2>((Daily )?Download Limit)</h2>', self.html)
- if found:
- self.pyfile.error = found.group(1)
- self.logWarning(self.pyfile.error)
- self.retry(max_tries=6, wait_time = 21600 if found.group(2) else 900, reason = self.pyfile.error)
-
- ajax_url = "http://uploading.com/files/get/?ajax"
- self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
- self.req.http.lastURL = self.pyfile.url
-
- response = json_loads(self.load(ajax_url, post = {'action': 'second_page', 'code': self.file_info['ID']}))
- if 'answer' in response and 'wait_time' in response['answer']:
- wait_time = int(response['answer']['wait_time'])
- self.log.info("%s: Waiting %d seconds." % (self.__name__, wait_time))
- self.setWait(wait_time)
- self.wait()
- else:
- self.pluginParseError("AJAX/WAIT")
-
- response = json_loads(self.load(ajax_url, post = {'action': 'get_link', 'code': self.file_info['ID'], 'pass': 'false'}))
- if 'answer' in response and 'link' in response['answer']:
- url = response['answer']['link']
- else:
- self.pluginParseError("AJAX/URL")
-
- self.html = self.load(url)
- found = re.search(r'<form id="file_form" action="(.*?)"', self.html)
- if found:
- url = found.group(1)
- else:
- self.pluginParseError("URL")
-
- self.download(url)
-
- check = self.checkDownload({"html" : re.compile("\A<!DOCTYPE html PUBLIC")})
- if check == "html":
- self.logWarning("Redirected to a HTML page, wait 10 minutes and retry")
- self.setWait(600, True)
- self.wait()
-
-getInfo = create_getInfo(UploadingCom)
\ No newline at end of file +#!/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 + 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 +""" + +import re +from pycurl import HTTPHEADER +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp +from module.common.json_layer import json_loads + + +class UploadingCom(SimpleHoster): + __name__ = "UploadingCom" + __type__ = "hoster" + __pattern__ = r"http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>[\w\d]+)" + __version__ = "0.33" + __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</title>' + FILE_SIZE_PATTERN = r'<span>File size: (?P<S>.*?)</span>' + FILE_OFFLINE_PATTERN = r'<h2.*?>The requested file is not found</h2>' + + def process(self, pyfile): + # set lang to english + self.req.cj.setCookie("uploading.com", "lang", "1") + self.req.cj.setCookie("uploading.com", "language", "1") + self.req.cj.setCookie("uploading.com", "setlang", "en") + self.req.cj.setCookie("uploading.com", "_lang", "en") + + if not "/get/" in self.pyfile.url: + self.pyfile.url = self.pyfile.url.replace("/files", "/files/get") + + self.html = self.load(pyfile.url, decode=True) + self.file_info = self.getFileInfo() + + if self.premium: + self.handlePremium() + else: + self.handleFree() + + def handlePremium(self): + postData = {'action': 'get_link', + 'code': self.file_info['ID'], + 'pass': 'undefined'} + + self.html = self.load('http://uploading.com/files/get/?JsHttpRequest=%d-xml' % timestamp(), post=postData) + url = re.search(r'"link"\s*:\s*"(.*?)"', self.html) + if url: + url = url.group(1).replace("\\/", "/") + self.download(url) + + raise Exception("Plugin defect.") + + def handleFree(self): + found = re.search('<h2>((Daily )?Download Limit)</h2>', self.html) + if found: + self.pyfile.error = found.group(1) + self.logWarning(self.pyfile.error) + self.retry(max_tries=6, wait_time=21600 if found.group(2) else 900, reason=self.pyfile.error) + + ajax_url = "http://uploading.com/files/get/?ajax" + self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"]) + self.req.http.lastURL = self.pyfile.url + + response = json_loads(self.load(ajax_url, post={'action': 'second_page', 'code': self.file_info['ID']})) + if 'answer' in response and 'wait_time' in response['answer']: + wait_time = int(response['answer']['wait_time']) + self.logInfo("%s: Waiting %d seconds." % (self.__name__, wait_time)) + self.setWait(wait_time) + self.wait() + else: + self.pluginParseError("AJAX/WAIT") + + response = json_loads( + self.load(ajax_url, post={'action': 'get_link', 'code': self.file_info['ID'], 'pass': 'false'})) + if 'answer' in response and 'link' in response['answer']: + url = response['answer']['link'] + else: + self.pluginParseError("AJAX/URL") + + self.html = self.load(url) + found = re.search(r'<form id="file_form" action="(.*?)"', self.html) + if found: + url = found.group(1) + else: + self.pluginParseError("URL") + + self.download(url) + + check = self.checkDownload({"html": re.compile("\A<!DOCTYPE html PUBLIC")}) + if check == "html": + self.logWarning("Redirected to a HTML page, wait 10 minutes and retry") + self.setWait(600, True) + self.wait() + + +getInfo = create_getInfo(UploadingCom) diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index 60a93c1e5..e0d4ce7f4 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo + class UptoboxCom(XFileSharingPro): __name__ = "UptoboxCom" __type__ = "hoster" @@ -9,13 +10,14 @@ class UptoboxCom(XFileSharingPro): __description__ = """Uptobox.com hoster plugin""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - + FILE_INFO_PATTERN = r'<h2>\s*Download File\s*<span[^>]*>(?P<N>[^>]+)</span></h2>\s*[^\(]*\((?P<S>[^\)]+)\)</h2>' FILE_OFFLINE_PATTERN = r'<center>File Not Found</center>' HOSTER_NAME = "uptobox.com" - + def setup(self): - self.resumeDownload = self.multiDL = self.premium + self.resumeDownload = self.multiDL = self.premium self.chunkLimit = 1 -getInfo = create_getInfo(UptoboxCom)
\ No newline at end of file + +getInfo = create_getInfo(UptoboxCom) diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py index d4422afc3..88bcb20ad 100644 --- a/module/plugins/hoster/VeehdCom.py +++ b/module/plugins/hoster/VeehdCom.py @@ -3,6 +3,7 @@ import re from module.plugins.Hoster import Hoster + class VeehdCom(Hoster): __name__ = 'VeehdCom' __type__ = 'hoster' @@ -11,14 +12,14 @@ class VeehdCom(Hoster): ('filename_spaces', 'bool', "Allow spaces in filename", 'False'), ('replacement_char', 'str', "Filename replacement character", '_'), ] - __version__ = '0.21' + __version__ = '0.23' __description__ = """Veehd.com Download Hoster""" __author_name__ = ('cat') __author_mail__ = ('cat@pyload') - + def _debug(self, msg): - self.log.debug('[%s] %s' % (self.__name__, msg)) - + self.logDebug('[%s] %s' % (self.__name__, msg)) + def setup(self): self.html = None self.multiDL = True @@ -28,51 +29,50 @@ class VeehdCom(Hoster): self.download_html() if not self.file_exists(): self.offline() - + pyfile.name = self.get_file_name() self.download(self.get_file_url()) - + def download_html(self): url = self.pyfile.url self._debug("Requesting page: %s" % (repr(url),)) self.html = self.load(url) - + def file_exists(self): if self.html is None: self.download_html() - + if '<title>Veehd</title>' in self.html: return False return True - + def get_file_name(self): if self.html is None: self.download_html() - + match = re.search(r'<title[^>]*>([^<]+) on Veehd</title>', self.html) if not match: self.fail("video title not found") name = match.group(1) - + # replace unwanted characters in filename if self.getConfig('filename_spaces'): pattern = '[^0-9A-Za-z\.\ ]+' else: pattern = '[^0-9A-Za-z\.]+' - + name = re.sub(pattern, self.getConfig('replacement_char'), - name) + name) return name + '.avi' def get_file_url(self): """ returns the absolute downloadable filepath - """ + """ if self.html is None: self.download_html() - match = re.search(r'<embed type="video/divx" ' - r'src="(http://([^/]*\.)?veehd\.com/dl/[^"]+)"', - self.html) + match = re.search(r'<embed type="video/divx" src="(http://([^/]*\.)?veehd\.com/dl/[^"]+)"', + self.html) if not match: self.fail("embedded video url not found") file_url = match.group(1) diff --git a/module/plugins/hoster/WarserverCz.py b/module/plugins/hoster/WarserverCz.py index b256f8d1b..ee580fbdd 100644 --- a/module/plugins/hoster/WarserverCz.py +++ b/module/plugins/hoster/WarserverCz.py @@ -23,6 +23,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.network.HTTPRequest import BadHeader from module.utils import html_unescape + class WarserverCz(SimpleHoster): __name__ = "WarserverCz" __type__ = "hoster" @@ -30,41 +31,45 @@ class WarserverCz(SimpleHoster): __version__ = "0.12" __description__ = """Warserver.cz""" __author_name__ = ("zoidberg") - + FILE_NAME_PATTERN = r'<h1.*?>(?P<N>[^<]+)</h1>' FILE_SIZE_PATTERN = r'<li>Velikost: <strong>(?P<S>[^<]+)</strong>' FILE_OFFLINE_PATTERN = r'<h1>Soubor nenalezen</h1>' - + PREMIUM_URL_PATTERN = r'href="(http://[^/]+/dwn-premium.php.*?)"' DOMAIN = "http://csd01.coolshare.cz" - - DOMAIN = "http://s01.warserver.cz" - + + DOMAIN = "http://s01.warserver.cz" + def handleFree(self): - try: - self.download("%s/dwn-free.php?fid=%s" % (self.DOMAIN, self.file_info['ID'])) + try: + self.download("%s/dwn-free.php?fid=%s" % (self.DOMAIN, self.file_info['ID'])) except BadHeader, e: self.logError(e) if e.code == 403: - self.longWait(60,60) - else: raise + self.longWait(60, 60) + else: + raise self.checkDownloadedFile() - + def handlePremium(self): found = re.search(self.PREMIUM_URL_PATTERN, self.html) - if not found: self.parseError("Premium URL") + if not found: + self.parseError("Premium URL") url = html_unescape(found.group(1)) - self.logDebug("Premium URL: " + url) - if not url.startswith("http://"): self.resetAccount() + self.logDebug("Premium URL: " + url) + if not url.startswith("http://"): + self.resetAccount() self.download(url) - self.checkDownloadedFile() - + self.checkDownloadedFile() + def checkDownloadedFile(self): check = self.checkDownload({ "offline": ">404 Not Found<" - }) + }) if check == "offline": - self.offline() + self.offline() + -getInfo = create_getInfo(WarserverCz)
\ No newline at end of file +getInfo = create_getInfo(WarserverCz) diff --git a/module/plugins/hoster/WebshareCz.py b/module/plugins/hoster/WebshareCz.py index 195e65a93..10a8078c5 100644 --- a/module/plugins/hoster/WebshareCz.py +++ b/module/plugins/hoster/WebshareCz.py @@ -18,7 +18,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.network.HTTPRequest import BadHeader + class WebshareCz(SimpleHoster): __name__ = "WebshareCz" @@ -31,18 +31,19 @@ class WebshareCz(SimpleHoster): FILE_NAME_PATTERN = r'<h3>Stahujete soubor: </h3>\s*<div class="textbox">(?P<N>[^<]+)</div>' FILE_SIZE_PATTERN = r'<h3>Velikost souboru je: </h3>\s*<div class="textbox">(?P<S>[^<]+)</div>' FILE_OFFLINE_PATTERN = r'<h3>Soubor ".*?" nebyl nalezen.</h3>' - + DOWNLOAD_LINK_PATTERN = r'id="download_link" href="(?P<url>.*?)"' - + def setup(self): self.multiDL = True 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_b = re.search(r"(var keyStr.*)", self.html).group(1) url = self.js.eval("%s\n%s\ndec(l)" % (url_a, url_b)) - + self.logDebug('Download link: ' + url) - self.download(url) + self.download(url) + -getInfo = create_getInfo(WebshareCz)
\ No newline at end of file +getInfo = create_getInfo(WebshareCz) diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py index 4a5e89f22..861e7f11e 100644 --- a/module/plugins/hoster/WrzucTo.py +++ b/module/plugins/hoster/WrzucTo.py @@ -17,9 +17,11 @@ """ import re -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from pycurl import HTTPHEADER +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo + + class WrzucTo(SimpleHoster): __name__ = "WrzucTo" __type__ = "hoster" @@ -29,30 +31,32 @@ class WrzucTo(SimpleHoster): __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - SH_COOKIES = [("http://www.wrzuc.to", "language", "en")] + SH_COOKIES = [("http://www.wrzuc.to", "language", "en")] FILE_SIZE_PATTERN = r'class="info">\s*<tr>\s*<td>(?P<S>.*?)</td>' FILE_NAME_PATTERN = r'id="file_info">\s*<strong>(?P<N>.*?)</strong>' - + def setup(self): - self.multiDL = True - + self.multiDL = True + def handleFree(self): data = dict(re.findall(r'(md5|file): "(.*?)"', self.html)) - if len(data) != 2: self.parseError('File ID') - + if len(data) != 2: + self.parseError('File ID') + self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"]) self.req.http.lastURL = self.pyfile.url - self.load("http://www.wrzuc.to/ajax/server/prepair", post = {"md5": data['md5']}) - + self.load("http://www.wrzuc.to/ajax/server/prepair", post={"md5": data['md5']}) + self.req.http.lastURL = self.pyfile.url - self.html = self.load("http://www.wrzuc.to/ajax/server/download_link", post = {"file": data['file']}) - + self.html = self.load("http://www.wrzuc.to/ajax/server/download_link", post={"file": data['file']}) + data.update(re.findall(r'"(download_link|server_id)":"(.*?)"', self.html)) - if len(data) != 4: self.parseError('Download URL') - - download_url = "http://%s.wrzuc.to/pobierz/%s" % (data['server_id'], data['download_link']) - self.logDebug("Download URL: %s" % download_url) + if len(data) != 4: + self.parseError('Download URL') + + download_url = "http://%s.wrzuc.to/pobierz/%s" % (data['server_id'], data['download_link']) + self.logDebug("Download URL: %s" % download_url) self.download(download_url) - -getInfo = create_getInfo(WrzucTo) + +getInfo = create_getInfo(WrzucTo) diff --git a/module/plugins/hoster/WuploadCom.py b/module/plugins/hoster/WuploadCom.py index 1a0eb442b..3dab1b1bb 100644 --- a/module/plugins/hoster/WuploadCom.py +++ b/module/plugins/hoster/WuploadCom.py @@ -6,7 +6,7 @@ import string from urllib import unquote from module.plugins.Hoster import Hoster -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.plugins.Plugin import chunks from module.network.RequestFactory import getURL @@ -47,7 +47,7 @@ class WuploadCom(Hoster): __name__ = "WuploadCom" __type__ = "hoster" __pattern__ = r"http://[\w\.]*?wupload\..*?/file/(([a-z][0-9]+/)?[0-9]+)(/.*)?" - __version__ = "0.20" + __version__ = "0.21" __description__ = """Wupload com""" __author_name__ = ("jeix", "paulking") __author_mail__ = ("jeix@hasnomail.de", "") @@ -113,7 +113,7 @@ class WuploadCom(Hoster): def getDomain(self): result = json_loads( self.load(self.API_ADDRESS + "/utility?method=getWuploadDomainForCurrentIp&format=json", decode=True)) - self.log.debug("%s: response to get domain %s" % (self.__name__, result)) + self.logDebug("%s: response to get domain %s" % (self.__name__, result)) return result["FSApi_Utility"]["getWuploadDomainForCurrentIp"]["response"] def downloadPremium(self): diff --git a/module/plugins/hoster/X7To.py b/module/plugins/hoster/X7To.py index 79adf2a3f..24d1643f3 100644 --- a/module/plugins/hoster/X7To.py +++ b/module/plugins/hoster/X7To.py @@ -1,93 +1,92 @@ -# -*- coding: utf-8 -*-
-import re
-
-from module.plugins.Hoster import Hoster
-
-from module.network.RequestFactory import getURL
-
-def getInfo(urls):
- yield [(url, 0, 1, url) for url in urls]
-
-
-class X7To(Hoster):
- __name__ = "X7To"
- __type__ = "hoster"
- __pattern__ = r"http://(?:www.)?x7.to/"
- __version__ = "0.3"
- __description__ = """X7.To File Download Hoster"""
- __author_name__ = ("ernieb")
- __author_mail__ = ("ernieb")
-
- FILE_INFO_PATTERN=r'<meta name="description" content="Download: (.*?) \(([0-9,.]+) (KB|MB|GB)\)'
-
- def init(self):
- if self.premium:
- self.multiDL = False
- self.resumeDownload = False
- self.chunkLimit = 1
- else:
- self.multiDL = False
-
- self.file_id = re.search(r"http://x7.to/([a-zA-Z0-9]+)", self.pyfile.url).group(1)
- self.logDebug("file id is %s" % self.file_id)
- self.pyfile.url = "http://x7.to/" + self.file_id
-
- def process(self, pyfile):
- self.fail("Hoster not longer available")
-
- def handlePremium(self):
- # check if over limit first
- overLimit = re.search(r'<a onClick="cUser.buyTraffic\(\)" id="DL">', self.html)
- if overLimit:
- self.logDebug("over limit, falling back to free")
- self.handleFree()
- else:
- realurl = re.search(r'<a href="(http://stor.*?)" id="DL">', self.html)
- if realurl:
- realurl = realurl.group(1)
- self.logDebug("premium url found %s" % realurl)
- else:
- self.logDebug("premium link not found")
- self.download(realurl)
-
- def handleFree(self):
- # find file id
- file_id = re.search(r"var dlID = '(.*?)'", self.html)
- if not file_id:
- self.fail("Free download id not found")
-
- file_url = "http://x7.to/james/ticket/dl/" + file_id.group(1)
- self.logDebug("download id %s" % file_id.group(1))
-
- self.html = self.load(file_url, ref=False, decode=True)
-
- # deal with errors
- if "limit-dl" in self.html:
- self.logDebug("Limit reached ... waiting")
- self.setWait(900,True)
- self.wait()
- self.retry()
-
- if "limit-parallel" in self.html:
- self.fail("Cannot download in parallel")
-
- # no waiting required, go to download
- waitCheck = re.search(r"wait:(\d*),", self.html)
- if waitCheck:
- waitCheck = int(waitCheck.group(1))
- self.setWait(waitCheck)
- self.wait()
-
- urlCheck = re.search(r"url:'(.*?)'", self.html)
- url = None
- if urlCheck:
- url = urlCheck.group(1)
- self.logDebug("free url found %s" % url)
-
- if url:
- try:
- self.download(url)
- except:
- self.logDebug("downloading url failed: %s" % url)
- else:
- self.fail("Free download url found")
+# -*- coding: utf-8 -*- +import re + +from module.plugins.Hoster import Hoster + + +def getInfo(urls): + yield [(url, 0, 1, url) for url in urls] + + +class X7To(Hoster): + __name__ = "X7To" + __type__ = "hoster" + __pattern__ = r"http://(?:www.)?x7.to/" + __version__ = "0.3" + __description__ = """X7.To File Download Hoster""" + __author_name__ = ("ernieb") + __author_mail__ = ("ernieb") + + FILE_INFO_PATTERN = r'<meta name="description" content="Download: (.*?) \(([0-9,.]+) (KB|MB|GB)\)' + + def init(self): + if self.premium: + self.multiDL = False + self.resumeDownload = False + self.chunkLimit = 1 + else: + self.multiDL = False + + self.file_id = re.search(r"http://x7.to/([a-zA-Z0-9]+)", self.pyfile.url).group(1) + self.logDebug("file id is %s" % self.file_id) + self.pyfile.url = "http://x7.to/" + self.file_id + + def process(self, pyfile): + self.fail("Hoster not longer available") + + def handlePremium(self): + # check if over limit first + overLimit = re.search(r'<a onClick="cUser.buyTraffic\(\)" id="DL">', self.html) + if overLimit: + self.logDebug("over limit, falling back to free") + self.handleFree() + else: + realurl = re.search(r'<a href="(http://stor.*?)" id="DL">', self.html) + if realurl: + realurl = realurl.group(1) + self.logDebug("premium url found %s" % realurl) + else: + self.logDebug("premium link not found") + self.download(realurl) + + def handleFree(self): + # find file id + file_id = re.search(r"var dlID = '(.*?)'", self.html) + if not file_id: + self.fail("Free download id not found") + + file_url = "http://x7.to/james/ticket/dl/" + file_id.group(1) + self.logDebug("download id %s" % file_id.group(1)) + + self.html = self.load(file_url, ref=False, decode=True) + + # deal with errors + if "limit-dl" in self.html: + self.logDebug("Limit reached ... waiting") + self.setWait(900, True) + self.wait() + self.retry() + + if "limit-parallel" in self.html: + self.fail("Cannot download in parallel") + + # no waiting required, go to download + waitCheck = re.search(r"wait:(\d*),", self.html) + if waitCheck: + waitCheck = int(waitCheck.group(1)) + self.setWait(waitCheck) + self.wait() + + urlCheck = re.search(r"url:'(.*?)'", self.html) + url = None + if urlCheck: + url = urlCheck.group(1) + self.logDebug("free url found %s" % url) + + if url: + try: + self.download(url) + except: + self.logDebug("downloading url failed: %s" % url) + else: + self.fail("Free download url found") diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py index 2103b0c20..9df843678 100644 --- a/module/plugins/hoster/XFileSharingPro.py +++ b/module/plugins/hoster/XFileSharingPro.py @@ -22,10 +22,10 @@ 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.ReCaptcha import ReCaptcha -from module.plugins.internal.CaptchaService import SolveMedia +from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia from module.utils import html_unescape + class XFileSharingPro(SimpleHoster): """ Common base for XFileSharingPro hosters like EasybytezCom, CramitIn, FiledinoCom... @@ -74,7 +74,7 @@ class XFileSharingPro(SimpleHoster): self.fail("Only premium users can download from other hosters with %s" % self.HOSTER_NAME) else: try: - self.html = self.load(pyfile.url, cookies = False, decode = True) + self.html = self.load(pyfile.url, cookies=False, decode=True) self.file_info = self.getFileInfo() except PluginParseError: self.file_info = None @@ -82,7 +82,8 @@ class XFileSharingPro(SimpleHoster): self.location = self.getDirectDownloadLink() if not self.file_info: - pyfile.name = html_unescape(unquote(urlparse(self.location if self.location else pyfile.url).path.split("/")[-1])) + pyfile.name = html_unescape(unquote(urlparse( + self.location if self.location else pyfile.url).path.split("/")[-1])) if self.location: self.startDownload(self.location) @@ -106,12 +107,12 @@ class XFileSharingPro(SimpleHoster): self.req.http.lastURL = self.pyfile.url self.req.http.c.setopt(FOLLOWLOCATION, 0) - self.html = self.load(self.pyfile.url, cookies = True, decode = True) + self.html = self.load(self.pyfile.url, cookies=True, decode=True) self.header = self.req.http.header self.req.http.c.setopt(FOLLOWLOCATION, 1) location = None - found = re.search("Location\s*:\s*(.*)", self.header, re.I) + found = re.search(r"Location\s*:\s*(.*)", self.header, re.I) if found and re.match(self.DIRECT_LINK_PATTERN, found.group(1)): location = found.group(1).strip() @@ -128,11 +129,11 @@ class XFileSharingPro(SimpleHoster): data = self.getPostParameters() self.req.http.c.setopt(FOLLOWLOCATION, 0) - self.html = self.load(self.pyfile.url, post = data, ref = True, decode = True) + self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True) self.header = self.req.http.header self.req.http.c.setopt(FOLLOWLOCATION, 1) - found = re.search("Location\s*:\s*(.*)", self.header, re.I) + found = re.search(r"Location\s*:\s*(.*)", self.header, re.I) if found: break @@ -149,7 +150,7 @@ class XFileSharingPro(SimpleHoster): return found.group(1) def handlePremium(self): - self.html = self.load(self.pyfile.url, post = self.getPostParameters()) + self.html = self.load(self.pyfile.url, post=self.getPostParameters()) found = re.search(self.DIRECT_LINK_PATTERN, self.html) if not found: self.parseError('DIRECT LINK') @@ -158,8 +159,8 @@ class XFileSharingPro(SimpleHoster): def handleOverriden(self): #only tested with easybytez.com self.html = self.load("http://www.%s/" % self.HOSTER_NAME) - action, inputs = self.parseHtmlForm('') - upload_id = "%012d" % int(random()*10**12) + action, inputs = self.parseHtmlForm('') + upload_id = "%012d" % int(random() * 10 ** 12) action += upload_id + "&js_on=1&utype=prem&upload_type=url" inputs['tos'] = '1' inputs['url_mass'] = self.pyfile.url @@ -168,13 +169,14 @@ class XFileSharingPro(SimpleHoster): self.logDebug(self.HOSTER_NAME, action, inputs) #wait for file to upload to easybytez.com self.req.http.c.setopt(LOW_SPEED_TIME, 600) - self.html = self.load(action, post = inputs) + self.html = self.load(action, post=inputs) action, inputs = self.parseHtmlForm('F1') - if not inputs: self.parseError('TEXTAREA') + if not inputs: + self.parseError('TEXTAREA') self.logDebug(self.HOSTER_NAME, inputs) if inputs['st'] == 'OK': - self.html = self.load(action, post = inputs) + self.html = self.load(action, post=inputs) elif inputs['st'] == 'Can not leech file': self.retry(max_tries=20, wait_time=180, reason=inputs['st']) else: @@ -182,7 +184,8 @@ class XFileSharingPro(SimpleHoster): #get easybytez.com link for uploaded file found = re.search(self.OVR_DOWNLOAD_LINK_PATTERN, self.html) - if not found: self.parseError('DIRECT LINK (OVR)') + if not found: + self.parseError('DIRECT LINK (OVR)') self.pyfile.url = found.group(1) header = self.load(self.pyfile.url, just_header=True) if 'location' in header: # Direct link @@ -192,7 +195,8 @@ class XFileSharingPro(SimpleHoster): def startDownload(self, link): link = link.strip() - if self.captcha: self.correctCaptcha() + if self.captcha: + self.correctCaptcha() self.logDebug('DIRECT LINK: %s' % link) self.download(link, disposition=True) @@ -200,10 +204,11 @@ class XFileSharingPro(SimpleHoster): found = re.search(self.ERROR_PATTERN, self.html) if found: self.errmsg = found.group(1) - self.logWarning(re.sub(r"<.*?>"," ",self.errmsg)) + self.logWarning(re.sub(r"<.*?>", " ", self.errmsg)) if 'wait' in self.errmsg: - wait_time = sum([int(v) * {"hour": 3600, "minute": 60, "second": 1}[u] for v, u in re.findall('(\d+)\s*(hour|minute|second)?', self.errmsg)]) + wait_time = sum([int(v) * {"hour": 3600, "minute": 60, "second": 1}[u] for v, u in + re.findall(r'(\d+)\s*(hour|minute|second)?', self.errmsg)]) self.setWait(wait_time, True) self.wait() elif 'captcha' in self.errmsg: @@ -229,10 +234,11 @@ class XFileSharingPro(SimpleHoster): return self.errmsg def getPostParameters(self): - for i in range(3): - if not self.errmsg: self.checkErrors() + for _ in range(3): + if not self.errmsg: + self.checkErrors() - if hasattr(self,"FORM_PATTERN"): + if hasattr(self, "FORM_PATTERN"): action, inputs = self.parseHtmlForm(self.FORM_PATTERN) else: action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")}) @@ -264,7 +270,8 @@ class XFileSharingPro(SimpleHoster): self.captcha = self.handleCaptcha(inputs) - if wait_time: self.wait() + if wait_time: + self.wait() self.errmsg = None return inputs @@ -274,15 +281,18 @@ class XFileSharingPro(SimpleHoster): if self.premium: inputs['method_premium'] = "Premium Download" - if 'method_free' in inputs: del inputs['method_free'] + if 'method_free' in inputs: + del inputs['method_free'] else: inputs['method_free'] = "Free 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, ref = True) + self.html = self.load(self.pyfile.url, post=inputs, ref=True) self.errmsg = None - else: self.parseError('FORM: %s' % (inputs['op'] if 'op' in inputs else 'UNKNOWN')) + else: + self.parseError('FORM: %s' % (inputs['op'] if 'op' in inputs else 'UNKNOWN')) def handleCaptcha(self, inputs): found = re.search(self.RECAPTCHA_URL_PATTERN, self.html) @@ -303,8 +313,8 @@ class XFileSharingPro(SimpleHoster): if found: captcha_div = found.group(1) self.logDebug(captcha_div) - numerals = re.findall('<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div)) - inputs['code'] = "".join([a[1] for a in sorted(numerals, key = lambda num: int(num[0]))]) + numerals = re.findall(r'<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div)) + inputs['code'] = "".join([a[1] for a in sorted(numerals, key=lambda num: int(num[0]))]) self.logDebug("CAPTCHA", inputs['code'], numerals) return 3 else: @@ -316,4 +326,5 @@ class XFileSharingPro(SimpleHoster): return 4 return 0 + getInfo = create_getInfo(XFileSharingPro) diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py index 866c5da45..cbdd818c7 100644 --- a/module/plugins/hoster/XHamsterCom.py +++ b/module/plugins/hoster/XHamsterCom.py @@ -2,17 +2,20 @@ # -*- coding: utf-8 -*- import re -from module.plugins.Hoster import Hoster from urllib import unquote + +from module.plugins.Hoster import Hoster from module.common.json_layer import json_loads + def clean_json(json_expr): json_expr = re.sub('[\n\r]', '', json_expr) json_expr = re.sub(' +', '', json_expr) - json_expr = re.sub('\'','"', json_expr) + json_expr = re.sub('\'', '"', json_expr) return json_expr - + + class XHamsterCom(Hoster): __name__ = "XHamsterCom" __type__ = "hoster" @@ -23,16 +26,16 @@ class XHamsterCom(Hoster): def setup(self): self.html = None - + def process(self, pyfile): self.pyfile = pyfile - + if not self.file_exists(): self.offline() if self.getConfig("type"): - self.desired_fmt = self.getConfig("type") - + self.desired_fmt = self.getConfig("type") + self.pyfile.name = self.get_file_name() + self.desired_fmt self.download(self.get_file_url()) @@ -45,32 +48,31 @@ class XHamsterCom(Hoster): """ if self.html is None: self.download_html() - + flashvar_pattern = re.compile('flashvars = ({.*?});', re.DOTALL) - json_flashvar=flashvar_pattern.search(self.html) + json_flashvar = flashvar_pattern.search(self.html) if json_flashvar is None: self.fail("Parse error (flashvars)") j = clean_json(json_flashvar.group(1)) flashvars = json_loads(j) - + if flashvars["srv"]: - srv_url = flashvars["srv"] + '/' + srv_url = flashvars["srv"] + '/' else: self.fail("Parse error (srv_url)") - + if flashvars["url_mode"]: - url_mode = flashvars["url_mode"] + url_mode = flashvars["url_mode"] else: self.fail("Parse error (url_mode)") - if self.desired_fmt == ".mp4": file_url = re.search(r"<a href=\"" + srv_url + "(.+?)\"", self.html) if file_url is None: self.fail("Parse error (file_url)") - file_url=file_url.group(1) + file_url = file_url.group(1) long_url = srv_url + file_url self.logDebug(_("long_url: %s") % long_url) else: @@ -79,15 +81,14 @@ class XHamsterCom(Hoster): else: self.fail("Parse error (file_url)") - if url_mode=='3': + if url_mode == '3': long_url = file_url self.logDebug(_("long_url: %s") % long_url) - else: + else: long_url = srv_url + "key=" + file_url self.logDebug(_("long_url: %s") % long_url) - + return long_url - def get_file_name(self): if self.html is None: diff --git a/module/plugins/hoster/XVideosCom.py b/module/plugins/hoster/XVideosCom.py index b7f3f7b58..48a1f934d 100644 --- a/module/plugins/hoster/XVideosCom.py +++ b/module/plugins/hoster/XVideosCom.py @@ -1,9 +1,9 @@ - import re import urllib from module.plugins.Hoster import Hoster + class XVideosCom(Hoster): __name__ = "XVideos.com" __version__ = "0.1" @@ -12,7 +12,7 @@ class XVideosCom(Hoster): def process(self, pyfile): site = self.load(pyfile.url) - pyfile.name = "%s (%s).flv" %( + pyfile.name = "%s (%s).flv" % ( re.search(r"<h2>([^<]+)<span", site).group(1), re.search(self.__pattern__, pyfile.url).group(1), ) diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py index 3e66b966a..bd8c6025a 100644 --- a/module/plugins/hoster/Xdcc.py +++ b/module/plugins/hoster/Xdcc.py @@ -1,229 +1,224 @@ -# -*- 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
-"""
-
-from os.path import join
-from os.path import exists
-from os import makedirs
-import re
-import sys
-import time
-import socket, struct
-from select import select
-from module.utils import save_join
-
-from module.plugins.Hoster import Hoster
-
-
-class Xdcc(Hoster):
- __name__ = "Xdcc"
- __version__ = "0.31"
- __pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?' # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/
- __type__ = "hoster"
- __config__ = [
- ("nick", "str", "Nickname", "pyload"),
- ("ident", "str", "Ident", "pyloadident"),
- ("realname", "str", "Realname", "pyloadreal")
- ]
- __description__ = """A Plugin that allows you to download from an IRC XDCC bot"""
- __author_name__ = ("jeix")
- __author_mail__ = ("jeix@hasnomail.com")
-
- def setup(self):
- self.debug = 0 #0,1,2
- self.timeout = 30
- self.multiDL = False
-
-
-
- def process(self, pyfile):
- # change request type
- self.req = pyfile.m.core.requestFactory.getRequest(self.__name__, type="XDCC")
-
- self.pyfile = pyfile
- for i in range(0,3):
- try:
- nmn = self.doDownload(pyfile.url)
- self.log.debug("%s: Download of %s finished." % (self.__name__, nmn))
- return
- except socket.error, e:
- if hasattr(e, "errno"):
- errno = e.errno
- else:
- errno = e.args[0]
-
- if errno in (10054,):
- self.log.debug("XDCC: Server blocked our ip, retry in 5 min")
- self.setWait(300)
- self.wait()
- continue
-
- self.fail("Failed due to socket errors. Code: %d" % errno)
-
- self.fail("Server blocked our ip, retry again later manually")
-
-
- def doDownload(self, url):
- self.pyfile.setStatus("waiting") # real link
-
- download_folder = self.config['general']['download_folder']
- location = join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding()))
- if not exists(location):
- makedirs(location)
-
- m = re.search(r'xdcc://(.*?)/#?(.*?)/(.*?)/#?(\d+)/?', url)
- server = m.group(1)
- chan = m.group(2)
- bot = m.group(3)
- pack = m.group(4)
- nick = self.getConfig('nick')
- ident = self.getConfig('ident')
- real = self.getConfig('realname')
-
- temp = server.split(':')
- ln = len(temp)
- if ln == 2:
- host, port = temp
- elif ln == 1:
- host, port = temp[0], 6667
- else:
- self.fail("Invalid hostname for IRC Server (%s)" % server)
-
-
- #######################
- # CONNECT TO IRC AND IDLE FOR REAL LINK
- dl_time = time.time()
-
- sock = socket.socket()
- sock.connect((host, int(port)))
- if nick == "pyload":
- nick = "pyload-%d" % (time.time() % 1000) # last 3 digits
- sock.send("NICK %s\r\n" % nick)
- sock.send("USER %s %s bla :%s\r\n" % (ident, host, real))
- time.sleep(3)
- sock.send("JOIN #%s\r\n" % chan)
- sock.send("PRIVMSG %s :xdcc send #%s\r\n" % (bot, pack))
-
- # IRC recv loop
- readbuffer = ""
- done = False
- retry = None
- m = None
- while True:
-
- # done is set if we got our real link
- if done:
- break
-
- if retry:
- if time.time() > retry:
- retry = None
- dl_time = time.time()
- sock.send("PRIVMSG %s :xdcc send #%s\r\n" % (bot, pack))
-
- else:
- if (dl_time + self.timeout) < time.time(): # todo: add in config
- sock.send("QUIT :byebye\r\n")
- sock.close()
- self.fail("XDCC Bot did not answer")
-
-
- fdset = select([sock], [], [], 0)
- if sock not in fdset[0]:
- continue
-
- readbuffer += sock.recv(1024)
- temp = readbuffer.split("\n")
- readbuffer = temp.pop()
-
- for line in temp:
- if self.debug is 2: print "*> " + unicode(line, errors='ignore')
- line = line.rstrip()
- first = line.split()
-
- if first[0] == "PING":
- sock.send("PONG %s\r\n" % first[1])
-
- if first[0] == "ERROR":
- self.fail("IRC-Error: %s" % line)
-
- msg = line.split(None, 3)
- if len(msg) != 4:
- continue
-
- msg = { \
- "origin":msg[0][1:], \
- "action":msg[1], \
- "target":msg[2], \
- "text" :msg[3][1:] \
- }
-
-
- if nick == msg["target"][0:len(nick)] and "PRIVMSG" == msg["action"]:
- if msg["text"] == "\x01VERSION\x01":
- self.log.debug("XDCC: Sending CTCP VERSION.")
- sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface"))
- elif msg["text"] == "\x01TIME\x01":
- self.log.debug("Sending CTCP TIME.")
- sock.send("NOTICE %s :%d\r\n" % (msg['origin'], time.time()))
- elif msg["text"] == "\x01LAG\x01":
- pass # don't know how to answer
-
- if not (bot == msg["origin"][0:len(bot)]
- and nick == msg["target"][0:len(nick)]
- and msg["action"] in ("PRIVMSG", "NOTICE")):
- continue
-
- if self.debug is 1:
- print "%s: %s" % (msg["origin"], msg["text"])
-
- if "You already requested that pack" in msg["text"]:
- retry = time.time() + 300
-
- if "you must be on a known channel to request a pack" in msg["text"]:
- self.fail("Wrong channel")
-
- m = re.match('\x01DCC SEND (.*?) (\d+) (\d+)(?: (\d+))?\x01', msg["text"])
- if m:
- done = True
-
- # get connection data
- ip = socket.inet_ntoa(struct.pack('L', socket.ntohl(int(m.group(2)))))
- port = int(m.group(3))
- packname = m.group(1)
-
- if len(m.groups()) > 3:
- self.req.filesize = int(m.group(4))
-
- self.pyfile.name = packname
- filename = save_join(location, packname)
- self.log.info("XDCC: Downloading %s from %s:%d" % (packname, ip, port))
-
- self.pyfile.setStatus("downloading")
- newname = self.req.download(ip, port, filename, sock, self.pyfile.setProgress)
- if newname and newname != filename:
- self.log.info("%(name)s saved as %(newname)s" % {"name": self.pyfile.name, "newname": newname})
- filename = newname
-
- # kill IRC socket
- # sock.send("QUIT :byebye\r\n")
- sock.close()
-
- self.lastDownload = filename
- return self.lastDownload
-
+# -*- 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 +""" + +from os.path import join +from os.path import exists +from os import makedirs +import re +import sys +import time +import socket +import struct +from select import select + +from module.utils import save_join +from module.plugins.Hoster import Hoster + + +class Xdcc(Hoster): + __name__ = "Xdcc" + __version__ = "0.32" + __pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?' # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/ + __type__ = "hoster" + __config__ = [ + ("nick", "str", "Nickname", "pyload"), + ("ident", "str", "Ident", "pyloadident"), + ("realname", "str", "Realname", "pyloadreal") + ] + __description__ = """A Plugin that allows you to download from an IRC XDCC bot""" + __author_name__ = ("jeix") + __author_mail__ = ("jeix@hasnomail.com") + + def setup(self): + self.debug = 0 # 0,1,2 + self.timeout = 30 + self.multiDL = False + + def process(self, pyfile): + # change request type + self.req = pyfile.m.core.requestFactory.getRequest(self.__name__, type="XDCC") + + self.pyfile = pyfile + for i in range(0, 3): + try: + nmn = self.doDownload(pyfile.url) + self.logDebug("%s: Download of %s finished." % (self.__name__, nmn)) + return + except socket.error, e: + if hasattr(e, "errno"): + errno = e.errno + else: + errno = e.args[0] + + if errno in (10054,): + self.logDebug("XDCC: Server blocked our ip, retry in 5 min") + self.setWait(300) + self.wait() + continue + + self.fail("Failed due to socket errors. Code: %d" % errno) + + self.fail("Server blocked our ip, retry again later manually") + + def doDownload(self, url): + self.pyfile.setStatus("waiting") # real link + + download_folder = self.config['general']['download_folder'] + location = join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding())) + if not exists(location): + makedirs(location) + + m = re.search(r'xdcc://(.*?)/#?(.*?)/(.*?)/#?(\d+)/?', url) + server = m.group(1) + chan = m.group(2) + bot = m.group(3) + pack = m.group(4) + nick = self.getConfig('nick') + ident = self.getConfig('ident') + real = self.getConfig('realname') + + temp = server.split(':') + ln = len(temp) + if ln == 2: + host, port = temp + elif ln == 1: + host, port = temp[0], 6667 + else: + self.fail("Invalid hostname for IRC Server (%s)" % server) + + ####################### + # CONNECT TO IRC AND IDLE FOR REAL LINK + dl_time = time.time() + + sock = socket.socket() + sock.connect((host, int(port))) + if nick == "pyload": + nick = "pyload-%d" % (time.time() % 1000) # last 3 digits + sock.send("NICK %s\r\n" % nick) + sock.send("USER %s %s bla :%s\r\n" % (ident, host, real)) + time.sleep(3) + sock.send("JOIN #%s\r\n" % chan) + sock.send("PRIVMSG %s :xdcc send #%s\r\n" % (bot, pack)) + + # IRC recv loop + readbuffer = "" + done = False + retry = None + m = None + while True: + + # done is set if we got our real link + if done: + break + + if retry: + if time.time() > retry: + retry = None + dl_time = time.time() + sock.send("PRIVMSG %s :xdcc send #%s\r\n" % (bot, pack)) + + else: + if (dl_time + self.timeout) < time.time(): # todo: add in config + sock.send("QUIT :byebye\r\n") + sock.close() + self.fail("XDCC Bot did not answer") + + fdset = select([sock], [], [], 0) + if sock not in fdset[0]: + continue + + readbuffer += sock.recv(1024) + temp = readbuffer.split("\n") + readbuffer = temp.pop() + + for line in temp: + if self.debug is 2: + print "*> " + unicode(line, errors='ignore') + line = line.rstrip() + first = line.split() + + if first[0] == "PING": + sock.send("PONG %s\r\n" % first[1]) + + if first[0] == "ERROR": + self.fail("IRC-Error: %s" % line) + + msg = line.split(None, 3) + if len(msg) != 4: + continue + + msg = { + "origin": msg[0][1:], + "action": msg[1], + "target": msg[2], + "text": msg[3][1:] + } + + if nick == msg["target"][0:len(nick)] and "PRIVMSG" == msg["action"]: + if msg["text"] == "\x01VERSION\x01": + self.logDebug("XDCC: Sending CTCP VERSION.") + sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface")) + elif msg["text"] == "\x01TIME\x01": + self.logDebug("Sending CTCP TIME.") + sock.send("NOTICE %s :%d\r\n" % (msg['origin'], time.time())) + elif msg["text"] == "\x01LAG\x01": + pass # don't know how to answer + + if not (bot == msg["origin"][0:len(bot)] + and nick == msg["target"][0:len(nick)] + and msg["action"] in ("PRIVMSG", "NOTICE")): + continue + + if self.debug is 1: + print "%s: %s" % (msg["origin"], msg["text"]) + + if "You already requested that pack" in msg["text"]: + retry = time.time() + 300 + + if "you must be on a known channel to request a pack" in msg["text"]: + self.fail("Wrong channel") + + m = re.match('\x01DCC SEND (.*?) (\d+) (\d+)(?: (\d+))?\x01', msg["text"]) + if m: + done = True + + # get connection data + ip = socket.inet_ntoa(struct.pack('L', socket.ntohl(int(m.group(2))))) + port = int(m.group(3)) + packname = m.group(1) + + if len(m.groups()) > 3: + self.req.filesize = int(m.group(4)) + + self.pyfile.name = packname + filename = save_join(location, packname) + self.logInfo("XDCC: Downloading %s from %s:%d" % (packname, ip, port)) + + self.pyfile.setStatus("downloading") + newname = self.req.download(ip, port, filename, sock, self.pyfile.setProgress) + if newname and newname != filename: + self.logInfo("%(name)s saved as %(newname)s" % {"name": self.pyfile.name, "newname": newname}) + filename = newname + + # kill IRC socket + # sock.send("QUIT :byebye\r\n") + sock.close() + + self.lastDownload = filename + return self.lastDownload diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py index 901225944..37eaa17e5 100644 --- a/module/plugins/hoster/YibaishiwuCom.py +++ b/module/plugins/hoster/YibaishiwuCom.py @@ -20,6 +20,7 @@ import re from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.common.json_layer import json_loads + class YibaishiwuCom(SimpleHoster): __name__ = "YibaishiwuCom" __type__ = "hoster" @@ -31,24 +32,27 @@ class YibaishiwuCom(SimpleHoster): FILE_NAME_PATTERN = r"file_name: '(?P<N>[^']+)'" FILE_SIZE_PATTERN = r"file_size: '(?P<S>[^']+)'" FILE_OFFLINE_PATTERN = ur'<h3><i style="color:red;">哎呀！提取码不存在！不妨搜搜看吧！</i></h3>' - - AJAX_URL_PATTERN = r'(/\?ct=(pickcode|download)[^"\']+)' - + + AJAX_URL_PATTERN = r'(/\?ct=(pickcode|download)[^"\']+)' + def handleFree(self): found = re.search(self.AJAX_URL_PATTERN, self.html) - if not found: self.parseError("AJAX URL") + if not found: + self.parseError("AJAX URL") url = found.group(1) self.logDebug(('FREEUSER' if found.group(2) == 'download' else 'GUEST') + ' URL', url) - - response = json_loads(self.load("http://115.com" + url, decode = False)) - for mirror in (response['urls'] if 'urls' in response else response['data'] if 'data' in response else []): + + response = json_loads(self.load("http://115.com" + url, decode=False)) + for mirror in (response['urls'] if 'urls' in response else response['data'] if 'data' in response else []): try: - url = mirror['url'].replace('\\','') + url = mirror['url'].replace('\\', '') self.logDebug("Trying URL: " + url) self.download(url) break except: continue - else: self.fail('No working link found') + else: + self.fail('No working link found') + getInfo = create_getInfo(YibaishiwuCom) diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py index b17a4ef80..d029db7ba 100644 --- a/module/plugins/hoster/YoupornCom.py +++ b/module/plugins/hoster/YoupornCom.py @@ -4,6 +4,7 @@ import re from module.plugins.Hoster import Hoster + class YoupornCom(Hoster): __name__ = "YoupornCom" __type__ = "hoster" @@ -15,19 +16,19 @@ class YoupornCom(Hoster): def setup(self): self.html = None - + def process(self, pyfile): self.pyfile = pyfile - + if not self.file_exists(): self.offline() - + self.pyfile.name = self.get_file_name() self.download(self.get_file_url()) def download_html(self): url = self.pyfile.url - self.html = self.load(url, post={"user_choice":"Enter"}, cookies=False) + self.html = self.load(url, post={"user_choice": "Enter"}, cookies=False) def get_file_url(self): """ returns the absolute downloadable filepath @@ -43,7 +44,7 @@ class YoupornCom(Hoster): self.download_html() file_name_pattern = r"<title>(.*) - Free Porn Videos - YouPorn</title>" - return re.search(file_name_pattern, self.html).group(1).replace("&", "&").replace("/","") + '.flv' + return re.search(file_name_pattern, self.html).group(1).replace("&", "&").replace("/", "") + '.flv' def file_exists(self): """ returns True or False diff --git a/module/plugins/hoster/YourfilesTo.py b/module/plugins/hoster/YourfilesTo.py index b67ccb68d..8c0784205 100644 --- a/module/plugins/hoster/YourfilesTo.py +++ b/module/plugins/hoster/YourfilesTo.py @@ -1,83 +1,81 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-from module.plugins.Hoster import Hoster
-
-class YourfilesTo(Hoster):
- __name__ = "YourfilesTo"
- __type__ = "hoster"
- __pattern__ = r"(http://)?(www\.)?yourfiles\.(to|biz)/\?d=[a-zA-Z0-9]+"
- __version__ = "0.2"
- __description__ = """Youfiles.to Download Hoster"""
- __author_name__ = ("jeix", "skydancer")
- __author_mail__ = ("jeix@hasnomail.de", "skydancer@hasnomail.de")
-
- def setup(self):
- self.html = None
- self.multiDL = True
-
- def process(self,pyfile):
- self.pyfile = pyfile
- self.prepare()
- self.download(self.get_file_url())
-
- def prepare(self):
- if not self.file_exists():
- self.offline()
-
- self.pyfile.name = self.get_file_name()
-
- wait_time = self.get_waiting_time()
- self.setWait(wait_time)
- self.log.debug("%s: Waiting %d seconds." % (self.__name__,wait_time))
- self.wait()
-
- def get_waiting_time(self):
- if self.html is None:
- self.download_html()
-
- #var zzipitime = 15;
- m = re.search(r'var zzipitime = (\d+);', self.html)
- if m:
- sec = int(m.group(1))
- else:
- sec = 0
-
- return sec
-
- def download_html(self):
- url = self.pyfile.url
- self.html = self.load(url)
-
- def get_file_url(self):
- """ returns the absolute downloadable filepath
- """
- url = re.search(r"var bla = '(.*?)';", self.html)
- if url:
- url = url.group(1)
- url = urllib.unquote(url.replace("http://http:/http://", "http://").replace("dumdidum", ""))
- return url
- else:
- self.fail("absolute filepath could not be found. offline? ")
-
- def get_file_name(self):
- if self.html is None:
- self.download_html()
-
- return re.search("<title>(.*)</title>", self.html).group(1)
-
- def file_exists(self):
- """ returns True or False
- """
- if self.html is None:
- self.download_html()
-
- if re.search(r"HTTP Status 404", self.html) is not None:
- return False
- else:
- return True
-
-
-
+#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re +import urllib +from module.plugins.Hoster import Hoster + + +class YourfilesTo(Hoster): + __name__ = "YourfilesTo" + __type__ = "hoster" + __pattern__ = r"(http://)?(www\.)?yourfiles\.(to|biz)/\?d=[a-zA-Z0-9]+" + __version__ = "0.21" + __description__ = """Youfiles.to Download Hoster""" + __author_name__ = ("jeix", "skydancer") + __author_mail__ = ("jeix@hasnomail.de", "skydancer@hasnomail.de") + + def setup(self): + self.html = None + self.multiDL = True + + def process(self, pyfile): + self.pyfile = pyfile + self.prepare() + self.download(self.get_file_url()) + + def prepare(self): + if not self.file_exists(): + self.offline() + + self.pyfile.name = self.get_file_name() + + wait_time = self.get_waiting_time() + self.setWait(wait_time) + self.logDebug("%s: Waiting %d seconds." % (self.__name__, wait_time)) + self.wait() + + def get_waiting_time(self): + if self.html is None: + self.download_html() + + #var zzipitime = 15; + m = re.search(r'var zzipitime = (\d+);', self.html) + if m: + sec = int(m.group(1)) + else: + sec = 0 + + return sec + + def download_html(self): + url = self.pyfile.url + self.html = self.load(url) + + def get_file_url(self): + """ returns the absolute downloadable filepath + """ + url = re.search(r"var bla = '(.*?)';", self.html) + if url: + url = url.group(1) + url = urllib.unquote(url.replace("http://http:/http://", "http://").replace("dumdidum", "")) + return url + else: + self.fail("absolute filepath could not be found. offline? ") + + def get_file_name(self): + if self.html is None: + self.download_html() + + return re.search("<title>(.*)</title>", self.html).group(1) + + def file_exists(self): + """ returns True or False + """ + if self.html is None: + self.download_html() + + if re.search(r"HTTP Status 404", self.html) is not None: + return False + else: + return True diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index 129b948bf..1db5fc0a4 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -10,10 +10,12 @@ from urllib import unquote from module.utils import html_unescape from module.plugins.Hoster import Hoster + def which(program): """Works exactly like the unix command which Courtesy of http://stackoverflow.com/a/377028/675646""" + def is_exe(fpath): return os.path.isfile(fpath) and os.access(fpath, os.X_OK) @@ -30,45 +32,45 @@ def which(program): return None + class YoutubeCom(Hoster): __name__ = "YoutubeCom" __type__ = "hoster" __pattern__ = r"https?://(?:[^/]*?)youtube\.com/watch.*?[?&]v=.*" __version__ = "0.34" __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), - (".flv", "bool", "Allow .flv", True), - (".webm", "bool", "Allow .webm", False), - (".3gp", "bool", "Allow .3gp", False), - ("3d", "bool", "Prefer 3D", False)] + ("fmt", "int", "FMT/ITAG Number (5-102, 0 for auto)", 0), + (".mp4", "bool", "Allow .mp4", True), + (".flv", "bool", "Allow .flv", True), + (".webm", "bool", "Allow .webm", False), + (".3gp", "bool", "Allow .3gp", False), + ("3d", "bool", "Prefer 3D", False)] __description__ = """Youtube.com Video Download Hoster""" __author_name__ = ("spoob", "zoidberg") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz") # name, width, height, quality ranking, 3D formats = {5: (".flv", 400, 240, 1, False), - 6: (".flv", 640, 400, 4, False), + 6: (".flv", 640, 400, 4, False), 17: (".3gp", 176, 144, 0, False), 18: (".mp4", 480, 360, 2, False), 22: (".mp4", 1280, 720, 8, False), 43: (".webm", 640, 360, 3, False), 34: (".flv", 640, 360, 4, False), 35: (".flv", 854, 480, 6, False), - 36: (".3gp", 400, 240, 1, False), + 36: (".3gp", 400, 240, 1, False), 37: (".mp4", 1920, 1080, 9, False), 38: (".mp4", 4096, 3072, 10, False), 44: (".webm", 854, 480, 5, False), 45: (".webm", 1280, 720, 7, False), - 46: (".webm", 1920, 1080, 9, False), - 82: (".mp4", 640, 360, 3, True), - 83: (".mp4", 400, 240, 1, True), - 84: (".mp4", 1280, 720, 8, True), - 85: (".mp4", 1920, 1080, 9, True), - 100: (".webm", 640, 360, 3, True), - 101: (".webm", 640, 360, 4, True), - 102: (".webm", 1280, 720, 8, True) - } + 46: (".webm", 1920, 1080, 9, False), + 82: (".mp4", 640, 360, 3, True), + 83: (".mp4", 400, 240, 1, True), + 84: (".mp4", 1280, 720, 8, True), + 85: (".mp4", 1920, 1080, 9, True), + 100: (".webm", 640, 360, 3, True), + 101: (".webm", 640, 360, 4, True), + 102: (".webm", 1280, 720, 8, True)} def setup(self): self.resumeDownload = self.multiDL = True @@ -85,9 +87,11 @@ class YoutubeCom(Hoster): #get config use3d = self.getConfig("3d") if use3d: - quality = {"sd":82,"hd":84,"fullhd":85,"240p":83,"360p":82,"480p":82,"720p":84,"1080p":85,"3072p":85} + quality = {"sd": 82, "hd": 84, "fullhd": 85, "240p": 83, "360p": 82, + "480p": 82, "720p": 84, "1080p": 85, "3072p": 85} else: - quality = {"sd":18,"hd":22,"fullhd":37,"240p":5,"360p":18,"480p":35,"720p":22,"1080p":37,"3072p":38} + quality = {"sd": 18, "hd": 22, "fullhd": 37, "240p": 5, "360p": 18, + "480p": 35, "720p": 22, "1080p": 37, "3072p": 38} desired_fmt = self.getConfig("fmt") if desired_fmt and desired_fmt not in self.formats: self.logWarning("FMT %d unknown - using default." % desired_fmt) @@ -98,7 +102,7 @@ class YoutubeCom(Hoster): #parse available streams 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 = [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] #self.logDebug("Found links: %s" % streams) self.logDebug("AVAILABLE STREAMS: %s" % [x[0] for x in streams]) @@ -111,22 +115,19 @@ class YoutubeCom(Hoster): fmt_dict = dict([x for x in streams if self.formats[x[0]][4] == use3d] or streams) self.logDebug("DESIRED STREAM: ITAG:%d (%s) %sfound, %sallowed" % - (desired_fmt, - "%s %dx%d Q:%d 3D:%s" % self.formats[desired_fmt], - "" if desired_fmt in fmt_dict else "NOT ", - "" if allowed(desired_fmt) else "NOT ") - ) + (desired_fmt, "%s %dx%d Q:%d 3D:%s" % self.formats[desired_fmt], + "" if desired_fmt in fmt_dict else "NOT ", "" if allowed(desired_fmt) else "NOT ")) #return fmt nearest to quality index if desired_fmt in fmt_dict and allowed(desired_fmt): fmt = desired_fmt else: - sel = lambda x: self.formats[x][3] #select quality index + sel = lambda x: self.formats[x][3] # select quality index comp = lambda x, y: abs(sel(x) - sel(y)) self.logDebug("Choosing nearest fmt: %s" % [(x, allowed(x), comp(x, desired_fmt)) for x in fmt_dict.keys()]) fmt = reduce(lambda x, y: x if comp(x, desired_fmt) <= comp(y, desired_fmt) and - sel(x) > sel(y) else y, fmt_dict.keys()) + sel(x) > sel(y) else y, fmt_dict.keys()) self.logDebug("Chosen fmt: %s" % fmt) url = fmt_dict[fmt] diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index ea45f4fd8..9940fd078 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -1,4 +1,3 @@ - import re from xml.etree.ElementTree import fromstring @@ -6,6 +5,7 @@ from module.plugins.Hoster import Hoster XML_API = "http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?id=%i" + class ZDF(Hoster): # Based on zdfm by Roland Beermann # http://github.com/enkore/zdfm/ @@ -23,7 +23,7 @@ class ZDF(Hoster): @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") @staticmethod def get_id(url): @@ -40,7 +40,8 @@ class ZDF(Hoster): title = video.findtext("information/title") pyfile.name = title - - target_url = sorted((v for v in video.iter("formitaet") if self.video_valid(v)), key=self.video_key)[-1].findtext("url") + + target_url = sorted((v for v in video.iter("formitaet") if self.video_valid(v)), + key=self.video_key)[-1].findtext("url") self.download(target_url) diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index cbedfcb68..e8b832a13 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -1,108 +1,106 @@ -#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from module.plugins.Hoster import Hoster
-from module.utils import html_unescape
-from urllib import quote, unquote
-from time import sleep
-
-class ZeveraCom(Hoster):
- __name__ = "ZeveraCom"
- __version__ = "0.20"
- __type__ = "hoster"
- __pattern__ = r"http://zevera.com/.*"
- __description__ = """zevera.com hoster plugin"""
- __author_name__ = ("zoidberg")
- __author_mail__ = ("zoidberg@mujmail.cz")
-
- def setup(self):
- self.resumeDownload = self.multiDL = True
- self.chunkLimit = 1
-
- def process(self, pyfile):
- if not self.account:
- self.logError(_("Please enter your zevera.com account or deactivate this plugin"))
- self.fail("No zevera.com account provided")
-
- self.logDebug("zevera.com: Old URL: %s" % pyfile.url)
-
- if self.account.getAPIData(self.req, cmd = "checklink", olink = pyfile.url) != "Alive":
- self.fail("Offline or not downloadable - contact Zevera support")
-
- header = self.account.getAPIData(self.req, just_header = True, cmd="generatedownloaddirect", olink = pyfile.url)
- if not "location" in header:
- self.fail("Unable to initialize download - contact Zevera support")
-
- self.download(header['location'], disposition = True)
-
- check = self.checkDownload({"error" : 'action="ErrorDownload.aspx'})
- if check == "error":
- self.fail("Error response received - contact Zevera support")
-
- """
- # BitAPI not used - defunct, probably abandoned by Zevera
-
- api_url = "http://zevera.com/API.ashx"
-
- def process(self, pyfile):
- if not self.account:
- self.logError(_("Please enter your zevera.com account or deactivate this plugin"))
- self.fail("No zevera.com account provided")
-
- self.logDebug("zevera.com: Old URL: %s" % pyfile.url)
-
- last_size = retries = 0
- olink = self.pyfile.url #quote(self.pyfile.url.encode('utf_8'))
-
- for i in range(100):
- self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_request', olink = olink)
- self.checkAPIErrors(self.retData)
-
- if self.retData['FileInfo']['StatusID'] == 100:
- break
- elif self.retData['FileInfo']['StatusID'] == 99:
- self.fail('Failed to initialize download (99)')
- else:
- if self.retData['FileInfo']['Progress']['BytesReceived'] <= last_size:
- if retries >= 6:
- self.fail('Failed to initialize download (%d)' % self.retData['FileInfo']['StatusID'] )
- retries += 1
- else:
- retries = 0
-
- last_size = self.retData['FileInfo']['Progress']['BytesReceived']
-
- self.setWait(self.retData['Update_Wait'])
- self.wait()
-
- pyfile.name = self.retData['FileInfo']['RealFileName']
- pyfile.size = self.retData['FileInfo']['FileSizeInBytes']
-
- self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_start', FileID = self.retData['FileInfo']['FileID'])
- self.checkAPIErrors(self.retData)
-
- self.download(self.api_url, get = {
- 'cmd': "open_stream",
- 'login': self.account.loginname,
- 'pass': self.account.password,
- 'FileID': self.retData['FileInfo']['FileID'],
- 'startBytes': 0
- }
- )
-
- def checkAPIErrors(self, retData):
- if not retData:
- self.fail('Unknown API response')
-
- if retData['ErrorCode']:
- self.logError(retData['ErrorCode'], retData['ErrorMessage'])
- #self.fail('ERROR: ' + retData['ErrorMessage'])
-
- if self.pyfile.size / 1024000 > retData['AccountInfo']['AvailableTODAYTrafficForUseInMBytes']:
- self.logWarning("Not enough data left to download the file")
-
- def crazyDecode(self, ustring):
- # accepts decoded ie. unicode string - API response is double-quoted, double-utf8-encoded
- # no idea what the proper order of calling these functions would be :-/
- return html_unescape(unquote(unquote(ustring.replace('@DELIMITER@','#'))).encode('raw_unicode_escape').decode('utf-8'))
- """
\ No newline at end of file +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +from module.plugins.Hoster import Hoster + + +class ZeveraCom(Hoster): + __name__ = "ZeveraCom" + __version__ = "0.21" + __type__ = "hoster" + __pattern__ = r"http://zevera.com/.*" + __description__ = """zevera.com hoster plugin""" + __author_name__ = ("zoidberg") + __author_mail__ = ("zoidberg@mujmail.cz") + + 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") % "zevera.com") + self.fail("No zevera.com account provided") + + self.logDebug("zevera.com: Old URL: %s" % pyfile.url) + + if self.account.getAPIData(self.req, cmd="checklink", olink=pyfile.url) != "Alive": + self.fail("Offline or not downloadable - contact Zevera support") + + header = self.account.getAPIData(self.req, just_header=True, cmd="generatedownloaddirect", olink=pyfile.url) + if not "location" in header: + self.fail("Unable to initialize download - contact Zevera support") + + self.download(header['location'], disposition=True) + + check = self.checkDownload({"error": 'action="ErrorDownload.aspx'}) + if check == "error": + self.fail("Error response received - contact Zevera support") + + # BitAPI not used - defunct, probably abandoned by Zevera + # + # api_url = "http://zevera.com/API.ashx" + # + # def process(self, pyfile): + # if not self.account: + # self.logError(_("Please enter your zevera.com account or deactivate this plugin")) + # self.fail("No zevera.com account provided") + # + # self.logDebug("zevera.com: Old URL: %s" % pyfile.url) + # + # last_size = retries = 0 + # olink = self.pyfile.url #quote(self.pyfile.url.encode('utf_8')) + # + # for i in range(100): + # self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_request', olink = olink) + # self.checkAPIErrors(self.retData) + # + # if self.retData['FileInfo']['StatusID'] == 100: + # break + # elif self.retData['FileInfo']['StatusID'] == 99: + # self.fail('Failed to initialize download (99)') + # else: + # if self.retData['FileInfo']['Progress']['BytesReceived'] <= last_size: + # if retries >= 6: + # self.fail('Failed to initialize download (%d)' % self.retData['FileInfo']['StatusID'] ) + # retries += 1 + # else: + # retries = 0 + # + # last_size = self.retData['FileInfo']['Progress']['BytesReceived'] + # + # self.setWait(self.retData['Update_Wait']) + # self.wait() + # + # pyfile.name = self.retData['FileInfo']['RealFileName'] + # pyfile.size = self.retData['FileInfo']['FileSizeInBytes'] + # + # self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_start', + # FileID = self.retData['FileInfo']['FileID']) + # self.checkAPIErrors(self.retData) + # + # self.download(self.api_url, get = { + # 'cmd': "open_stream", + # 'login': self.account.loginname, + # 'pass': self.account.password, + # 'FileID': self.retData['FileInfo']['FileID'], + # 'startBytes': 0 + # } + # ) + # + # def checkAPIErrors(self, retData): + # if not retData: + # self.fail('Unknown API response') + # + # if retData['ErrorCode']: + # self.logError(retData['ErrorCode'], retData['ErrorMessage']) + # #self.fail('ERROR: ' + retData['ErrorMessage']) + # + # if self.pyfile.size / 1024000 > retData['AccountInfo']['AvailableTODAYTrafficForUseInMBytes']: + # self.logWarning("Not enough data left to download the file") + # + # def crazyDecode(self, ustring): + # # accepts decoded ie. unicode string - API response is double-quoted, double-utf8-encoded + # # no idea what the proper order of calling these functions would be :-/ + # return html_unescape(unquote(unquote(ustring.replace( + # '@DELIMITER@','#'))).encode('raw_unicode_escape').decode('utf-8')) diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 756a92ef3..3c7b68bb6 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -1,21 +1,26 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import re, subprocess, tempfile, os +import re +import subprocess +import tempfile +import os + from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp -from module.plugins.ReCaptcha import ReCaptcha +from module.plugins.internal.CaptchaService import ReCaptcha from module.common.json_layer import json_loads + 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.38" + __version__ = "0.39" __description__ = """Zippyshare.com Download Hoster""" __author_name__ = ("spoob", "zoidberg", "stickell") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") __config__ = [("swfdump_path", "string", "Path to swfdump", "")] - + FILE_NAME_PATTERN = r'>Name:</font>\s*<font [^>]*>(?P<N>[^<]+)</font><br />' FILE_SIZE_PATTERN = r'>Size:</font>\s*<font [^>]*>(?P<S>[0-9.,]+) (?P<U>[kKMG]+)i?B</font><br />' FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";' @@ -26,34 +31,35 @@ class ZippyshareCom(SimpleHoster): CAPTCHA_KEY_PATTERN = r'Recaptcha.create\("([^"]+)"' CAPTCHA_SHORTENCODE_PATTERN = r"shortencode: '([^']+)'" CAPTCHA_DOWNLOAD_PATTERN = r"document.location = '([^']+)'" - - LAST_KNOWN_VALUES = (9, 2374755) #time = (seed * multiply) % modulo + + LAST_KNOWN_VALUES = (9, 2374755) # time = (seed * multiply) % modulo def setup(self): self.html = None self.wantReconnect = False self.multiDL = True - def handleFree(self): + def handleFree(self): url = self.get_file_url() - if not url: self.fail("Download URL not found.") + if not url: + self.fail("Download URL not found.") self.logDebug("Download URL %s" % url) - self.download(url, cookies = True) - + self.download(url, cookies=True) + check = self.checkDownload({ "swf_values": re.compile(self.SEED_PATTERN) }) if check == "swf_values": - swf_sts = self.getStorage("swf_sts") + swf_sts = self.getStorage("swf_sts") if not swf_sts: self.setStorage("swf_sts", 2) self.setStorage("swf_stamp", 0) elif swf_sts == '1': self.setStorage("swf_sts", 2) - - self.retry(max_tries = 1) - + + self.retry(max_tries=1) + def get_file_url(self): """ returns the absolute downloadable filepath """ @@ -73,54 +79,55 @@ class ZippyshareCom(SimpleHoster): seed_search = re.search(self.SEED_PATTERN, self.html) if seed_search: swf_url, file_seed = seed_search.groups() - + swf_sts = self.getStorage("swf_sts") swf_stamp = int(self.getStorage("swf_stamp") or 0) swf_version = self.getStorage("version") self.logDebug("SWF", swf_sts, swf_stamp, swf_version) - - if not swf_sts: + + if not swf_sts: self.logDebug('Using default values') multiply, modulo = self.LAST_KNOWN_VALUES elif swf_sts == "1": - self.logDebug('Using stored values') + self.logDebug('Using stored values') multiply = self.getStorage("multiply") modulo = self.getStorage("modulo") - elif swf_sts == "2": + elif swf_sts == "2": if swf_version < self.__version__: - self.logDebug('Reverting to default values') + self.logDebug('Reverting to default values') self.setStorage("swf_sts", "") self.setStorage("version", self.__version__) - multiply, modulo = self.LAST_KNOWN_VALUES + multiply, modulo = self.LAST_KNOWN_VALUES elif (swf_stamp + 3600000) < timestamp(): swfdump = self.get_swfdump_path() - if swfdump: + if swfdump: multiply, modulo = self.get_swf_values(self.file_info['HOST'] + swf_url, swfdump) else: - self.logWarning("Swfdump not found. Install swftools to bypass captcha.") - + self.logWarning("Swfdump not found. Install swftools to bypass captcha.") + if multiply and modulo: - self.logDebug("TIME = (%s * %s) %s" % (file_seed, multiply, modulo)) - url = "/download?key=%s&time=%d" % (self.file_info['KEY'], (int(file_seed) * int(multiply)) % int(modulo)) - + self.logDebug("TIME = (%s * %s) %s" % (file_seed, multiply, modulo)) + url = "/download?key=%s&time=%d" % (self.file_info['KEY'], + (int(file_seed) * int(multiply)) % int(modulo)) + if not url: #Method #3: Captcha url = self.do_recaptcha() - + return self.file_info['HOST'] + url - + def get_swf_values(self, swf_url, swfdump): self.logDebug('Parsing values from %s' % swf_url) - multiply = modulo = None - + multiply = modulo = None + fd, fpath = tempfile.mkstemp() try: swf_data = self.load(swf_url) os.write(fd, swf_data) - + p = subprocess.Popen([swfdump, '-a', fpath], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate() - + if err: self.logError(err) else: @@ -128,9 +135,9 @@ class ZippyshareCom(SimpleHoster): multiply = re.search(r'pushbyte (\d+)', m_str).group(1) modulo = re.search(r'pushint (\d+)', m_str).group(1) finally: - os.close(fd) + os.close(fd) os.remove(fpath) - + if multiply and modulo: self.setStorage("multiply", multiply) self.setStorage("modulo", modulo) @@ -139,16 +146,16 @@ class ZippyshareCom(SimpleHoster): else: self.logError("Parsing SWF failed: swfdump not installed or plugin out of date") self.setStorage("swf_sts", 2) - - self.setStorage("swf_stamp", timestamp()) - + + self.setStorage("swf_stamp", timestamp()) + return multiply, modulo - + def get_swfdump_path(self): # used for detecting if swfdump is installed def is_exe(ppath): return os.path.isfile(ppath) and os.access(ppath, os.X_OK) - + program = self.getConfig("swfdump_path") or "swfdump" swfdump = None ppath, pname = os.path.split(program) @@ -160,33 +167,35 @@ class ZippyshareCom(SimpleHoster): exe_file = os.path.join(ppath, program) if is_exe(exe_file): swfdump = exe_file - + # return path to the executable or None if not found return swfdump - + def do_recaptcha(self): self.logDebug('Trying to solve captcha') captcha_key = re.search(self.CAPTCHA_KEY_PATTERN, self.html).group(1) shortencode = re.search(self.CAPTCHA_SHORTENCODE_PATTERN, self.html).group(1) - url = re.search(self.CAPTCHA_DOWNLOAD_PATTERN, self.html).group(1) - + url = re.search(self.CAPTCHA_DOWNLOAD_PATTERN, self.html).group(1) + recaptcha = ReCaptcha(self) for i in range(5): challenge, code = recaptcha.challenge(captcha_key) response = json_loads(self.load(self.file_info['HOST'] + '/rest/captcha/test', - post={'challenge': challenge, - 'response': code, - 'shortencode': shortencode})) + post={'challenge': challenge, + 'response': code, + 'shortencode': shortencode})) self.logDebug("reCaptcha response : %s" % response) if response == True: - self.correctCaptcha + self.correctCaptcha() break else: self.invalidCaptcha() - else: self.fail("Invalid captcha") - - return url + else: + self.fail("Invalid captcha") + + return url + -getInfo = create_getInfo(ZippyshareCom)
\ No newline at end of file +getInfo = create_getInfo(ZippyshareCom) diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index d935bf1da..546b920e0 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -25,7 +25,7 @@ from module.utils import html_unescape class SimpleCrypter(Crypter): __name__ = "SimpleCrypter" - __version__ = "0.04" + __version__ = "0.05" __pattern__ = None __type__ = "crypter" __description__ = """Base crypter plugin""" @@ -39,6 +39,15 @@ class SimpleCrypter(Crypter): TITLE_PATTERN: (optional) the group defined by 'title' should be the title example: <title>Files of: (?P<title>[^<]+) folder</title> + + If the links are disposed on multiple pages you need to define a pattern: + + PAGES_PATTERN: the group defined by 'pages' must be the total number of pages + + and a function: + + loadPage(self, page_n): + must return the html of the page number 'page_n' """ def decrypt(self, pyfile): @@ -46,11 +55,15 @@ class SimpleCrypter(Crypter): package_name, folder_name = self.getPackageNameAndFolder() - package_links = re.findall(self.LINK_PATTERN, self.html) - self.logDebug('Package has %d links' % len(package_links)) + self.package_links = re.findall(self.LINK_PATTERN, self.html) + + if hasattr(self, 'PAGES_PATTERN') and hasattr(self, 'loadPage'): + self.handleMultiPages() - if package_links: - self.packages = [(package_name, package_links, folder_name)] + self.logDebug('Package has %d links' % len(self.package_links)) + + if self.package_links: + self.packages = [(package_name, self.package_links, folder_name)] else: self.fail('Could not extract any links') @@ -66,3 +79,14 @@ class SimpleCrypter(Crypter): folder = self.pyfile.package().folder self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) return name, folder + + def handleMultiPages(self): + pages = re.search(self.PAGES_PATTERN, self.html) + if pages: + pages = int(pages.group('pages')) + else: + pages = 1 + + for p in range(2, pages + 1): + self.html = self.loadPage(p) + self.package_links += re.findall(self.LINK_PATTERN, self.html) |