From 411d8031c3ce4547b9f165761f74f0067bea7e7b Mon Sep 17 00:00:00 2001 From: Olivier Date: Wed, 8 Jun 2016 08:26:04 +0200 Subject: [ExtractArchive] Fix --- module/plugins/internal/UnTar.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/internal/UnTar.py') diff --git a/module/plugins/internal/UnTar.py b/module/plugins/internal/UnTar.py index f2a140ca7..7cc8516ae 100644 --- a/module/plugins/internal/UnTar.py +++ b/module/plugins/internal/UnTar.py @@ -25,7 +25,10 @@ class UnTar(Extractor): @classmethod def isarchive(cls, filename): - return tarfile.is_tarfile(encode(filename)) + try: + return tarfile.is_tarfile(encode(filename)) + except: + return False @classmethod -- cgit v1.2.3 From 8d550644b7547114327752aa840f032352a661f1 Mon Sep 17 00:00:00 2001 From: Olivier Date: Wed, 8 Jun 2016 08:37:39 +0200 Subject: [ExtractArchive] Maintain archive.files property --- module/plugins/internal/UnTar.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/UnTar.py') diff --git a/module/plugins/internal/UnTar.py b/module/plugins/internal/UnTar.py index 7cc8516ae..4e498c223 100644 --- a/module/plugins/internal/UnTar.py +++ b/module/plugins/internal/UnTar.py @@ -38,7 +38,8 @@ class UnTar(Extractor): def list(self, password=None): with tarfile.open(self.target) as t: - return t.getnames() + self.files = t.getnames() + return self.files def verify(self, password=None): @@ -56,11 +57,13 @@ class UnTar(Extractor): def extract(self, password=None): - self.verify() + self.verify(password) try: with tarfile.open(self.target, errorlevel=2) as t: t.extractall(self.dest) + self.files = t.getnames() + return self.files except tarfile.ExtractError, e: self.log_warning(e) -- cgit v1.2.3 From 78e1af94a999dc007f80749cf550654c8f625a23 Mon Sep 17 00:00:00 2001 From: Olivier Date: Sat, 11 Jun 2016 21:09:29 +0200 Subject: Increment version number --- module/plugins/internal/UnTar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/UnTar.py') diff --git a/module/plugins/internal/UnTar.py b/module/plugins/internal/UnTar.py index 4e498c223..13a233634 100644 --- a/module/plugins/internal/UnTar.py +++ b/module/plugins/internal/UnTar.py @@ -12,7 +12,7 @@ from module.plugins.internal.misc import encode class UnTar(Extractor): __name__ = "UnTar" __type__ = "extractor" - __version__ = "0.01" + __version__ = "0.02" __status__ = "stable" __description__ = """TAR extractor plugin""" -- cgit v1.2.3