status-im/nim-confutils
2
0
Fork 0
mirror of https://github.com/status-im/nim-confutils.git synced 2025-02-02 23:33:47 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetic improvements

Browse Source
This commit is contained in:
Zahary Karadjov 2019-10-28 21:03:46 +02:00
parent adc63e8aff
commit 0129a56b78
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
confutils.nim
View File

@ -190,16 +190,17 @@ template padding(output: string, desiredWidth: int): string =
spaces(max(desiredWidth - output.len, 0))
proc writeDesc(help: var string, appInfo: HelpAppInfo, desc: string) =
const descSpacing = " "
let
nonDescColumns = (6 + appInfo.longformsWidth)
remainingColumns = appInfo.terminalWidth - nonDescColumns
descIndent = (5 + appInfo.longformsWidth + descSpacing.len)
remainingColumns = appInfo.terminalWidth - descIndent
if remainingColumns < 36:
helpOutput "\p ", wrapWords(desc, appInfo.terminalWidth - 1,
helpOutput "\p ", wrapWords(desc, appInfo.terminalWidth - 2,
newLine = "\p ")
else:
helpOutput wrapWords(desc, remainingColumns,
newLine = "\p" & spaces(nonDescColumns))
helpOutput descSpacing, wrapWords(desc, remainingColumns,
newLine = "\p" & spaces(descIndent))
proc describeInvocation(help: var string,
cmd: CmdInfo, cmdInvocation: string,
@ -225,14 +226,23 @@ proc describeInvocation(help: var string,
helpOutput cliArg, padding(cliArg, 6 + appInfo.longformsWidth)
help.writeDesc appInfo, arg.desc
type
OptionsType = enum
normalOpts
defaultCmdOpts
conditionalOpts
proc describeOptions(help: var string,
cmd: CmdInfo, cmdInvocation: string,
appInfo: HelpAppInfo, isSubOptions = false) =
appInfo: HelpAppInfo, optionsType = normalOpts) =
if cmd.hasOpts:
if isSubOptions:
helpOutput ", the following additional options are available:\p\p"
else:
case optionsType
of normalOpts:
helpOutput "\pThe following options are available:\p\p"
of conditionalOpts:
helpOutput ", the following additional options are available:\p\p"
of defaultCmdOpts:
discard
for opt in cmd.opts:
if opt.kind == Arg: continue
@ -267,14 +277,14 @@ proc describeOptions(help: var string,
helpOutput "\pWhen ", styleBright, fgBlue, opt.humaneName, fgWhite, " = ", fgGreen, subCmd.name
if i == opt.defaultSubCmd: helpOutput " (default)"
help.describeOptions subCmd, cmdInvocation, appInfo, isSubOptions = true
help.describeOptions subCmd, cmdInvocation, appInfo, conditionalOpts
let subCmdDiscriminator = cmd.getSubCmdDiscriminator
if subCmdDiscriminator != nil:
let defaultCmdIdx = subCmdDiscriminator.defaultSubCmd
if defaultCmdIdx != -1:
let defaultCmd = subCmdDiscriminator.subCmds[defaultCmdIdx]
help.describeOptions defaultCmd, cmdInvocation, appInfo
help.describeOptions defaultCmd, cmdInvocation, appInfo, defaultCmdOpts
helpOutput fgSection, "\pAvailable sub-commands:\p"