4 Commits

3 changed files with 12 additions and 5 deletions

View File

@@ -21,14 +21,19 @@ proc termColor*(color: TermColor, bright, bold = false): string =
if bright: inc(colorVal, 60) if bright: inc(colorVal, 60)
return "\e[" & $colorVal & (if bold: ";1" else: "") & "m" return "\e[" & $colorVal & (if bold: ";1" else: "") & "m"
proc withColor*(str: string, color: TermColor, bright, bold = false): string =
proc withColor*(str: string, color: TermColor, bright, bold, skipReset = false): string =
if skipReset:
return termColor(color, bright, bold) & str return termColor(color, bright, bold) & str
else:
return termColor(color, bright, bold) & str & termReset
proc stripAnsi*(str: string): string = proc stripAnsi*(str: string): string =
let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]" let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{0,2})?)?[m|K]"
return str.replace(STRIP_ANSI_REGEX, "") return str.replace(STRIP_ANSI_REGEX, "")
proc doParseQueryParams[T](queryParams: T): seq[string] = proc doParseQueryParams[T](queryParams: T): seq[string] =
result = @[] result = @[]
@@ -40,8 +45,10 @@ proc doParseQueryParams[T](queryParams: T): seq[string] =
result.add("--" & k) result.add("--" & k)
if v != "true": result.add(v) # support things like ?verbose=true -> cmd --verbose if v != "true": result.add(v) # support things like ?verbose=true -> cmd --verbose
proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] = proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
doParseQueryParams(queryParams) doParseQueryParams(queryParams)
proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] = proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
doParseQueryParams(queryParams) doParseQueryParams(queryParams)

View File

@@ -1,6 +1,6 @@
# Package # Package
version = "0.9.1" version = "0.10.1"
author = "Jonathan Bernard" author = "Jonathan Bernard"
description = "Helper functions for writing command line interfaces." description = "Helper functions for writing command line interfaces."
license = "MIT" license = "MIT"

View File

@@ -95,7 +95,7 @@ proc getJson*(
elif cfg.json.hasKey(jsonKey): return cfg.json[jsonKey] elif cfg.json.hasKey(jsonKey): return cfg.json[jsonKey]
else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"") else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"")
except Exception: except Exception:
raise newException(ValueError, "cannot parse value as JSON:" & getCurrentExceptionMsg()) raise newException(ValueError, "cannot parse [" & getVal(cfg, key) & "] as JSON:" & getCurrentExceptionMsg())
proc getJson*( proc getJson*(
cfg: CombinedConfig, cfg: CombinedConfig,