ShareonlineBiz free+premium, DDLMusicOrg working, SerienjunkiesOrg fix, FileDatabase fix, other fixes

2 files changed, 27 insertions, 40 deletions

diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
index 1c5632cda..a82fa5a1c 100644
--- a/module/plugins/crypter/DDLMusicOrg.py
+++ b/module/plugins/crypter/DDLMusicOrg.py
@@ -10,47 +10,33 @@ class DDLMusicOrg(Crypter):
     __name__ = "DDLMusicOrg"
     __type__ = "container"
     __pattern__ = r"http://[\w\.]*?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+"
-    __version__ = "0.1"
+    __version__ = "0.3"
     __description__ = """ddl-music.org Container Plugin"""
     __author_name__ = ("mkaay")
     __author_mail__ = ("mkaay@mkaay.de")
 
-    def __init__(self, parent):
-        Crypter.__init__(self, parent)
-        self.parent = parent
-        self.html = None
-        self.multi_dl = False
-
-    def download_html(self):
-        url = self.parent.url
-        self.html = self.req.load(url, cookies=True)
-
-    def file_exists(self):
-        """ returns True or False
-        """
-        if not self.html:
-            self.download_html()
-        if re.search(r"Wer dies nicht rechnen kann", self.html) != None:
-            return True
-        return False
-
-    def proceed(self, url, location):
-        for i in range(5):
-            self.download_html()
-            posturl = re.search(r"id=\"captcha\" action=\"(/captcha/ddlm_cr\d\.php)\"", self.html).group(1)
-            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)
-            
-            solve = ""
-            if math.group(2) == "+":
-                solve = int(math.group(1)) + int(math.group(3))
-            else:
-                solve = int(math.group(1)) - int(math.group(3))
-            sleep(3)
-            htmlwithlink = self.req.load("http://ddl-music.org%s" % posturl, 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.links = [m.group(1)]
-                return
-        self.links = False
+    def setup(self):
+        self.multiDL = False
+    
+    def decrypt(self, pyfile):
+        html = self.req.load(self.pyfile.url, cookies=True)
+        
+        if re.search(r"Wer dies nicht rechnen kann", html) != None:
+            self.offline()
+        
+        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)
+        
+        solve = ""
+        if math.group(2) == "+":
+            solve = int(math.group(1)) + int(math.group(3))
+        else:
+            solve = int(math.group(1)) - int(math.group(3))
+        sleep(3)
+        htmlwithlink = self.req.load(self.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((self.pyfile.package().name, [m.group(1)], self.pyfile.package().folder))
+        else:
+            self.retry()
diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py
index 99eaa3f3c..49ec049bc 100644
--- a/module/plugins/crypter/SerienjunkiesOrg.py
+++ b/module/plugins/crypter/SerienjunkiesOrg.py
@@ -145,6 +145,7 @@ class SerienjunkiesOrg(Crypter):
             if decrypted == str(url):
                 continue
             self.packages.append((self.pyfile.package().name, [decrypted], self.pyfile.package().folder))
+            break
     
     def handleFrame(self, url):
         self.req.load(str(url), cookies=False, just_header=True)