|
|
@ -101,7 +101,7 @@ proc execWithOutput*(command: string, workingDir:string = "",
|
|
|
|
result = (TaintedString"", TaintedString"", -1)
|
|
|
|
result = (TaintedString"", TaintedString"", -1)
|
|
|
|
var outSeq, errSeq: seq[TaintedString]
|
|
|
|
var outSeq, errSeq: seq[TaintedString]
|
|
|
|
outSeq = @[]; errSeq = @[]
|
|
|
|
outSeq = @[]; errSeq = @[]
|
|
|
|
var outputCollector = combineProcMsgHandlers(msgCB,
|
|
|
|
let outputCollector = combineProcMsgHandlers(msgCB,
|
|
|
|
proc(outMsg, errMsg: TaintedString, cmd: string): void {.closure.} =
|
|
|
|
proc(outMsg, errMsg: TaintedString, cmd: string): void {.closure.} =
|
|
|
|
if outMsg.len > 0: outSeq.add(outMsg)
|
|
|
|
if outMsg.len > 0: outSeq.add(outMsg)
|
|
|
|
if errMsg.len > 0: errSeq.add(errMsg))
|
|
|
|
if errMsg.len > 0: errSeq.add(errMsg))
|
|
|
@ -187,9 +187,10 @@ proc termColor*(color: TermColor, bright, bold = false): string =
|
|
|
|
proc withColor*(str: string, color: TermColor, bright, bold = false): string =
|
|
|
|
proc withColor*(str: string, color: TermColor, bright, bold = false): string =
|
|
|
|
return termColor(color, bright, bold) & str
|
|
|
|
return termColor(color, bright, bold) & str
|
|
|
|
|
|
|
|
|
|
|
|
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 stripAnsi*(str: string): string =
|
|
|
|
|
|
|
|
let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]"
|
|
|
|
|
|
|
|
return str.replace(STRIP_ANSI_REGEX, "")
|
|
|
|
|
|
|
|
|
|
|
|
proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
|
|
|
|
proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
|
|
|
|
result = @[]
|
|
|
|
result = @[]
|
|
|
|