Revert plugins to stable

1 files changed, 49 insertions, 84 deletions

diff --git a/module/plugins/Crypter.py b/module/plugins/Crypter.py
index 8888dc4e6..d1549fe80 100644
--- a/module/plugins/Crypter.py
+++ b/module/plugins/Crypter.py
@@ -1,107 +1,72 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Plugin import Plugin
-from module.utils import save_path
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+    
+    @author: mkaay
+"""
 
+from module.plugins.Plugin import Plugin
 
 class Crypter(Plugin):
-    __name__    = "Crypter"
-    __type__    = "crypter"
-    __version__ = "0.05"
-
+    __name__ = "Crypter"
+    __version__ = "0.1"
     __pattern__ = None
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
-
-    __description__ = """Base decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    html = None  #: last html loaded
-
-
+    __type__ = "container"
+    __description__ = """Base crypter plugin"""
+    __author_name__ = ("mkaay")
+    __author_mail__ = ("mkaay@mkaay.de")
+    
     def __init__(self, pyfile):
+        Plugin.__init__(self, pyfile)
+        
         #: Put all packages here. It's a list of tuples like: ( name, [list of links], folder )
         self.packages = []
 
         #: List of urls, pyLoad will generate packagenames
         self.urls = []
-
-        Plugin.__init__(self, pyfile)
-
-
-    def process(self, pyfile):
-        """ main method """
-
-        self.decrypt(pyfile)
-
-        if self.urls:
-            self.generatePackages()
-
-        elif not self.packages:
-            self.error(_("No link extracted"), "decrypt")
-
+        
+        self.multiDL = True
+        self.limitDL = 0
+    
+
+    def preprocessing(self, thread):
+        """prepare"""
+        self.setup()
+        self.thread = thread
+
+        self.decrypt(self.pyfile)
+        
         self.createPackages()
-
+        
 
     def decrypt(self, pyfile):
         raise NotImplementedError
 
-
-    def generatePackages(self):
-        """ generate new packages from self.urls """
-
-        packages = map(lambda name, links: (name, links, None), self.core.api.generatePackages(self.urls).iteritems())
-        self.packages.extend(packages)
-
-
     def createPackages(self):
         """ create new packages from self.packages """
-
-        package_folder = self.pyfile.package().folder
-        package_password = self.pyfile.package().password
-        package_queue = self.pyfile.package().queue
-
-        folder_per_package = self.config['general']['folder_per_package']
-        try:
-            use_subfolder = self.getConfig('use_subfolder')
-        except:
-            use_subfolder = folder_per_package
-        try:
-            subfolder_per_package = self.getConfig('subfolder_per_package')
-        except:
-            subfolder_per_package = True
-
         for pack in self.packages:
-            name, links, folder = pack
 
-            self.logDebug("Parsed package: %s" % name,
-                          "%d links" % len(links),
-                          "Saved to folder: %s" % folder if folder else "Saved to download folder")
+            self.log.debug("Parsed package %(name)s with %(len)d links" % { "name" : pack[0], "len" : len(pack[1]) } )
+            
+            links = [x.decode("utf-8") for x in pack[1]]
+            
+            pid = self.core.api.addPackage(pack[0], links, self.pyfile.package().queue)
 
-            links = map(lambda x: x.decode("utf-8"), links)
+            if self.pyfile.package().password:
+                self.core.api.setPackageData(pid, {"password": self.pyfile.package().password})
 
-            pid = self.core.api.addPackage(name, links, package_queue)
-
-            if package_password:
-                self.core.api.setPackageData(pid, {"password": package_password})
-
-            setFolder = lambda x: self.core.api.setPackageData(pid, {"folder": x or ""})  #: Workaround to do not break API addPackage method
-
-            if use_subfolder:
-                if not subfolder_per_package:
-                    setFolder(package_folder)
-                    self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder})
-
-                elif not folder_per_package or name != folder:
-                    if not folder:
-                        folder = name.replace("http://", "").replace(":", "").replace("/", "_").replace("\\", "_")
-
-                    folder = save_path(folder)  #@TODO: move to core code
-
-                    setFolder(folder)
-                    self.logDebug("Set package %(name)s folder to: %(folder)s" % {"name": name, "folder": folder})
-
-            elif folder_per_package:
-                setFolder(None)
+        if self.urls:
+            self.core.api.generateAndAddPackages(self.urls)
+