From ae15749449563f5adaabd250ea62460c18af6498 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 3 Nov 2014 12:16:40 +0100
Subject: Update crypters

---
 module/plugins/crypter/NetfolderIn.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'module/plugins/crypter/NetfolderIn.py')

diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py
index d94b88af1..a47bd0503 100644
--- a/module/plugins/crypter/NetfolderIn.py
+++ b/module/plugins/crypter/NetfolderIn.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class NetfolderIn(SimpleCrypter):
     __name__    = "NetfolderIn"
     __type__    = "crypter"
-    __version__ = "0.71"
+    __version__ = "0.72"
 
     __pattern__ = r'http://(?:www\.)?netfolder\.in/((?P<id1>\w+)/\w+|folder\.php\?folder_id=(?P<id2>\w+))'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -20,12 +20,11 @@ class NetfolderIn(SimpleCrypter):
                        ("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
-    NAME_PATTERN = r'<div class="Text">Inhalt des Ordners <span.*>(.+)</span></div>'
+    NAME_PATTERN = r'<div class="Text">Inhalt des Ordners <span.*>(?P<N>.+)</span></div>'
 
 
-    def decrypt(self, pyfile):
-        # Request package
-        self.html = self.load(pyfile.url)
+    def prepare(self):
+        super(NetfolderIn, self).prepare()
 
         # Check for password protection
         if self.isPasswordProtected():
@@ -33,15 +32,6 @@ class NetfolderIn(SimpleCrypter):
             if not self.html:
                 self.fail(_("Incorrect password, please set right password on Add package form and retry"))
 
-        # Get package name and folder
-        (package_name, folder_name) = self.getPackageNameAndFolder()
-
-        # Get package links
-        package_links = self.getLinks()
-
-        # Set package
-        self.packages = [(package_name, package_links, folder_name)]
-
 
     def isPasswordProtected(self):
         if '<input type="password" name="password"' in self.html:
-- 
cgit v1.2.3