1 files changed, 35 insertions, 44 deletions
diff --git a/module/plugins/Container.py b/module/plugins/Container.py
index c233d3710..bfc5713a7 100644
--- a/module/plugins/Container.py
+++ b/module/plugins/Container.py
@@ -1,36 +1,27 @@
 # -*- coding: utf-8 -*-
 
-"""
-    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 os.path import join, exists, basename
-from os import remove
+from __future__ import with_statement
+
 import re
 
+from os import remove
+from os.path import basename, exists
+
+from pyload.plugin.internal.Crypter import Crypter
+from pyload.utils import safe_join
+
+
 class Container(Crypter):
-    __name__ = "Container"
-    __version__ = "0.1"
-    __pattern__ = None
-    __type__ = "container"
-    __description__ = """Base container plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
+    __name__    = "Container"
+    __type__    = "container"
+    __version__ = "0.01"
+
+    __pattern__ = r'^unmatchable$'
+    __config__  = []  #: [("name", "type", "desc", "default")]
+
+    __description__ = """Base container decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def preprocessing(self, thread):
@@ -38,38 +29,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 = join(self.config["general"]["download_folder"], self.pyfile.name)
-            f = open(self.pyfile.url, "wb" )
-            f.write(content)
-            f.close()
-            
+            self.pyfile.url = safe_join(self.core.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))
+
         else:
             self.pyfile.name = basename(self.pyfile.url)
             if not exists(self.pyfile.url):
-                if exists(join(pypath, self.pyfile.url)):
-                    self.pyfile.url = join(pypath, self.pyfile.url)
+                if exists(safe_join(pypath, self.pyfile.url)):
+                    self.pyfile.url = safe_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)
-
-