Merge pull request #87 from Nold360/stable

Added circlecaptcha to NCryptIn-Plugin

1 files changed, 30 insertions, 3 deletions

diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index a8eaac631..5e1ea347c 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -50,7 +50,8 @@ class NCryptIn(Crypter):
         package_links = []

         package_links.extend(self.handleWebLinks())

         package_links.extend(self.handleContainers())

-        package_links.extend(self.handleCNL2())

+        package_links.extend(self.handleCNL2()) 

+        package_links = self.removeContainers(package_links)

         package_links = set(package_links)

 

         # Pack

@@ -65,7 +66,20 @@ class NCryptIn(Crypter):
             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")

@@ -121,6 +135,19 @@ class NCryptIn(Crypter):
             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 '

@@ -221,4 +248,4 @@ class NCryptIn(Crypter):
 

         # Log and return

         self.logDebug("Block has %d links" % len(links))

-        return links
\ No newline at end of file
+        return links