Merge pull request #1 from pyload/stable

Merge

1 files changed, 16 insertions, 9 deletions

diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
index 27cff3f9d..55181e9ad 100644
--- a/module/plugins/crypter/DDLMusicOrg.py
+++ b/module/plugins/crypter/DDLMusicOrg.py
@@ -1,30 +1,37 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from time import sleep
 
 from module.plugins.Crypter import Crypter
 
 
 class DDLMusicOrg(Crypter):
-    __name__ = "DDLMusicOrg"
-    __type__ = "crypter"
+    __name__    = "DDLMusicOrg"
+    __type__    = "crypter"
+    __version__ = "0.30"
+
     __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+'
-    __version__ = "0.3"
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
+                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+
     __description__ = """Ddl-music.org decrypter plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+
 
     def setup(self):
         self.multiDL = False
 
+
     def decrypt(self, pyfile):
-        html = self.req.load(pyfile.url, cookies=True)
+        html = self.load(pyfile.url, cookies=True)
 
         if re.search(r"Wer dies nicht rechnen kann", html) is not None:
             self.offline()
 
-        math = re.search(r"(\d+) ([\+-]) (\d+) =\s+<inp", self.html)
+        math = re.search(r"(\d+) ([+-]) (\d+) =\s+<inp", self.html)
         id = re.search(r"name=\"id\" value=\"(\d+)\"", self.html).group(1)
         linknr = re.search(r"name=\"linknr\" value=\"(\d+)\"", self.html).group(1)
 
@@ -34,11 +41,11 @@ class DDLMusicOrg(Crypter):
         else:
             solve = int(math.group(1)) - int(math.group(3))
         sleep(3)
-        htmlwithlink = self.req.load(pyfile.url, cookies=True,
+        htmlwithlink = self.load(pyfile.url, cookies=True,
                                      post={"calc%s" % linknr: solve, "send%s" % linknr: "Send", "id": id,
                                            "linknr": linknr})
         m = re.search(r"<form id=\"ff\" action=\"(.*?)\" method=\"post\">", htmlwithlink)
         if m:
-            self.packages.append((pyfile.package().name, [m.group(1)], pyfile.package().folder))
+            self.urls = [m.group(1)]
         else:
             self.retry()