From 1198d1b6b9eca153b3a89cae3c62626b213c4469 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Fri, 9 Oct 2020 15:19:20 +0000 Subject: [PATCH] correct parsing of repeated params, fixes #26, #18 switch to 'zimit' CMD instead of ENTRYPOINT (#21) --- Dockerfile | 3 ++- index.js | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 816c8a2..078e2f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,7 @@ ADD config.yaml /app/ ADD uwsgi.ini /app/ ADD run.sh /app/ ADD index.js /app/ +RUN ln -s /app/run.sh /usr/bin/zimit -ENTRYPOINT ["/app/run.sh"] +CMD ["zimit"] diff --git a/index.js b/index.js index fff8bfd..621a28e 100644 --- a/index.js +++ b/index.js @@ -325,8 +325,15 @@ function runWarc2Zim(params, checkOnly = true) { if (!OPTS.includes(key)) { zimOptsStr += (key.length === 1 ? "-" : "--") + key + " "; - if (typeof(params[key]) === "string") { - zimOptsStr += `"${params[key]}" `; + switch (typeof(params[key])) { + case "string": + case "number": + zimOptsStr += `"${params[key]}" `; + break; + + case "object": + zimOptsStr += params[key].join(` --${key} `); + break; } } }