From 5060e4c6374a5116d0d8b02528f910f8c5f8bcf9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro 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 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 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 . +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 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/Container.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/plugins/Container.py') diff --git a/module/plugins/Container.py b/module/plugins/Container.py index 63804d713..f19672587 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -17,8 +17,7 @@ class Container(Crypter): __pattern__ = None __description__ = """Base container decrypter plugin""" - __author_name__ = "mkaay" - __author_mail__ = "mkaay@mkaay.de" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def preprocessing(self, thread): -- cgit v1.2.3 From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 20:18:13 +0200 Subject: Add __license__ key attribute to plugins --- 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 f19672587..f5a0fac14 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -17,6 +17,7 @@ class Container(Crypter): __pattern__ = None __description__ = """Base container decrypter plugin""" + __license__ = "GPLv3" __authors__ = [("mkaay", "mkaay@mkaay.de")] -- cgit v1.2.3 From 9f2ebe486a3e155fb6a60e07cccb77ab6a772eb2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 26 Oct 2014 02:31:54 +0200 Subject: Extend translation support in plugins + a lot of code cosmetics and typo fixes --- 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 f5a0fac14..1d93a4f4a 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -53,7 +53,7 @@ class Container(Crypter): if exists(save_join(pypath, self.pyfile.url)): self.pyfile.url = save_join(pypath, self.pyfile.url) else: - self.fail(_("File not exists.")) + self.fail(_("File not exists")) def deleteTmp(self): -- cgit v1.2.3 From aa0751bcfd995e308bcd586a6965c75e68b1274b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 27 Oct 2014 23:05:13 +0100 Subject: Code cosmetics --- module/plugins/Container.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'module/plugins/Container.py') diff --git a/module/plugins/Container.py b/module/plugins/Container.py index 1d93a4f4a..0e8b20a86 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -10,15 +10,16 @@ from module.utils import save_join class Container(Crypter): - __name__ = "Container" - __type__ = "container" + __name__ = "Container" + __type__ = "container" __version__ = "0.1" __pattern__ = None + __config__ = [] #: [("name", "type", "desc", "default")] __description__ = """Base container decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de")] + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def preprocessing(self, thread): -- cgit v1.2.3 From 8e921a978e79d93da3036ce3bdc1fb176c74fabb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 3 Nov 2014 12:09:04 +0100 Subject: Spare code cosmetics --- 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 0e8b20a86..16d0045a6 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -12,7 +12,7 @@ from module.utils import save_join class Container(Crypter): __name__ = "Container" __type__ = "container" - __version__ = "0.1" + __version__ = "0.01" __pattern__ = None __config__ = [] #: [("name", "type", "desc", "default")] -- cgit v1.2.3 From bd8259220ab4d56ab419b7b32045b08cc9b0a7c8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 9 Nov 2014 03:08:19 +0100 Subject: Use with statement instead open method when accessing fod + handle i/o error --- module/plugins/Container.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'module/plugins/Container.py') diff --git a/module/plugins/Container.py b/module/plugins/Container.py index 16d0045a6..913c80481 100644 --- a/module/plugins/Container.py +++ b/module/plugins/Container.py @@ -44,9 +44,11 @@ class Container(Crypter): 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) - f = open(self.pyfile.url, "wb" ) - f.write(content) - f.close() + 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) -- cgit v1.2.3 From ef4bc4b73756565e40c7453f6b71bc1021735033 Mon Sep 17 00:00:00 2001 From: Walter Purcaro 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 . + + @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