2 Commits
0.4.0 ... 0.5.0

2 changed files with 23 additions and 8 deletions

View File

@ -8,6 +8,8 @@ type
docopt*: Table[string, Value] docopt*: Table[string, Value]
json*: JsonNode json*: JsonNode
TermColor = ForegroundColor or BackgroundColor
proc getVal*(cfg: CombinedConfig, key, default: string): string = proc getVal*(cfg: CombinedConfig, key, default: string): string =
let argKey = "--" & key let argKey = "--" & key
let envKey = key.replace('-', '_').toUpper let envKey = key.replace('-', '_').toUpper
@ -91,7 +93,7 @@ proc execWithOutput*(command: string, workingDir:string = "",
args: openArray[string] = [], env: StringTableRef = nil, args: openArray[string] = [], env: StringTableRef = nil,
options: set[ProcessOption] = {poUsePath}, options: set[ProcessOption] = {poUsePath},
msgCB: HandleProcMsgCB = nil): msgCB: HandleProcMsgCB = nil):
tuple[output: TaintedString, error: TaintedString, exitCode: int] = tuple[output, error: TaintedString, exitCode: int] =
result = (TaintedString"", TaintedString"", -1) result = (TaintedString"", TaintedString"", -1)
var outSeq, errSeq: seq[TaintedString] var outSeq, errSeq: seq[TaintedString]
@ -172,14 +174,27 @@ proc daemonize*(pidfile, si, so, se: string, daemonMain: proc(): void): Pid =
return pid1 return pid1
proc termFG*(color: ForegroundColor, bright, bold = false): string = const termReset* = "\e[0;m"
proc termColor*(color: TermColor, bright, bold = false): string =
var colorVal = ord(color) var colorVal = ord(color)
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 termBG*(color: BackgroundColor, bright, bold = false): string = proc withColor*(str: string, color: TermColor, bright, bold = false): string =
var colorVal = ord(color) return termColor(color, bright, bold) & str
if bright: inc(colorVal, 60)
return "\e[" & $colorVal & "m"
const termReset* = "\e[0;m" let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]"
proc stripAnsi*(str: string): string = return str.replace(STRIP_ANSI_REGEX, "")
proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
result = @[]
for k,v in queryParams:
# support ?arg1=val1&arg2=val2 -> cmd val1 val2
if k.startsWith("arg"): result.add(v)
else :
result[1].add("--" & k)
if v != "true": result[1].add(v) # support things like ?verbose=true -> cmd --verbose

View File

@ -1,6 +1,6 @@
# Package # Package
version = "0.4.0" version = "0.5.0"
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"