From 5ee8117e968ec4799d4ce111cb0e5b305365343b Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 25 Sep 2024 14:21:42 -0500 Subject: [PATCH] simplify bbansi help generation --- src/hwylterm/bbansi.nim | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/hwylterm/bbansi.nim b/src/hwylterm/bbansi.nim index 80a0d18..258e123 100644 --- a/src/hwylterm/bbansi.nim +++ b/src/hwylterm/bbansi.nim @@ -176,9 +176,17 @@ when isMainModule: import std/[parseopt, strformat, sugar] const version = staticExec "git describe --tags --always --dirty=-dev" const longOptPad = 8 + const flags = collect( + for (s, l, d) in [ + ("h", "help", "show this help"), + ("v", "version", "show version"), + ("s", "style", "set style for string"), + ]: + fmt" [yellow]-{s}[/] [green]--{l.alignLeft(longOptPad)}[/] {d}" + ).join("\n") proc writeHelp() = let help = - fmt""" + bbfmt""" [bold]bbansi[/] \[[green]args...[/]] [[[faint]-h|-v[/]] [italic]usage[/]: @@ -190,22 +198,9 @@ when isMainModule: |-> [italic][red]some red[/red] but all italic[/italic] flags: - """.bb & - $( - bb( - collect( - for (s, l, d) in [ - ("h", "help", "show this help"), - ("v", "version", "show version"), - ("s", "style", "set style for string"), - ]: - fmt"[yellow]-{s}[/] [green]--{l.alignLeft(longOptPad)}[/] {d}" - ) - .join("\n ") - ) - ) - echo help - quit(QuitSuccess) +{flags} +""" + echo help; quit 0 proc testCard() = for style in [ @@ -228,8 +223,8 @@ flags: echo ")" proc writeVersion() = - echo fmt"[yellow]bbansi version[/][red] ->[/] [bold]{version}[/]".bb - quit(QuitSuccess) + echo bbfmt"[yellow]bbansi version[/][red] ->[/] [bold]{version}[/]" + quit 0 var strArgs: seq[string]