From f71c1ef70a199e42e8a519364d9924e138ffd37c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 24 Dec 2014 15:48:08 +0100 Subject: [ExtractArchive] Remove empty directory --- module/plugins/internal/UnZip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index b3d54cba0..875a0ec09 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -5,7 +5,7 @@ from __future__ import with_statement import sys import zipfile -from module.plugins.internal.AbstractExtractor import AbtractExtractor, PasswordError, ArchiveError, CRCError +from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError class UnZip(AbtractExtractor): -- cgit v1.2.3 From 4c63928557398891c30d3e2b7c962a07b3483315 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 26 Dec 2014 04:18:41 +0100 Subject: Rename AbstractExtractor to Extractor --- module/plugins/internal/UnZip.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 875a0ec09..5ec56cbdf 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -5,12 +5,12 @@ from __future__ import with_statement import sys import zipfile -from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError +from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError -class UnZip(AbtractExtractor): +class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.00" + __version__ = "1.01" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 7fc3362307737cd7c565b710ec83c5bdc4d3e8a9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 25 Jan 2015 03:05:00 +0100 Subject: Revert Extractor to the old one (temp) --- module/plugins/internal/UnZip.py | 69 ++++++++++------------------------------ 1 file changed, 17 insertions(+), 52 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 5ec56cbdf..888ae7ebe 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -1,86 +1,51 @@ # -*- coding: utf-8 -*- -from __future__ import with_statement - import sys import zipfile -from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError +from module.plugins.internal.Extractor import Extractor, WrongPassword, ArchiveError class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.01" + __version__ = "1.02" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" - __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - - - EXTENSIONS = ["zip", "zip64"] + __authors__ = [("RaNaN", "RaNaN@pyload.org")] - @classmethod - def checkDeps(cls): + @staticmethod + def checkDeps(): return sys.version_info[:2] >= (2, 6) - @classmethod - def isArchive(cls, file): - return zipfile.is_zipfile(file) + @staticmethod + def getTargets(files_ids): + result = [] + for file, id in files_ids: + if file.endswith(".zip"): + result.append((file, id)) - def verify(self): - try: - with zipfile.ZipFile(self.file, 'r', allowZip64=True) as z: - z.setpassword(self.password) - badcrc = z.testzip() + return result - except (BadZipfile, LargeZipFile), e: - raise ArchiveError(e) - except RuntimeError, e: - if 'encrypted' in e: - raise PasswordError - else: - raise ArchiveError(e) - - else: - if badcrc: - raise CRCError - - if not self.list(): - raise ArchiveError("Empty archive") - - - def list(self): + def extract(self, progress, password=None): try: - with zipfile.ZipFile(self.file, 'r', allowZip64=True) as z: - z.setpassword(self.password) - return z.namelist() - except Exception: - return list() - - - def extract(self, progress=lambda x: None): - try: - with zipfile.ZipFile(self.file, 'r', allowZip64=True) as z: - progress(0) - z.extractall(self.out, pwd=self.password) - progress(100) + z = zipfile.ZipFile(self.file) + self.files = z.namelist() + z.extractall(self.out, pwd=password) except (BadZipfile, LargeZipFile), e: raise ArchiveError(e) except RuntimeError, e: if e is "Bad password for file": - raise PasswordError + raise WrongPassword else: raise ArchiveError(e) - finally: - self.files = self.list() - def getDeleteFiles(self): return [self.file] -- cgit v1.2.3 From 8848a359a43316fb346b728d1d79d7b72d27e5a0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 27 Jan 2015 17:48:25 +0100 Subject: Update Extractor (again) --- module/plugins/internal/UnZip.py | 47 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 888ae7ebe..026503be5 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -1,51 +1,52 @@ # -*- coding: utf-8 -*- +from __future__ import with_statement + +import os import sys import zipfile -from module.plugins.internal.Extractor import Extractor, WrongPassword, ArchiveError +from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.02" + __version__ = "1.03" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org")] + __authors__ = [("RaNaN", "RaNaN@pyload.org"), + ("Walter Purcaro", "vuolter@gmail.com")] - @staticmethod - def checkDeps(): - return sys.version_info[:2] >= (2, 6) + EXTENSIONS = [".zip", ".zip64"] - @staticmethod - def getTargets(files_ids): - result = [] + @classmethod + def checkDeps(cls): + return sys.version_info[:2] >= (2, 6) - for file, id in files_ids: - if file.endswith(".zip"): - result.append((file, id)) - return result + @classmethod + def getTargets(cls, files_ids): + return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)] - def extract(self, progress, password=None): + def extract(self, password=None): try: - z = zipfile.ZipFile(self.file) - self.files = z.namelist() - z.extractall(self.out, pwd=password) + with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: + z.setpassword(self.password) + if not z.testzip(): + z.extractall(self.out) + self.files = z.namelist() + else: + raise CRCError except (BadZipfile, LargeZipFile), e: raise ArchiveError(e) except RuntimeError, e: - if e is "Bad password for file": - raise WrongPassword + if "encrypted" in e: + raise PasswordError else: raise ArchiveError(e) - - - def getDeleteFiles(self): - return [self.file] -- cgit v1.2.3 From 788a06132882300a22f6db3aa7ac3a6009d4d762 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 29 Jan 2015 23:13:54 +0100 Subject: Update Extractor (2) --- module/plugins/internal/UnZip.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 026503be5..4f3f1ca32 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -7,16 +7,16 @@ import sys import zipfile from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError +from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.03" + __version__ = "1.04" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org"), - ("Walter Purcaro", "vuolter@gmail.com")] + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] EXTENSIONS = [".zip", ".zip64"] @@ -32,9 +32,13 @@ class UnZip(Extractor): return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)] + def repair(self): + return False + + def extract(self, password=None): try: - with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: + with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: z.setpassword(self.password) if not z.testzip(): z.extractall(self.out) -- cgit v1.2.3 From 32b3cb9d9fa6851de35f52d01f78c26012043baa Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 29 Jan 2015 23:30:56 +0100 Subject: [SevenZip] Repair not supported --- module/plugins/internal/UnZip.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 4f3f1ca32..a086d9db1 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -32,10 +32,6 @@ class UnZip(Extractor): return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)] - def repair(self): - return False - - def extract(self, password=None): try: with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: -- cgit v1.2.3 From b2904e3e704ece4e891f3d2bfbcc8af2d6d8c2e1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 31 Jan 2015 20:13:28 +0100 Subject: [SevenZip] Better check method + fix list method --- module/plugins/internal/UnZip.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index a086d9db1..83ed3a233 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -12,7 +12,7 @@ from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.04" + __version__ = "1.05" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -23,13 +23,13 @@ class UnZip(Extractor): @classmethod - def checkDeps(cls): + def isUsable(cls): return sys.version_info[:2] >= (2, 6) @classmethod def getTargets(cls, files_ids): - return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)] + return [(fname, id) for fname, id in files_ids if cls.isArchive(fname)] def extract(self, password=None): -- cgit v1.2.3 From 7368881d2ba95cca3f47afbb0f4ef5861f2774df Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 31 Jan 2015 23:19:30 +0100 Subject: Extractor final fixup --- module/plugins/internal/UnZip.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 83ed3a233..2ab9597ef 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -27,20 +27,18 @@ class UnZip(Extractor): return sys.version_info[:2] >= (2, 6) - @classmethod - def getTargets(cls, files_ids): - return [(fname, id) for fname, id in files_ids if cls.isArchive(fname)] - - def extract(self, password=None): try: with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: z.setpassword(self.password) - if not z.testzip(): + + badfile = z.testzip(): + + if not badfile: z.extractall(self.out) self.files = z.namelist() else: - raise CRCError + raise CRCError(badfile) except (BadZipfile, LargeZipFile), e: raise ArchiveError(e) -- cgit v1.2.3 From ddca2529cf0ff79ea9e1721a15493407c23a57d9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 31 Jan 2015 23:40:36 +0100 Subject: Fix https://github.com/pyload/pyload/issues/1120 --- module/plugins/internal/UnZip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 2ab9597ef..8093c1ba8 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -12,7 +12,7 @@ from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.05" + __version__ = "1.06" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -32,7 +32,7 @@ class UnZip(Extractor): with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: z.setpassword(self.password) - badfile = z.testzip(): + badfile = z.testzip() if not badfile: z.extractall(self.out) -- cgit v1.2.3 From 44025fa7cb7b7f9b601ec9f654d1f58a788294c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= Date: Mon, 2 Feb 2015 21:13:19 +0100 Subject: [UnZip] Fixed Typo --- module/plugins/internal/UnZip.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 8093c1ba8..eb8259e47 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -4,15 +4,15 @@ from __future__ import with_statement import os import sys -import zipfile +from zipfile import ZipFile, BadZipfile, LargeZipFile from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.06" + __version__ = "1.07" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -29,8 +29,8 @@ class UnZip(Extractor): def extract(self, password=None): try: - with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: - z.setpassword(self.password) + with ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: + z.setpassword(password) badfile = z.testzip() -- cgit v1.2.3 From 8dfb7adc0fc3c858c0ddf9371c2f4580bb8be3c7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 3 Feb 2015 00:10:11 +0100 Subject: Update Extractor (3) --- module/plugins/internal/UnZip.py | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index eb8259e47..781c47d7b 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -4,15 +4,15 @@ from __future__ import with_statement import os import sys +import zipfile -from zipfile import ZipFile, BadZipfile, LargeZipFile from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.07" + __version__ = "1.08" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -27,20 +27,35 @@ class UnZip(Extractor): return sys.version_info[:2] >= (2, 6) + def list(self, password=None): + with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: + z.setpassword(password) + return z.namelist() + + + def check(self): + with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: + badfile = z.testzip() + + if badfile: + raise CRCError(badfile) + else: + raise PasswordError + + def extract(self, password=None): try: - with ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: + with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: z.setpassword(password) badfile = z.testzip() if not badfile: z.extractall(self.out) - self.files = z.namelist() else: raise CRCError(badfile) - except (BadZipfile, LargeZipFile), e: + except (zipfile.BadZipfile, zipfile.LargeZipFile), e: raise ArchiveError(e) except RuntimeError, e: @@ -48,3 +63,5 @@ class UnZip(Extractor): raise PasswordError else: raise ArchiveError(e) + else: + self.files = z.namelist() -- cgit v1.2.3 From 8d8cfd57fa44cb84eb9709871bf14a3b4d13d994 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 3 Feb 2015 01:10:04 +0100 Subject: Update Extractor (4) --- module/plugins/internal/UnZip.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 781c47d7b..f81c235c1 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -50,10 +50,10 @@ class UnZip(Extractor): badfile = z.testzip() - if not badfile: - z.extractall(self.out) - else: + if badfile: raise CRCError(badfile) + else: + z.extractall(self.out) except (zipfile.BadZipfile, zipfile.LargeZipFile), e: raise ArchiveError(e) -- cgit v1.2.3 From 2dc3536e36956eab99fa5f7945dcf60073b5fd57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= Date: Mon, 9 Feb 2015 23:36:10 +0100 Subject: [ExtractArchive] better Multipart behavior, new version output --- module/plugins/internal/UnZip.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index f81c235c1..caa0ecc0c 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -12,7 +12,7 @@ from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.08" + __version__ = "1.09" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -20,6 +20,7 @@ class UnZip(Extractor): EXTENSIONS = [".zip", ".zip64"] + VERSION ="(python %s.%s.%s)" % (sys.version_info.major, sys.version_info.minor, sys.version_info.micro) @classmethod -- cgit v1.2.3 From 4fb1da8725038ee2894e9fb47af4d58a8834993d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= Date: Thu, 12 Feb 2015 20:50:09 +0100 Subject: [Unzip] fix Version Info --- module/plugins/internal/UnZip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index caa0ecc0c..704b49ca0 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -12,7 +12,7 @@ from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.09" + __version__ = "1.10" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -20,7 +20,7 @@ class UnZip(Extractor): EXTENSIONS = [".zip", ".zip64"] - VERSION ="(python %s.%s.%s)" % (sys.version_info.major, sys.version_info.minor, sys.version_info.micro) + VERSION ="(python %s.%s.%s)" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]) @classmethod -- cgit v1.2.3 From 56caf611ab8f733ac8a7ea09d2a3d492bd485762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= Date: Sun, 22 Feb 2015 03:09:40 +0100 Subject: Some more changes --- module/plugins/internal/UnZip.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 704b49ca0..d95afbc70 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -12,7 +12,7 @@ from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.10" + __version__ = "1.11" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -34,7 +34,11 @@ class UnZip(Extractor): return z.namelist() - def check(self): + def check(self, password): + pass + + + def test(self): with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: badfile = z.testzip() -- cgit v1.2.3 From 3a9c167ceca27d57dbef927626fe853a3d0e30b2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 1 Mar 2015 22:41:08 +0100 Subject: [Extractor] Use self.target --- module/plugins/internal/UnZip.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index d95afbc70..dd57a54a7 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -7,7 +7,6 @@ import sys import zipfile from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError -from module.utils import fs_encode class UnZip(Extractor): @@ -29,7 +28,7 @@ class UnZip(Extractor): def list(self, password=None): - with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: + with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: z.setpassword(password) return z.namelist() @@ -39,7 +38,7 @@ class UnZip(Extractor): def test(self): - with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: + with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: badfile = z.testzip() if badfile: @@ -50,7 +49,7 @@ class UnZip(Extractor): def extract(self, password=None): try: - with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: + with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: z.setpassword(password) badfile = z.testzip() -- cgit v1.2.3 From 8b432eb80715f84800febb88620d943211e28051 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 4 Mar 2015 02:21:50 +0100 Subject: Revert 3a9c167ceca27d57dbef927626fe853a3d0e30b2 --- module/plugins/internal/UnZip.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index dd57a54a7..d95afbc70 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -7,6 +7,7 @@ import sys import zipfile from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError +from module.utils import fs_encode class UnZip(Extractor): @@ -28,7 +29,7 @@ class UnZip(Extractor): def list(self, password=None): - with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: + with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: z.setpassword(password) return z.namelist() @@ -38,7 +39,7 @@ class UnZip(Extractor): def test(self): - with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: + with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: badfile = z.testzip() if badfile: @@ -49,7 +50,7 @@ class UnZip(Extractor): def extract(self, password=None): try: - with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z: + with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: z.setpassword(password) badfile = z.testzip() -- cgit v1.2.3 From 329293e0bb0cf4008688d8c73d4b98caa7082141 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 26 Mar 2015 10:40:32 +0100 Subject: [Extractor] Rename method 'test' to 'verify' --- module/plugins/internal/UnZip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/UnZip.py') diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index d95afbc70..8d3fec370 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -12,7 +12,7 @@ from module.utils import fs_encode class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.11" + __version__ = "1.12" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" @@ -38,7 +38,7 @@ class UnZip(Extractor): pass - def test(self): + def verify(self): with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z: badfile = z.testzip() -- cgit v1.2.3