diff options
Diffstat (limited to 'module/plugins/Container.py')
| -rw-r--r-- | module/plugins/Container.py | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/module/plugins/Container.py b/module/plugins/Container.py index ed201e2e4..63804d713 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -1,34 +1,21 @@ # -*- 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/>. +import re - @author: mkaay -""" +from os import remove +from os.path import basename, exists from module.plugins.Crypter import Crypter - -from os.path import join, exists, basename -from os import remove -import re +from module.utils import save_join class Container(Crypter): __name__ = "Container" + __type__ = "container" __version__ = "0.1" + __pattern__ = None - __type__ = "container" + __description__ = """Base container decrypter plugin""" __author_name__ = "mkaay" __author_mail__ = "mkaay@mkaay.de" @@ -49,13 +36,13 @@ class Container(Crypter): 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) + self.pyfile.url = save_join(self.config['general']['download_folder'], self.pyfile.name) f = open(self.pyfile.url, "wb" ) f.write(content) f.close() @@ -63,8 +50,8 @@ class Container(Crypter): 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(save_join(pypath, self.pyfile.url)): + self.pyfile.url = save_join(pypath, self.pyfile.url) else: self.fail(_("File not exists.")) |