From ef4bc4b73756565e40c7453f6b71bc1021735033 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 22 Nov 2014 19:38:25 +0100
Subject: Revert plugins to stable

---
 module/plugins/Container.py | 71 ++++++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 30 deletions(-)

(limited to 'module/plugins/Container.py')

diff --git a/module/plugins/Container.py b/module/plugins/Container.py
index 913c80481..c233d3710 100644
--- a/module/plugins/Container.py
+++ b/module/plugins/Container.py
@@ -1,25 +1,36 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from os import remove
-from os.path import basename, exists
+"""
+    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.Crypter import Crypter
-from module.utils import save_join
 
+from os.path import join, exists, basename
+from os import remove
+import re
 
 class Container(Crypter):
-    __name__    = "Container"
-    __type__    = "container"
-    __version__ = "0.01"
-
+    __name__ = "Container"
+    __version__ = "0.1"
     __pattern__ = None
-    __config__  = []  #: [("name", "type", "desc", "default")]
-
-    __description__ = """Base container decrypter plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("mkaay", "mkaay@mkaay.de")]
+    __type__ = "container"
+    __description__ = """Base container plugin"""
+    __author_name__ = ("mkaay")
+    __author_mail__ = ("mkaay@mkaay.de")
 
 
     def preprocessing(self, thread):
@@ -27,38 +38,38 @@ class Container(Crypter):
 
         self.setup()
         self.thread = thread
-
+        
         self.loadToDisk()
 
         self.decrypt(self.pyfile)
         self.deleteTmp()
-
+        
         self.createPackages()
-
+    
 
     def loadToDisk(self):
-        """loads container to disk if its stored remotely and overwrite url,
+        """loads container to disk if its stored remotely and overwrite url, 
         or check existent on several places at disk"""
-
+        
         if self.pyfile.url.startswith("http"):
             self.pyfile.name = re.findall("([^\/=]+)", self.pyfile.url)[-1]
             content = self.load(self.pyfile.url)
-            self.pyfile.url = save_join(self.config['general']['download_folder'], self.pyfile.name)
-            try:
-                with open(self.pyfile.url, "wb") as f:
-                    f.write(content)
-            except IOError, e:
-                self.fail(str(e))
-
+            self.pyfile.url = join(self.config["general"]["download_folder"], self.pyfile.name)
+            f = open(self.pyfile.url, "wb" )
+            f.write(content)
+            f.close()
+            
         else:
             self.pyfile.name = basename(self.pyfile.url)
             if not exists(self.pyfile.url):
-                if exists(save_join(pypath, self.pyfile.url)):
-                    self.pyfile.url = save_join(pypath, self.pyfile.url)
+                if exists(join(pypath, self.pyfile.url)):
+                    self.pyfile.url = join(pypath, self.pyfile.url)
                 else:
-                    self.fail(_("File not exists"))
-
+                    self.fail(_("File not exists."))
+      
 
     def deleteTmp(self):
         if self.pyfile.name.startswith("tmp_"):
             remove(self.pyfile.url)
+
+        
-- 
cgit v1.2.3