yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(cli): make emqx_ctl aware of max width

This commit is contained in:
Zaiming (Stone) Shi 2021-12-16 15:47:30 +01:00
parent b9a3b558ee
commit 47661042b9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/emqx/src/emqx_ctl.erl
View File

@ -160,18 +160,28 @@ format(Format, Args) ->
-spec(format_usage([cmd_usage()]) -> [string()]). -spec(format_usage([cmd_usage()]) -> [string()]).
format_usage(UsageList) -> format_usage(UsageList) ->
Width = lists:foldl(fun({CmdStr, _}, W) ->
max(iolist_size(CmdStr), W)
end, 0, UsageList),
lists:map( lists:map(
fun({CmdParams, Desc}) -> fun({CmdParams, Desc}) ->
format_usage(CmdParams, Desc) format_usage(CmdParams, Desc, Width)
end, UsageList). end, UsageList).
-spec(format_usage(cmd_params(), cmd_descr()) -> string()). -spec(format_usage(cmd_params(), cmd_descr()) -> string()).
format_usage(CmdParams, Desc) -> format_usage(CmdParams, Desc) ->
format_usage(CmdParams, Desc, 0).
format_usage(CmdParams, Desc, 0) ->
format_usage(CmdParams, Desc, iolist_size(CmdParams));
format_usage(CmdParams, Desc, Width) ->
CmdLines = split_cmd(CmdParams), CmdLines = split_cmd(CmdParams),
DescLines = split_cmd(Desc), DescLines = split_cmd(Desc),
Zipped = zip_cmd(CmdLines, DescLines),
Fmt = "~-" ++ integer_to_list(Width + 1) ++ "s# ~ts~n",
lists:foldl(fun({CmdStr, DescStr}, Usage) -> lists:foldl(fun({CmdStr, DescStr}, Usage) ->
Usage ++ format("~-70s# ~ts~n", [CmdStr, DescStr]) Usage ++ format(Fmt, [CmdStr, DescStr])
end, "", zip_cmd(CmdLines, DescLines)). end, "", Zipped).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% gen_server callbacks %% gen_server callbacks