From 67ec532d7a614cd39cf1e4d36a4ba963c9e166ee Mon Sep 17 00:00:00 2001 From: Maciej Tronowski Date: Tue, 14 Apr 2015 11:51:32 +0200 Subject: [PATCH] fix handling zip archives --- filex/ftp.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/filex/ftp.py b/filex/ftp.py index 39ee807..49f470f 100644 --- a/filex/ftp.py +++ b/filex/ftp.py @@ -1,5 +1,6 @@ from datetime import datetime from Queue import Queue, Empty +from itertools import chain import os import re from threading import Event @@ -167,7 +168,8 @@ class FTPOperation: elif self.match_ext(archive, '.tar.bz2', '.tbz'): cmd, args = 'tar', ['cvjf', os.path.join(path, archive), '-C', path] + files elif self.match_ext(archive, '.zip'): - cmd, args = 'zip', ['-r', os.path.join(path, archive)] + [os.path.join(path, f) for f in files] + cmd, args = 'jar', (['cvMf', os.path.join(path, archive)] + + list(chain.from_iterable(('-C', path, f) for f in files))) else: raise ValueError('Unknown archive type: {}'.format(archive)) @@ -178,15 +180,15 @@ class FTPOperation: def extract(self, server, archive, dst): if self.match_ext(archive, '.tar.gz', '.tgz'): - cmd, args = 'tar', ['xvzf', archive, '-C', dst] + cmd, args = 'tar', ('xvzf', archive, '-C', dst) elif self.match_ext(archive, '.tar.bz2', '.tbz'): - cmd, args = 'tar', ['xvjf', archive, '-C', dst] + cmd, args = 'tar', ('xvjf', archive, '-C', dst) elif self.match_ext(archive, '.zip'): - cmd, args = 'unzip', [archive, '-d', dst] + cmd, args = 'unzip', (archive, '-d', dst) else: raise ValueError('Unknown archive type: {}'.format(archive)) # FIXME handling filename with # - self.op_attr.set_disk_stack('#'.join(["popen:argv=", cmd] + args)) + self.op_attr.set_disk_stack('#'.join(("popen:argv=", cmd) + args)) return self.get(server) -- 1.7.9.5