From 5060e4c6374a5116d0d8b02528f910f8c5f8bcf9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 15 Jul 2014 16:25:41 +0200
Subject: Fix code indentation, some bad whitespaces and missing authors + use
'not' instead 'is None' + replace __pattern__'s r" with r' + other minor
cosmetics
---
module/plugins/Container.py | 1 +
1 file changed, 1 insertion(+)
(limited to 'module/plugins/Container.py')
diff --git a/module/plugins/Container.py b/module/plugins/Container.py
index 685ceac20..8dc0581af 100644
--- a/module/plugins/Container.py
+++ b/module/plugins/Container.py
@@ -23,6 +23,7 @@ from os.path import join, exists, basename
from os import remove
import re
+
class Container(Crypter):
__name__ = "Container"
__version__ = "0.1"
--
cgit v1.2.3
From 7b8c458cca7d21a029620f98e453f746fce69cd1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 14 Jul 2014 16:10:01 +0200
Subject: Prefer single quote for dict key name
---
module/plugins/Container.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'module/plugins/Container.py')
diff --git a/module/plugins/Container.py b/module/plugins/Container.py
index 8dc0581af..ed201e2e4 100644
--- a/module/plugins/Container.py
+++ b/module/plugins/Container.py
@@ -55,7 +55,7 @@ class Container(Crypter):
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 = join(self.config['general']['download_folder'], self.pyfile.name)
f = open(self.pyfile.url, "wb" )
f.write(content)
f.close()
--
cgit v1.2.3
From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 1 Aug 2014 19:35:59 +0200
Subject: Remove trailing whitespaces + remove license headers + import urllib
methods directly + sort and fix key attributes + use save_join instead join +
sort some import declarations + other minor code cosmetics
---
module/plugins/Container.py | 35 +++++++++++------------------------
1 file changed, 11 insertions(+), 24 deletions(-)
(limited to 'module/plugins/Container.py')
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."))
--
cgit v1.2.3