summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nold360 <nold@lavabit.com> 2013-04-16 10:02:52 +0200
committerGravatar Nold360 <nold@lavabit.com> 2013-04-16 10:02:52 +0200
commitb8bc5ecae9de0eb2bc6f6310d024ecc2fc845c84 (patch)
tree7723c284782af433a1b7be3940351b5eccbe518b
parentAdded circlecaptcha to NCryptIn-Plugin (diff)
downloadpyload-b8bc5ecae9de0eb2bc6f6310d024ecc2fc845c84.tar.xz
Added Workaround for duplicate links in NCryptIn
-rw-r--r--module/plugins/crypter/NCryptIn.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 996ff581e..0d0a884cf 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -51,6 +51,7 @@ class NCryptIn(Crypter):
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)
self.logDebug(package_links)
@@ -67,6 +68,19 @@ class NCryptIn(Crypter):
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")
@@ -123,7 +137,7 @@ class NCryptIn(Crypter):
postData['recaptcha_challenge_field'] = challenge
postData['recaptcha_response_field'] = code
- # Resolve circlecaptcha
+ # Resolve anicaptcha
if "circlecaptcha" in form:
self.captcha = True
self.logDebug("Captcha protected")