mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.argparse: Add support for repeatable parameters

Browse source 
These are gathered into arrays
This commit is contained in:
Kim Alvefur 2022-01-05 04:46:27 +01:00
parent 9f0a28f1c4
commit 21740a1382
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spec/util_argparse_spec.lua
View file

@ -50,4 +50,9 @@ describe("parse", function()
assert.equal("-h", where, "returned where"); assert.equal("-h", where, "returned where");
end); end);
it("supports array arguments", function ()
local opts, err = parse({ "--item"; "foo"; "--item"; "bar" }, { array_params = { item = true } });
assert.falsy(err);
assert.same({"foo","bar"}, opts.item);
end)
end); end);

11
util/argparse.lua
View file

@ -1,6 +1,7 @@
local function parse(arg, config) local function parse(arg, config)
local short_params = config and config.short_params or {}; local short_params = config and config.short_params or {};
local value_params = config and config.value_params or {}; local value_params = config and config.value_params or {};
local array_params = config and config.array_params or {};
local parsed_opts = {}; local parsed_opts = {};
@ -30,7 +31,7 @@ local function parse(arg, config)
end end
local param_k, param_v; local param_k, param_v;
if value_params[param] then if value_params[param] or array_params[param] then
param_k, param_v = param, table.remove(arg, 1); param_k, param_v = param, table.remove(arg, 1);
if not param_v then if not param_v then
return nil, "missing-value", raw_param; return nil, "missing-value", raw_param;
@ -46,8 +47,16 @@ local function parse(arg, config)
end end
param_k = param_k:gsub("%-", "_"); param_k = param_k:gsub("%-", "_");
end end
if array_params[param] then
if parsed_opts[param_k] then
table.insert(parsed_opts[param_k], param_v);
else
parsed_opts[param_k] = { param_v };
end
else
parsed_opts[param_k] = param_v; parsed_opts[param_k] = param_v;
end end
end
for i = 1, #arg do for i = 1, #arg do
parsed_opts[i] = arg[i]; parsed_opts[i] = arg[i];
end end