diff options
Diffstat (limited to 'module/plugins/crypter')
23 files changed, 118 insertions, 118 deletions
diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py index 9bab183cc..bbc00083b 100644 --- a/module/plugins/crypter/ChipDe.py +++ b/module/plugins/crypter/ChipDe.py @@ -22,9 +22,9 @@ class ChipDe(Crypter): def decrypt(self, pyfile): - self.html = self.load(pyfile.url) + self.data = self.load(pyfile.url) try: - f = re.search(r'"(http://video\.chip\.de/.+)"', self.html) + f = re.search(r'"(http://video\.chip\.de/.+)"', self.data) except Exception: self.fail(_("Failed to find the URL")) diff --git a/module/plugins/crypter/CloudzillaToFolder.py b/module/plugins/crypter/CloudzillaToFolder.py index 75ad74791..d1d8a2106 100644 --- a/module/plugins/crypter/CloudzillaToFolder.py +++ b/module/plugins/crypter/CloudzillaToFolder.py @@ -28,11 +28,11 @@ class CloudzillaToFolder(SimpleCrypter): def check_errors(self): - m = re.search(self.PASSWORD_PATTERN, self.html) + m = re.search(self.PASSWORD_PATTERN, self.data) if m is not None: - self.html = self.load(self.pyfile.url, get={'key': self.get_password()}) + self.data = self.load(self.pyfile.url, get={'key': self.get_password()}) - if re.search(self.PASSWORD_PATTERN, self.html): + if re.search(self.PASSWORD_PATTERN, self.data): self.retry(msg="Wrong password") diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index 233c5750a..ed517e79e 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -30,16 +30,16 @@ class DataHuFolder(SimpleCrypter): def prepare(self): super(DataHuFolder, self).prepare() - if u'K\xe9rlek add meg a jelsz\xf3t' in self.html: #: Password protected + if u'K\xe9rlek add meg a jelsz\xf3t' in self.data: #: Password protected password = self.get_password() if not password: self.fail(_("Password required")) self.log_debug("The folder is password protected', 'Using password: " + password) - self.html = self.load(self.pyfile.url, post={'mappa_pass': password}) + self.data = self.load(self.pyfile.url, post={'mappa_pass': password}) - if u'Hib\xe1s jelsz\xf3' in self.html: #: Wrong password + if u'Hib\xe1s jelsz\xf3' in self.data: #: Wrong password self.fail(_("Wrong password")) diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py index 271ae3985..0460411d2 100644 --- a/module/plugins/crypter/DevhostStFolder.py +++ b/module/plugins/crypter/DevhostStFolder.py @@ -34,7 +34,7 @@ class DevhostStFolder(SimpleCrypter): def check_name_size(self, getinfo=True): if not self.info or getinfo: self.log_debug("File info (BEFORE): %s" % self.info) - self.info.update(self.get_info(self.pyfile.url, self.html)) + self.info.update(self.get_info(self.pyfile.url, self.data)) self.log_debug("File info (AFTER): %s" % self.info) try: @@ -42,7 +42,7 @@ class DevhostStFolder(SimpleCrypter): raise p = r'href="(.+?)">Back to \w+<' - m = re.search(p, self.html) + m = re.search(p, self.data) html = self.load(urlparse.urljoin("http://d-h.st/", m.group(1)), cookies=False) diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py index f9b2a027c..9051260c2 100644 --- a/module/plugins/crypter/DlProtectCom.py +++ b/module/plugins/crypter/DlProtectCom.py @@ -35,10 +35,10 @@ class DlProtectCom(SimpleCrypter): if not re.match(r"https?://(?:www\.)?dl-protect\.com/.+", self.req.http.lastEffectiveURL): return [self.req.http.lastEffectiveURL] - post_req = {'key' : re.search(r'name="key" value="(.+?)"', self.html).group(1), + post_req = {'key' : re.search(r'name="key" value="(.+?)"', self.data).group(1), 'submitform': ""} - if "Please click on continue to see the links" in self.html: + if "Please click on continue to see the links" in self.data: post_req['submitform'] = "Continue" self.wait(2) @@ -49,22 +49,22 @@ class DlProtectCom(SimpleCrypter): post_req.update({'i' : b64time, 'submitform': "Decrypt+link"}) - if "Password :" in self.html: + if "Password :" in self.data: post_req['pwd'] = self.get_password() - if "Security Code" in self.html: - m = re.search(r'/captcha\.php\?key=(.+?)"', self.html) + if "Security Code" in self.data: + m = re.search(r'/captcha\.php\?key=(.+?)"', self.data) if m is not None: captcha_code = self.captcha.decrypt("http://www.dl-protect.com/captcha.php?key=" + m.group(1), input_type="gif") post_req['secure'] = captcha_code - self.html = self.load(self.pyfile.url, post=post_req) + self.data = self.load(self.pyfile.url, post=post_req) for errmsg in ("The password is incorrect", "The security code is incorrect"): - if errmsg in self.html: + if errmsg in self.data: self.fail(_(errmsg[1:])) - return re.findall(r'<a href="([^/].+?)" target="_blank">', self.html) + return re.findall(r'<a href="([^/].+?)" target="_blank">', self.data) getInfo = create_getInfo(DlProtectCom) diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index b72b76d7d..96a117dd7 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -28,10 +28,10 @@ class EmbeduploadCom(Crypter): def decrypt(self, pyfile): - self.html = self.load(pyfile.url) + self.data = self.load(pyfile.url) tmp_links = [] - m = re.findall(self.LINK_PATTERN, self.html) + m = re.findall(self.LINK_PATTERN, self.data) if m is not None: prefered_set = set(self.get_config('preferedHoster').split('|')) prefered_set = map(lambda s: s.lower().split('.')[0], prefered_set) diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 0f8b494f9..2cfc6b0b2 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -48,9 +48,9 @@ class FilecryptCc(Crypter): def decrypt(self, pyfile): - self.html = self.load(pyfile.url) + self.data = self.load(pyfile.url) - if "content notfound" in self.html: #@NOTE: "content notfound" is NOT a typo + if "content notfound" in self.data: #@NOTE: "content notfound" is NOT a typo self.offline() self.handle_password_protection() @@ -77,7 +77,7 @@ class FilecryptCc(Crypter): def handle_password_protection(self): - if '<input type="text" name="password"' not in self.html: + if '<input type="text" name="password"' not in self.data: return self.log_info(_("Folder is password protected")) @@ -87,15 +87,15 @@ class FilecryptCc(Crypter): if not password: self.fail(_("Please enter the password in package section and try again")) - self.html = self.load(self.pyfile.url, post={'password': password}) + self.data = self.load(self.pyfile.url, post={'password': password}) def handle_captcha(self): - if re.search(self.CAPTCHA_PATTERN, self.html): - m1 = re.search(self.INTERNAL_CAPTCHA_PATTERN, self.html) - m2 = re.search(self.CIRCLE_CAPTCHA_PATTERN, self.html) - m3 = re.search(self.SOLVE_MEDIA_PATTERN, self.html) - m4 = re.search(self.KEY_CAPTCHA_PATTERN, self.html) + if re.search(self.CAPTCHA_PATTERN, self.data): + m1 = re.search(self.INTERNAL_CAPTCHA_PATTERN, self.data) + m2 = re.search(self.CIRCLE_CAPTCHA_PATTERN, self.data) + m3 = re.search(self.SOLVE_MEDIA_PATTERN, self.data) + m4 = re.search(self.KEY_CAPTCHA_PATTERN, self.data) if m1: #: Normal captcha self.log_debug("Internal Captcha URL: %s" % urlparse.urljoin(self.pyfile.url, m1.group(1))) @@ -154,7 +154,7 @@ class FilecryptCc(Crypter): else: self.log_info(_("No captcha found")) - self.site_with_links = self.html + self.site_with_links = self.data diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py index 8f839bad0..615bcd4ba 100644 --- a/module/plugins/crypter/FreakhareComFolder.py +++ b/module/plugins/crypter/FreakhareComFolder.py @@ -29,7 +29,7 @@ class FreakhareComFolder(SimpleCrypter): def load_page(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) + m = re.search(r'http://freakshare.com/\?x=folder&f_id=(\d+)&f_md5=(\w+)', self.data) if m is not None: self.f_id = m.group(1) self.f_md5 = m.group(2) diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py index e959be93f..a967f81d4 100644 --- a/module/plugins/crypter/FreetexthostCom.py +++ b/module/plugins/crypter/FreetexthostCom.py @@ -23,7 +23,7 @@ class FreetexthostCom(SimpleCrypter): def get_links(self): - m = re.search(r'<div id="contentsinner">\s*(.+)<div class="viewcount">', self.html, re.S) + m = re.search(r'<div id="contentsinner">\s*(.+)<div class="viewcount">', self.data, re.S) if m is None: self.error(_("Unable to extract links")) links = m.group(1) diff --git a/module/plugins/crypter/Go4UpCom.py b/module/plugins/crypter/Go4UpCom.py index a2448755e..237827a1e 100755 --- a/module/plugins/crypter/Go4UpCom.py +++ b/module/plugins/crypter/Go4UpCom.py @@ -37,7 +37,7 @@ class Go4UpCom(SimpleCrypter): links = [] preference = self.get_config("preferred_hoster") - hosterslink_re = re.search(r'(/download/gethosts/.+?)"', self.html) + hosterslink_re = re.search(r'(/download/gethosts/.+?)"', self.data) if hosterslink_re: hosters = self.load(urlparse.urljoin("http://go4up.com/", hosterslink_re.group(1))) for hoster in json.loads(hosters): diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py index 1cc73fa05..60569a7de 100644 --- a/module/plugins/crypter/ImgurComAlbum.py +++ b/module/plugins/crypter/ImgurComAlbum.py @@ -27,7 +27,7 @@ class ImgurComAlbum(SimpleCrypter): def get_links(self): f = lambda url: "http://" + re.sub(r'(\w{7})s\.', r'\1.', url) - return uniqify(map(f, re.findall(self.LINK_PATTERN, self.html))) + return uniqify(map(f, re.findall(self.LINK_PATTERN, self.data))) getInfo = create_getInfo(ImgurComAlbum) diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index eaa901782..ae4398914 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -44,8 +44,8 @@ class LinkCryptWs(Crypter): #: Request package self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko") #: Better chance to not get those key-captchas - self.html = self.load(self.pyfile.url) - self.html = self.load(self.pyfile.url) + self.data = self.load(self.pyfile.url) + self.data = self.load(self.pyfile.url) def decrypt(self, pyfile): @@ -91,7 +91,7 @@ class LinkCryptWs(Crypter): def is_online(self): - if "<title>Linkcrypt.ws // Error 404</title>" in self.html: + if "<title>Linkcrypt.ws // Error 404</title>" in self.data: self.log_debug("Folder doesn't exist anymore") return False else: @@ -99,7 +99,7 @@ class LinkCryptWs(Crypter): def is_password_protected(self): - if "Authorizing" in self.html: + if "Authorizing" in self.data: self.log_debug("Links are password protected") return True else: @@ -107,7 +107,7 @@ class LinkCryptWs(Crypter): def is_captcha_protected(self): - if 'id="captcha">' in self.html: + if 'id="captcha">' in self.data: self.log_debug("Links are captcha protected") return True else: @@ -115,7 +115,7 @@ class LinkCryptWs(Crypter): def is_key_captcha_protected(self): - if re.search(r'>If the folder does not open after klick on <', self.html, re.I): + if re.search(r'>If the folder does not open after klick on <', self.data, re.I): return True else: return False @@ -126,16 +126,16 @@ class LinkCryptWs(Crypter): if password: self.log_debug("Submitting password [%s] for protected links" % password) - self.html = self.load(self.pyfile.url, post={'password': password, 'x': "0", 'y': "0"}) + self.data = self.load(self.pyfile.url, post={'password': password, 'x': "0", 'y': "0"}) else: self.fail(_("Folder is password protected")) def unlock_captcha_protection(self): - captcha_url = re.search(r'<form.*?id\s*?=\s*?"captcha"[^>]*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1) + captcha_url = re.search(r'<form.*?id\s*?=\s*?"captcha"[^>]*?>.*?<\s*?input.*?src="(.+?)"', self.data, re.I | re.S).group(1) captcha_code = self.captcha.decrypt(captcha_url, input_type="gif", output_type='positional') - self.html = self.load(self.pyfile.url, post={'x': captcha_code[0], 'y': captcha_code[1]}) + self.data = self.load(self.pyfile.url, post={'x': captcha_code[0], 'y': captcha_code[1]}) def get_package_info(self): @@ -148,7 +148,7 @@ class LinkCryptWs(Crypter): def getunrarpw(self): - sitein = self.html + sitein = self.data indexi = sitein.find("|source|") + 8 indexe = sitein.find("|", indexi) @@ -165,7 +165,7 @@ class LinkCryptWs(Crypter): def handle_captcha_errors(self): - if "Your choice was wrong" in self.html: + if "Your choice was wrong" in self.data: self.retry_captcha() else: self.captcha.correct() @@ -190,7 +190,7 @@ class LinkCryptWs(Crypter): package_links = [] pattern = r'<form action="http://linkcrypt.ws/out.html"[^>]*?>.*?<input[^>]*?value="(.+?)"[^>]*?name="file"' - ids = re.findall(pattern, self.html, re.I | re.S) + ids = re.findall(pattern, self.data, re.I | re.S) self.log_debug("Decrypting %d Web links" % len(ids)) @@ -215,7 +215,7 @@ class LinkCryptWs(Crypter): def get_container_html(self): self.container_html = [] - script = re.search(r'<div.*?id="ad_cont".*?<script.*?javascrip[^>]*?>(.*?)</script', self.html, re.I | re.S) + script = re.search(r'<div.*?id="ad_cont".*?<script.*?javascrip[^>]*?>(.*?)</script', self.data, re.I | re.S) if script: container_html_text = script.group(1) diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 2d2ace5a7..98e200982 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -36,36 +36,36 @@ class LinkdecrypterCom(MultiCrypter): retries = 5 post_dict = {'link_cache': "on", 'pro_links': pyfile.url, 'modo_links': "text"} - self.html = self.load('http://linkdecrypter.com/', post=post_dict) + self.data = self.load('http://linkdecrypter.com/', post=post_dict) while retries: - m = re.search(self.TEXTAREA_PATTERN, self.html, re.S) + m = re.search(self.TEXTAREA_PATTERN, self.data, re.S) if m is not None: self.urls = [x for x in m.group(1).splitlines() if '[LINK-ERROR]' not in x] - m = re.search(self.CAPTCHA_PATTERN, self.html) + m = re.search(self.CAPTCHA_PATTERN, self.data) if m is not None: captcha_url = 'http://linkdecrypter.com/' + m.group(1) result_type = "positional" if "getPos" in m.group(2) else "textual" - m = re.search(r"<p><i><b>([^<]+)</b></i></p>", self.html) + m = re.search(r"<p><i><b>([^<]+)</b></i></p>", self.data) msg = m.group(1) if m else "" self.log_info(_("Captcha protected link"), result_type, msg) captcha = self.captcha.decrypt(captcha_url, output_type=result_type) if result_type == "positional": captcha = "%d|%d" % captcha - self.html = self.load('http://linkdecrypter.com/', post={'captcha': captcha}) + self.data = self.load('http://linkdecrypter.com/', post={'captcha': captcha}) retries -= 1 - elif self.PASSWORD_PATTERN in self.html: + elif self.PASSWORD_PATTERN in self.data: if self.password: self.log_info(_("Password protected link")) - self.html = self.load('http://linkdecrypter.com/', + self.data = self.load('http://linkdecrypter.com/', post={'password': self.get_password()}) else: self.fail(_("Missing password")) else: retries -= 1 - self.html = self.load('http://linkdecrypter.com/') + self.data = self.load('http://linkdecrypter.com/') diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py index 669e0ebe0..84977e293 100644 --- a/module/plugins/crypter/LixIn.py +++ b/module/plugins/crypter/LixIn.py @@ -37,24 +37,24 @@ class LixIn(Crypter): id = m.group('ID') self.log_debug("File id is %s" % id) - self.html = self.load(url) + self.data = self.load(url) - m = re.search(self.SUBMIT_PATTERN, self.html) + m = re.search(self.SUBMIT_PATTERN, self.data) if m is None: self.error(_("Link doesn't seem valid")) - m = re.search(self.CAPTCHA_PATTERN, self.html) + m = re.search(self.CAPTCHA_PATTERN, self.data) if m is not None: captcharesult = self.captcha.decrypt(urlparse.urljoin("http://lix.in/", m.group(1))) - self.html = self.load(url, post={'capt': captcharesult, 'submit': "submit", 'tiny': id}) + self.data = self.load(url, post={'capt': captcharesult, 'submit': "submit", 'tiny': id}) - if re.search(self.CAPTCHA_PATTERN, self.html): + if re.search(self.CAPTCHA_PATTERN, self.data): self.fail(_("No captcha solved")) else: - self.html = self.load(url, post={'submit': "submit", 'tiny': id}) + self.data = self.load(url, post={'submit': "submit", 'tiny': id}) - m = re.search(self.LINK_PATTERN, self.html) + m = re.search(self.LINK_PATTERN, self.data) if m is None: self.error(_("Unable to find destination url")) else: diff --git a/module/plugins/crypter/MegaCoNzFolder.py b/module/plugins/crypter/MegaCoNzFolder.py index 8e58461ad..35b7e7473 100644 --- a/module/plugins/crypter/MegaCoNzFolder.py +++ b/module/plugins/crypter/MegaCoNzFolder.py @@ -27,8 +27,8 @@ class MegaCoNzFolder(Crypter): def decrypt(self, pyfile): url = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() - self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) - self.urls = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.html) + self.data = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url}) + self.urls = re.findall(r'(https://mega(\.co)?\.nz/#N!.+?)<', self.data) getInfo = create_getInfo(MegaCoNzFolder) diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py index 4a963d351..dc39dbe10 100644 --- a/module/plugins/crypter/MultiUpOrg.py +++ b/module/plugins/crypter/MultiUpOrg.py @@ -35,10 +35,10 @@ class MultiUpOrg(SimpleCrypter): pattern = r'style="width:97%;text-align:left".*\n.*href="(.*)"' if m_type == "download": dl_pattern = r'href="(.*)">.*\n.*<h5>DOWNLOAD</h5>' - mirror_page = urlparse.urljoin("http://www.multiup.org/", re.search(dl_pattern, self.html).group(1)) - self.html = self.load(mirror_page) + mirror_page = urlparse.urljoin("http://www.multiup.org/", re.search(dl_pattern, self.data).group(1)) + self.data = self.load(mirror_page) - return re.findall(pattern, self.html) + return re.findall(pattern, self.data) getInfo = create_getInfo(MultiUpOrg) diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index 58da4d982..870decbc6 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -28,14 +28,14 @@ class MultiloadCz(Crypter): def decrypt(self, pyfile): - self.html = self.load(pyfile.url) + self.data = self.load(pyfile.url) if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": - m = re.search(self.FOLDER_PATTERN, self.html) + m = re.search(self.FOLDER_PATTERN, self.data) if m is not None: self.urls.extend(m.group(1).split()) else: - m = re.findall(self.LINK_PATTERN, self.html) + m = re.findall(self.LINK_PATTERN, self.data) if m is not None: prefered_set = set(self.get_config('usedHoster').split('|')) self.urls.extend(x[1] for x in m if x[0] in prefered_set) diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index fb0138cd5..dfdd697f8 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -54,15 +54,15 @@ class NCryptIn(Crypter): else: #: Request folder home - self.html = self.request_folder_home() - self.cleaned_html = self.remove_html_crap(self.html) + self.data = self.request_folder_home() + self.cleaned_html = self.remove_html_crap(self.data) if not self.is_online(): self.offline() #: Check for folder protection if self.is_protected(): - self.html = self.unlock_protection() - self.cleaned_html = self.remove_html_crap(self.html) + self.data = self.unlock_protection() + self.cleaned_html = self.remove_html_crap(self.data) self.handle_errors() #: Prepare package name and folder @@ -121,7 +121,7 @@ class NCryptIn(Crypter): def get_package_info(self): - m = re.search(self.NAME_PATTERN, self.html) + m = re.search(self.NAME_PATTERN, self.data) if m is not None: name = folder = m.group('N').strip() self.log_debug("Found name [%s] and folder [%s] in package info" % (name, folder)) @@ -240,7 +240,7 @@ class NCryptIn(Crypter): package_links = [] pattern = r'/container/(rsdf|dlc|ccf)/(\w+)' - containersLinks = re.findall(pattern, self.html) + containersLinks = re.findall(pattern, self.data) self.log_debug("Decrypting %d Container links" % len(containersLinks)) for containerLink in containersLinks: link = "http://ncrypt.in/container/%s/%s.%s" % (containerLink[0], containerLink[1], containerLink[0]) @@ -252,7 +252,7 @@ class NCryptIn(Crypter): def handle_web_links(self): self.log_debug("Handling Web links") pattern = r'(http://ncrypt\.in/link-.*?=)' - links = re.findall(pattern, self.html) + links = re.findall(pattern, self.data) package_links = [] self.log_debug("Decrypting %d Web links" % len(links)) @@ -280,11 +280,11 @@ class NCryptIn(Crypter): #: Get jk jk_re = pattern % NCryptIn.JK_KEY - vjk = re.findall(jk_re, self.html) + vjk = re.findall(jk_re, self.data) #: Get crypted crypted_re = pattern % NCryptIn.CRYPTED_KEY - vcrypted = re.findall(crypted_re, self.html) + vcrypted = re.findall(crypted_re, self.data) #: Log and return self.log_debug("Detected %d crypted blocks" % len(vcrypted)) diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 21e8ab17b..453033921 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -107,24 +107,24 @@ class RelinkUs(Crypter): def request_package(self): - self.html = self.load(self.pyfile.url) + self.data = self.load(self.pyfile.url) def is_online(self): - if self.OFFLINE_TOKEN in self.html: + if self.OFFLINE_TOKEN in self.data: self.log_debug("File not found") return False return True def is_password_protected(self): - if self.PASSWORD_TOKEN in self.html: + if self.PASSWORD_TOKEN in self.data: self.log_debug("Links are password protected") return True def is_captcha_protected(self): - if self.CAPTCHA_TOKEN in self.html: + if self.CAPTCHA_TOKEN in self.data: self.log_debug("Links are captcha protected") return True return False @@ -138,7 +138,7 @@ class RelinkUs(Crypter): if password: passwd_url = self.PASSWORD_SUBMIT_URL + "?id=%s" % self.fileid passwd_data = {'id': self.fileid, 'password': password, 'pw': 'submit'} - self.html = self.load(passwd_url, post=passwd_data) + self.data = self.load(passwd_url, post=passwd_data) def unlock_captcha_protection(self): @@ -148,14 +148,14 @@ class RelinkUs(Crypter): self.log_debug("Captcha resolved, coords %s" % 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'} - self.html = self.load(captcha_post_url, post=captcha_post_data) + self.data = self.load(captcha_post_url, post=captcha_post_data) def get_package_info(self): name = folder = None #: Try to get info from web - m = re.search(self.FILE_TITLE_REGEX, self.html) + m = re.search(self.FILE_TITLE_REGEX, self.data) if m is not None: title = m.group(1).strip() if not self.FILE_NOTITLE in title: @@ -173,11 +173,11 @@ class RelinkUs(Crypter): def handle_errors(self): - if self.PASSWORD_ERROR_ROKEN in self.html: + if self.PASSWORD_ERROR_ROKEN in self.data: self.fail(_("Wrong password")) if self.captcha: - if self.CAPTCHA_ERROR_ROKEN in self.html: + if self.CAPTCHA_ERROR_ROKEN in self.data: self.retry_captcha() else: self.captcha.correct() @@ -197,7 +197,7 @@ class RelinkUs(Crypter): def handle_CNL2Links(self): self.log_debug("Search for CNL2 links") package_links = [] - m = re.search(self.CNL2_FORM_REGEX, self.html, re.S) + m = re.search(self.CNL2_FORM_REGEX, self.data, re.S) if m is not None: cnl2_form = m.group(1) try: @@ -214,7 +214,7 @@ class RelinkUs(Crypter): def handle_DLC_links(self): self.log_debug("Search for DLC links") package_links = [] - m = re.search(self.DLC_LINK_REGEX, self.html) + m = re.search(self.DLC_LINK_REGEX, self.data) if m is not None: container_url = self.DLC_DOWNLOAD_URL + "?id=%s&dlc=1" % self.fileid self.log_debug("Downloading DLC container link [%s]" % container_url) @@ -236,7 +236,7 @@ class RelinkUs(Crypter): self.log_debug("Search for WEB links") package_links = [] - params = re.findall(self.WEB_FORWARD_REGEX, self.html) + params = re.findall(self.WEB_FORWARD_REGEX, self.data) self.log_debug("Decrypting %d Web links" % len(params)) diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py index adacb0da6..209f27df8 100644 --- a/module/plugins/crypter/SafelinkingNet.py +++ b/module/plugins/crypter/SafelinkingNet.py @@ -42,13 +42,13 @@ class SafelinkingNet(Crypter): else: postData = {"post-protect": "1"} - self.html = self.load(url) + self.data = self.load(url) - if "link-password" in self.html: + if "link-password" in self.data: postData['link-password'] = self.get_password() - if "altcaptcha" in self.html: - m = re.search(self.SOLVEMEDIA_PATTERN, self.html) + if "altcaptcha" in self.data: + m = re.search(self.SOLVEMEDIA_PATTERN, self.data) if m is not None: captchaKey = m.group(1) captcha = SolveMedia(self) @@ -60,16 +60,16 @@ class SafelinkingNet(Crypter): postData['adcopy_challenge'] = challenge postData['adcopy_response'] = response - self.html = self.load(url, post=postData) + self.data = self.load(url, post=postData) - if "The CAPTCHA code you entered was wrong" in self.html: + if "The CAPTCHA code you entered was wrong" in self.data: self.retry_captcha() - if "The password you entered was incorrect" in self.html: + if "The password you entered was incorrect" in self.data: self.fail(_("Wrong password")) pyfile.package().password = "" - soup = BeautifulSoup.BeautifulSoup(self.html) + soup = BeautifulSoup.BeautifulSoup(self.data) scripts = soup.findAll("script") for s in scripts: if "d_links" in s.text: diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py index a9deb1068..2cc279401 100644 --- a/module/plugins/crypter/ShareLinksBiz.py +++ b/module/plugins/crypter/ShareLinksBiz.py @@ -37,7 +37,7 @@ class ShareLinksBiz(Crypter): #: Request package url = self.base_url + '/' + self.file_id - self.html = self.load(url) + self.data = self.load(url) #: Unblock server (load all images) self.unblock_server() @@ -84,7 +84,7 @@ class ShareLinksBiz(Crypter): def is_online(self): - if "No usable content was found" in self.html: + if "No usable content was found" in self.data: self.log_debug("File not found") return False else: @@ -92,21 +92,21 @@ class ShareLinksBiz(Crypter): def is_password_protected(self): - if re.search(r'<form.*?id="passwordForm".*?>', self.html): + if re.search(r'<form.*?id="passwordForm".*?>', self.data): self.log_debug("Links are protected") return True return False def is_captcha_protected(self): - if '<map id="captchamap"' in self.html: + if '<map id="captchamap"' in self.data: self.log_debug("Links are captcha protected") return True return False def unblock_server(self): - imgs = re.findall(r"(/template/images/.*?\.gif)", self.html) + imgs = re.findall(r"(/template/images/.*?\.gif)", self.data) for img in imgs: self.load(self.base_url + img) @@ -116,7 +116,7 @@ class ShareLinksBiz(Crypter): self.log_debug("Submitting password [%s] for protected links" % password) post = {'password': password, 'login': 'Submit form'} url = self.base_url + '/' + self.file_id - self.html = self.load(url, post=post) + self.data = self.load(url, post=post) def unlock_captcha_protection(self): @@ -125,7 +125,7 @@ class ShareLinksBiz(Crypter): self.log_debug("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) + m = re.search(r'<img src="/captcha.gif\?d=(.+?)&PHPSESSID=(.+?)&legend=1"', self.data) if m is None: self.log_debug("Captcha url data not found, maybe plugin out of date?") self.fail(_("Captcha url data not found")) @@ -141,12 +141,12 @@ class ShareLinksBiz(Crypter): self.retry_captcha(wait=5) url = self.base_url + href - self.html = self.load(url) + self.data = self.load(url) def _get_captcha_map(self): mapp = {} - for m in re.finditer(r'<area shape="rect" coords="(.*?)" href="(.*?)"', self.html): + for m in re.finditer(r'<area shape="rect" coords="(.*?)" href="(.*?)"', self.data): rect = eval('(' + m.group(1) + ')') href = m.group(2) mapp[rect] = href @@ -162,11 +162,11 @@ class ShareLinksBiz(Crypter): def handle_errors(self): - if "The inserted password was wrong" in self.html: + if "The inserted password was wrong" in self.data: self.fail(_("Wrong password")) if self.captcha: - if "Your choice was wrong" in self.html: + if "Your choice was wrong" in self.data: self.retry_captcha(wait=5) else: self.captcha.correct() @@ -177,7 +177,7 @@ class ShareLinksBiz(Crypter): #: Extract from web package header title_re = r'<h2><img.*?/>(.*)</h2>' - m = re.search(title_re, self.html, re.S) + m = re.search(title_re, self.data, re.S) if m is not None: title = m.group(1).strip() if 'unnamed' not in title: @@ -200,7 +200,7 @@ class ShareLinksBiz(Crypter): #@TODO: Gather paginated web links pattern = r'javascript:_get\(\'(.*?)\', \d+, \'\'\)' - ids = re.findall(pattern, self.html) + ids = re.findall(pattern, self.data) self.log_debug("Decrypting %d Web links" % len(ids)) for i, ID in enumerate(ids): try: @@ -234,7 +234,7 @@ class ShareLinksBiz(Crypter): self.log_debug("Handling Container links") pattern = r'javascript:_get\(\'(.*?)\', 0, \'(rsdf|ccf|dlc)\'\)' - containersLinks = re.findall(pattern, self.html) + containersLinks = re.findall(pattern, self.data) self.log_debug("Decrypting %d Container links" % len(containersLinks)) for containerLink in containersLinks: link = "%s/get/%s/%s" % (self.base_url, containerLink[1], containerLink[0]) @@ -246,7 +246,7 @@ class ShareLinksBiz(Crypter): package_links = [] self.log_debug("Handling CNL2 links") - if '/lib/cnl2/ClicknLoad.swf' in self.html: + if '/lib/cnl2/ClicknLoad.swf' in self.data: try: (crypted, jk) = self._get_cipher_params() package_links.extend(self._get_links(crypted, jk)) @@ -259,7 +259,7 @@ class ShareLinksBiz(Crypter): def _get_cipher_params(self): #: Request CNL2 - code = re.search(r'ClicknLoad.swf\?code=(.*?)"', self.html).group(1) + code = re.search(r'ClicknLoad.swf\?code=(.*?)"', self.data).group(1) url = "%s/get/cnl2/%s" % (self.base_url, code) res = self.load(url) params = res.split(";;") diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py index 078b4f001..7378ec154 100644 --- a/module/plugins/crypter/TnyCz.py +++ b/module/plugins/crypter/TnyCz.py @@ -26,7 +26,7 @@ class TnyCz(SimpleCrypter): def get_links(self): - m = re.search(r'<a id=\'save_paste\' href="(.+save\.php\?hash=.+)">', self.html) + m = re.search(r'<a id=\'save_paste\' href="(.+save\.php\?hash=.+)">', self.data) return re.findall(".+", self.load(m.group(1))) if m else None diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py index 5bb68b2c4..127b35bcc 100644 --- a/module/plugins/crypter/TusfilesNetFolder.py +++ b/module/plugins/crypter/TusfilesNetFolder.py @@ -35,7 +35,7 @@ class TusfilesNetFolder(XFSCrypter): def handle_pages(self, pyfile): - pages = re.search(self.PAGES_PATTERN, self.html) + pages = re.search(self.PAGES_PATTERN, self.data) if pages: pages = int(math.ceil(int(pages.group('pages')) / 25.0)) @@ -43,7 +43,7 @@ class TusfilesNetFolder(XFSCrypter): return for p in xrange(2, pages + 1): - self.html = self.load_page(p) + self.data = self.load_page(p) self.urls.append(self.get_links()) |