1 files changed, 20 insertions, 23 deletions
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index 4f6116100..0399e686d 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHuFolder.py
@@ -6,38 +6,35 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
 class DataHuFolder(SimpleCrypter):
-    __name__ = "DataHuFolder"
-    __type__ = "crypter"
-    __version__ = "0.03"
+    __name__    = "DataHuFolder"
+    __type__    = "crypter"
+    __version__ = "0.06"
 
-    __pattern__ = r'http://(?:www\.)?data.hu/dir/\w+'
+    __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
+                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Data.hu folder decrypter plugin"""
-    __author_name__ = ("crash", "stickell")
-    __author_mail__ = "l.stickell@yahoo.it"
+    __license__     = "GPLv3"
+    __authors__     = [("crash", None),
+                       ("stickell", "l.stickell@yahoo.it")]
 
-    LINK_PATTERN = r"<a href='(http://data\.hu/get/.+)' target='_blank'>\1</a>"
-    TITLE_PATTERN = ur'<title>(?P<title>.+) Let\xf6lt\xe9se</title>'
 
+    LINK_PATTERN = r'<a href=\'(http://data\.hu/get/.+)\' target=\'_blank\'>\1</a>'
+    NAME_PATTERN = ur'<title>(?P<N>.+) Let\xf6lt\xe9se</title>'
 
-    def decrypt(self, pyfile):
-        self.html = self.load(pyfile.url, decode=True)
+
+    def prepare(self):
+        super(DataHuFolder, self).prepare()
 
         if u'K\xe9rlek add meg a jelsz\xf3t' in self.html:  # Password protected
             password = self.getPassword()
-            if password is '':
-                self.fail("No password specified, please set right password on Add package form and retry")
-            self.logDebug('The folder is password protected', 'Using password: ' + password)
-            self.html = self.load(pyfile.url, post={'mappa_pass': password}, decode=True)
-            if u'Hib\xe1s jelsz\xf3' in self.html:  # Wrong password
-                self.fail("Incorrect password, please set right password on Add package form and retry")
+            if not password:
+                self.fail(_("Password required"))
 
-        package_name, folder_name = self.getPackageNameAndFolder()
+            self.logDebug("The folder is password protected', 'Using password: " + password)
 
-        package_links = re.findall(self.LINK_PATTERN, self.html)
-        self.logDebug('Package has %d links' % len(package_links))
+            self.html = self.load(self.pyfile.url, post={'mappa_pass': password}, decode=True)
 
-        if package_links:
-            self.packages = [(package_name, package_links, folder_name)]
-        else:
-            self.fail('Could not extract any links')
+            if u'Hib\xe1s jelsz\xf3' in self.html:  # Wrong password
+                self.fail(_("Wrong password"))