From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/crypter/LinkCryptWs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 5c65e726d..28c431e80 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -7,14 +7,14 @@ import pycurl from Crypto.Cipher import AES -from module.plugins.Crypter import Crypter +from module.plugins.internal.Crypter import Crypter from module.utils import html_unescape class LinkCryptWs(Crypter): __name__ = "LinkCryptWs" __type__ = "crypter" - __version__ = "0.08" + __version__ = "0.09" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P\w+)' -- cgit v1.2.3 From 20b6a2ec022202b0efb6cb69415239fb8f4d1445 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Jun 2015 18:59:20 +0200 Subject: Spare code cosmetics (2) --- module/plugins/crypter/LinkCryptWs.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 28c431e80..b9abb08d2 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -36,12 +36,12 @@ class LinkCryptWs(Crypter): def prepare(self): - # Init + #: Init self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') self.req.cj.setCookie("linkcrypt.ws", "language", "en") - # Request package + #: 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) @@ -63,21 +63,21 @@ class LinkCryptWs(Crypter): self.unlockCaptchaProtection() self.handleCaptchaErrors() - # Check for protection + #: Check for protection if self.isPasswordProtected(): self.unlockPasswordProtection() self.handleErrors() - # get unrar password + #: get unrar password self.getunrarpw() - # Get package name and folder + #: Get package name and folder package_name, folder_name = self.getPackageInfo() #get the container definitions from script section self.get_container_html() - # Extract package links + #: Extract package links for type in self.sources: links = self.handleLinkSource(type) @@ -234,7 +234,7 @@ class LinkCryptWs(Crypter): self.logDebug('Search 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) + 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") % type) #@TODO: Replace with self.error in 0.4.10 for line in self.container_html: @@ -282,37 +282,37 @@ class LinkCryptWs(Crypter): def _getCipherParams(self, cnl_section): - # Get jk + #: Get jk jk_re = r' Date: Wed, 17 Jun 2015 19:24:49 +0200 Subject: Spare code cosmetics (3) --- module/plugins/crypter/LinkCryptWs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index b9abb08d2..e889ca154 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -234,7 +234,7 @@ class LinkCryptWs(Crypter): self.logDebug('Search 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) + 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") % type) #@TODO: Replace with self.error in 0.4.10 for line in self.container_html: -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/crypter/LinkCryptWs.py | 114 +++++++++++++++++----------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index e889ca154..44ca502a9 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -14,7 +14,7 @@ from module.utils import html_unescape class LinkCryptWs(Crypter): __name__ = "LinkCryptWs" __type__ = "crypter" - __version__ = "0.09" + __version__ = "0.10" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P\w+)' @@ -52,34 +52,34 @@ class LinkCryptWs(Crypter): self.prepare() - if not self.isOnline(): + if not self.is_online(): self.offline() - if self.isKeyCaptchaProtected(): + if self.is_key_captcha_protected(): self.retry(8, 15, _("Can't handle Key-Captcha")) - if self.isCaptchaProtected(): + if self.is_captcha_protected(): self.captcha = True - self.unlockCaptchaProtection() - self.handleCaptchaErrors() + self.unlock_captcha_protection() + self.handle_captcha_errors() #: Check for protection - if self.isPasswordProtected(): - self.unlockPasswordProtection() - self.handleErrors() + if self.is_password_protected(): + self.unlock_password_protection() + self.handle_errors() #: get unrar password self.getunrarpw() #: Get package name and folder - package_name, folder_name = self.getPackageInfo() + package_name, folder_name = self.get_package_info() - #get the container definitions from script section + # get the container definitions from script section self.get_container_html() #: Extract package links for type in self.sources: - links = self.handleLinkSource(type) + links = self.handle_link_source(type) if links: self.links.extend(links) @@ -89,59 +89,59 @@ class LinkCryptWs(Crypter): self.packages = [(package_name, self.links, folder_name)] - def isOnline(self): + def is_online(self): if "Linkcrypt.ws // Error 404" in self.html: - self.logDebug("Folder doesn't exist anymore") + self.log_debug("Folder doesn't exist anymore") return False else: return True - def isPasswordProtected(self): + def is_password_protected(self): if "Authorizing" in self.html: - self.logDebug("Links are password protected") + self.log_debug("Links are password protected") return True else: return False - def isCaptchaProtected(self): + def is_captcha_protected(self): if 'id="captcha">' in self.html: - self.logDebug("Links are captcha protected") + self.log_debug("Links are captcha protected") return True else: return False - def isKeyCaptchaProtected(self): + def is_key_captcha_protected(self): if re.search(r'>If the folder does not open after klick on <', self.html, re.I): return True else: return False - def unlockPasswordProtection(self): - password = self.getPassword() + def unlock_password_protection(self): + password = self.get_password() if password: - self.logDebug("Submitting password [%s] for protected links" % 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"}) else: self.fail(_("Folder is password protected")) - def unlockCaptchaProtection(self): + def unlock_captcha_protection(self): captcha_url = re.search(r']*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1) - captcha_code = self.decryptCaptcha(captcha_url, forceUser=True, imgtype="gif", result_type='positional') + captcha_code = self.decrypt_captcha(captcha_url, forceUser=True, imgtype="gif", result_type='positional') self.html = self.load(self.pyfile.url, post={"x": captcha_code[0], "y": captcha_code[1]}) - def getPackageInfo(self): + def get_package_info(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)) + self.log_debug("Defaulting to pyfile name [%s] and folder [%s] for package" % (name, folder)) return name, folder @@ -154,46 +154,46 @@ class LinkCryptWs(Crypter): unrarpw = sitein[indexi:indexe] if not (unrarpw == "Password" or "Dateipasswort") : - self.logDebug("File password set to: [%s]"% unrarpw) + self.log_debug("File password set to: [%s]"% unrarpw) self.pyfile.package().password = unrarpw - def handleErrors(self): - if self.isPasswordProtected(): + def handle_errors(self): + if self.is_password_protected(): self.fail(_("Incorrect password")) - def handleCaptchaErrors(self): + def handle_captcha_errors(self): if self.captcha: if "Your choice was wrong!" in self.html: - self.invalidCaptcha() + self.invalid_captcha() self.retry() else: - self.correctCaptcha() + self.correct_captcha() - def handleLinkSource(self, type): + def handle_link_source(self, type): if type == 'cnl': - return self.handleCNL2() + return self.handle_CNL2() elif type == 'web': - return self.handleWebLinks() + return self.handle_web_links() elif type in ('rsdf', 'ccf', 'dlc'): - return self.handleContainer(type) + return self.handle_container(type) else: self.fail(_("Unknown source type: %s") % type) #@TODO: Replace with self.error in 0.4.10 - def handleWebLinks(self): - self.logDebug("Search for Web links ") + def handle_web_links(self): + self.log_debug("Search for Web links ") package_links = [] pattern = r'
]*?>.*?]*?value="(.+?)"[^>]*?name="file"' ids = re.findall(pattern, self.html, re.I | re.S) - self.logDebug("Decrypting %d Web links" % len(ids)) + self.log_debug("Decrypting %d Web links" % len(ids)) for idx, weblink_id in enumerate(ids): try: @@ -208,7 +208,7 @@ class LinkCryptWs(Crypter): package_links.append(link2) except Exception, detail: - self.logDebug("Error decrypting Web link %s, %s" % (weblink_id, detail)) + self.log_debug("Error decrypting Web link %s, %s" % (weblink_id, detail)) return package_links @@ -228,11 +228,11 @@ class LinkCryptWs(Crypter): return self.js.eval(line.replace('{}))',"{}).replace('document.open();document.write','').replace(';document.close();',''))")) - def handleContainer(self, type): + def handle_container(self, type): package_links = [] type = type.lower() - self.logDebug('Search for %s Container links' % type.upper()) + self.log_debug('Search 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") % type) #@TODO: Replace with self.error in 0.4.10 @@ -245,18 +245,18 @@ class LinkCryptWs(Crypter): if not clink: continue - self.logDebug("clink avaible") + self.log_debug("clink avaible") - package_name, folder_name = self.getPackageInfo() - self.logDebug("Added package with name %s.%s and container link %s" %( package_name, type, clink.group(1))) + package_name, folder_name = self.get_package_info() + self.log_debug("Added package with name %s.%s and container link %s" %( package_name, type, clink.group(1))) self.core.api.uploadContainer( "%s.%s" %(package_name, type), self.load(clink.group(1))) return "Found it" return package_links - def handleCNL2(self): - self.logDebug("Search for CNL links") + def handle_CNL2(self): + self.log_debug("Search for CNL links") package_links = [] cnl_line = None @@ -267,21 +267,21 @@ class LinkCryptWs(Crypter): break if cnl_line: - self.logDebug("cnl_line gefunden") + self.log_debug("cnl_line gefunden") try: cnl_section = self.handle_javascript(cnl_line) - (vcrypted, vjk) = self._getCipherParams(cnl_section) + (vcrypted, vjk) = self._get_cipher_params(cnl_section) for (crypted, jk) in zip(vcrypted, vjk): - package_links.extend(self._getLinks(crypted, jk)) + package_links.extend(self._get_links(crypted, jk)) except Exception: - self.logError(_("Unable to decrypt CNL links (JS Error) try to get over links")) - return self.handleWebLinks() + self.log_error(_("Unable to decrypt CNL links (JS Error) try to get over links")) + return self.handle_web_links() return package_links - def _getCipherParams(self, cnl_section): + def _get_cipher_params(self, cnl_section): #: Get jk jk_re = r' Date: Fri, 17 Jul 2015 03:03:26 +0200 Subject: Spare fixes and code cosmetics --- module/plugins/crypter/LinkCryptWs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 44ca502a9..a5d4d7e59 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -249,7 +249,7 @@ class LinkCryptWs(Crypter): package_name, folder_name = self.get_package_info() self.log_debug("Added package with name %s.%s and container link %s" %( package_name, type, clink.group(1))) - self.core.api.uploadContainer( "%s.%s" %(package_name, type), self.load(clink.group(1))) + self.core.api.uploadContainer('.'.join([package_name, type]), self.load(clink.group(1))) return "Found it" return package_links -- cgit v1.2.3 From dad722ac7255640e7e0541c4094a4d2e4de79cd3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 00:05:58 +0200 Subject: Code cosmetics (2) --- module/plugins/crypter/LinkCryptWs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index a5d4d7e59..4fe2384da 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -42,7 +42,7 @@ class LinkCryptWs(Crypter): self.req.cj.setCookie("linkcrypt.ws", "language", "en") #: 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.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) @@ -68,13 +68,13 @@ class LinkCryptWs(Crypter): self.unlock_password_protection() self.handle_errors() - #: get unrar password + #: Get unrar password self.getunrarpw() #: Get package name and folder package_name, folder_name = self.get_package_info() - # get the container definitions from script section + #: Get the container definitions from script section self.get_container_html() #: Extract package links @@ -234,7 +234,7 @@ class LinkCryptWs(Crypter): self.log_debug('Search 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) + 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") % type) #@TODO: Replace with self.error in 0.4.10 for line in self.container_html: -- cgit v1.2.3 From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/crypter/LinkCryptWs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 4fe2384da..f7eec388b 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -125,7 +125,7 @@ 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.html = self.load(self.pyfile.url, post={'password': password, 'x': "0", 'y': "0"}) else: self.fail(_("Folder is password protected")) @@ -134,7 +134,7 @@ class LinkCryptWs(Crypter): captcha_url = re.search(r']*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1) captcha_code = self.decrypt_captcha(captcha_url, forceUser=True, imgtype="gif", result_type='positional') - self.html = self.load(self.pyfile.url, post={"x": captcha_code[0], "y": captcha_code[1]}) + self.html = self.load(self.pyfile.url, post={'x': captcha_code[0], 'y': captcha_code[1]}) def get_package_info(self): -- cgit v1.2.3 From 56389e28ba5d2f5658278bc7f486d73be747f135 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 11:44:49 +0200 Subject: Rename self.core to self.pyload (plugins only) --- module/plugins/crypter/LinkCryptWs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index f7eec388b..9d4332f25 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -249,7 +249,7 @@ class LinkCryptWs(Crypter): package_name, folder_name = self.get_package_info() self.log_debug("Added package with name %s.%s and container link %s" %( package_name, type, clink.group(1))) - self.core.api.uploadContainer('.'.join([package_name, type]), self.load(clink.group(1))) + self.pyload.api.uploadContainer('.'.join([package_name, type]), self.load(clink.group(1))) return "Found it" return package_links -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/crypter/LinkCryptWs.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 9d4332f25..c06c8d4fe 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -15,6 +15,7 @@ class LinkCryptWs(Crypter): __name__ = "LinkCryptWs" __type__ = "crypter" __version__ = "0.10" + __status__ = "stable" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P\w+)' -- cgit v1.2.3 From 027cb529d79558de19c47da88a782b31745a65c9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 21 Jul 2015 22:53:37 +0200 Subject: New Captcha skeleton --- module/plugins/crypter/LinkCryptWs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index c06c8d4fe..5195c47c3 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -133,7 +133,7 @@ class LinkCryptWs(Crypter): def unlock_captcha_protection(self): captcha_url = re.search(r']*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1) - captcha_code = self.decrypt_captcha(captcha_url, forceUser=True, imgtype="gif", result_type='positional') + captcha_code = self.captcha.decrypt_image(captcha_url, input_type="gif", output_type='positional', try_ocr=False) self.html = self.load(self.pyfile.url, post={'x': captcha_code[0], 'y': captcha_code[1]}) @@ -167,10 +167,10 @@ class LinkCryptWs(Crypter): def handle_captcha_errors(self): if self.captcha: if "Your choice was wrong!" in self.html: - self.invalid_captcha() + self.captcha.invalid() self.retry() else: - self.correct_captcha() + self.captcha.correct() def handle_link_source(self, type): -- cgit v1.2.3 From 4fc28dc09f9632eb4a15a1ef48778427f9dcae33 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 23 Jul 2015 18:53:06 +0200 Subject: Code cosmetics --- module/plugins/crypter/LinkCryptWs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 5195c47c3..baa440c51 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -150,7 +150,7 @@ class LinkCryptWs(Crypter): def getunrarpw(self): sitein = self.html indexi = sitein.find("|source|") + 8 - indexe = sitein.find("|",indexi) + indexe = sitein.find("|", indexi) unrarpw = sitein[indexi:indexe] -- cgit v1.2.3 From 6af9b38a8d5d49355b85aef6ddd003605d6bba05 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 23 Jul 2015 23:44:45 +0200 Subject: Improve Captcha --- module/plugins/crypter/LinkCryptWs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index baa440c51..8132db713 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -133,7 +133,7 @@ class LinkCryptWs(Crypter): def unlock_captcha_protection(self): captcha_url = re.search(r']*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1) - captcha_code = self.captcha.decrypt_image(captcha_url, input_type="gif", output_type='positional', try_ocr=False) + captcha_code = self.captcha.decrypt(captcha_url, input_type="gif", output_type='positional', ocr=False) self.html = self.load(self.pyfile.url, post={'x': captcha_code[0], 'y': captcha_code[1]}) -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/crypter/LinkCryptWs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index 8132db713..f7bea666b 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -15,7 +15,7 @@ class LinkCryptWs(Crypter): __name__ = "LinkCryptWs" __type__ = "crypter" __version__ = "0.10" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P\w+)' -- cgit v1.2.3 From 761ca5c66e07559925ebbdbc6531f9ca658b12ce Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 16:11:58 +0200 Subject: Code cosmetics --- module/plugins/crypter/LinkCryptWs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index f7bea666b..f235a9406 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -174,10 +174,10 @@ class LinkCryptWs(Crypter): def handle_link_source(self, type): - if type == 'cnl': + if type == "cnl": return self.handle_CNL2() - elif type == 'web': + elif type == "web": return self.handle_web_links() elif type in ('rsdf', 'ccf', 'dlc'): -- cgit v1.2.3 From dc47212c8e801d380e4db4bd1bec0bf183de9de1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 31 Jul 2015 05:48:44 +0200 Subject: [Captcha] Fix _decrypt method --- module/plugins/crypter/LinkCryptWs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/LinkCryptWs.py') diff --git a/module/plugins/crypter/LinkCryptWs.py b/module/plugins/crypter/LinkCryptWs.py index f235a9406..af13f55f6 100644 --- a/module/plugins/crypter/LinkCryptWs.py +++ b/module/plugins/crypter/LinkCryptWs.py @@ -133,7 +133,7 @@ class LinkCryptWs(Crypter): def unlock_captcha_protection(self): captcha_url = re.search(r']*?>.*?<\s*?input.*?src="(.+?)"', self.html, re.I | re.S).group(1) - captcha_code = self.captcha.decrypt(captcha_url, input_type="gif", output_type='positional', ocr=False) + 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]}) -- cgit v1.2.3