From fb14759bb9addc2beeefa479b5ccf52e141de123 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch
Date: Mon, 3 Feb 2020 15:07:41 +0100
Subject: [PATCH] Add a switch for zip functionality
---
Dockerfile | 1 +
merge_images | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index cb1ad31..acd28ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
imagemagick \
python3.5 \
+ zip \
&& rm -rf /var/lib/apt/lists/*
diff --git a/merge_images b/merge_images
index 9b7ee00..f3684aa 100755
--- a/merge_images
+++ b/merge_images
@@ -22,26 +22,31 @@ def parse_arguments():
type=os.path.abspath)
parser.add_argument('-o', dest='output_dir', required=True,
type=os.path.abspath)
+ parser.add_argument('--zip', action='store_true', default=False,
+ dest='zip', help='package result files in zip bundles',
+ required=False)
return parser.parse_args()
-def merge_images(input_dir, output_dir):
+def merge_images(input_dir, output_dir, zip):
try:
os.mkdir(output_dir)
except FileExistsError:
pass
cmd = 'ls -Q -v {i}/*.* > {i}/file_list.txt'.format(i=input_dir)
subprocess.run(cmd, shell=True)
- cmd = 'convert @{i}/file_list.txt {o}/combined.tif'.format(i=input_dir,
- o=output_dir)
+ cmd = 'convert @{i}/file_list.txt {o}/combined.tif'.format(i=input_dir, o=output_dir)
subprocess.run(cmd, shell=True)
cmd = 'rm {i}/file_list.txt'.format(i=input_dir)
subprocess.run(cmd, shell=True)
+ if zip:
+ cmd = 'cd {o} && zip -m combined.zip combined.tif && cd -'.format(o=output_dir)
+ subprocess.run(cmd, shell=True)
def main():
args = parse_arguments()
- merge_images(args.input_dir, args.output_dir)
+ merge_images(args.input_dir, args.output_dir, args.zip)
if __name__ == '__main__':