From 689aee0a1da793bfc2e2a7621f504a1011e8460a Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Tue, 15 Dec 2020 22:09:47 -0600 Subject: [PATCH] Add merge zips --- source/diff.py | 15 --------------- source/easymacro2.py | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/source/diff.py b/source/diff.py index 9d43ce0..f8e8db6 100644 --- a/source/diff.py +++ b/source/diff.py @@ -596,21 +596,6 @@ class LODialog(object): return -# ~ Export ok -def merge_zip(target, zips): - try: - with zipfile.ZipFile(target, 'w', compression=zipfile.ZIP_DEFLATED) as t: - for path in zips: - with zipfile.ZipFile(path, compression=zipfile.ZIP_DEFLATED) as s: - for name in s.namelist(): - t.writestr(name, s.open(name).read()) - except Exception as e: - error(e) - return False - - return True - - # ~ Export ok def format(template, data): """ diff --git a/source/easymacro2.py b/source/easymacro2.py index a0cda2f..c9e4cfa 100644 --- a/source/easymacro2.py +++ b/source/easymacro2.py @@ -6181,6 +6181,20 @@ class Paths(object): z.extractall(path, members=members, pwd=pwd) return True + @classmethod + def merge_zip(cls, target, zips): + try: + with zipfile.ZipFile(target, 'w', compression=zipfile.ZIP_DEFLATED) as t: + for path in zips: + with zipfile.ZipFile(path, compression=zipfile.ZIP_DEFLATED) as s: + for name in s.namelist(): + t.writestr(name, s.open(name).read()) + except Exception as e: + error(e) + return False + + return True + @classmethod def copy(cls, source, target='', name=''): p, f, n, e = _P(source).info