jdb/nim-cli-utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make stripAnsi GC-safe.

Browse Source
This commit is contained in:
Jonathan Bernard 2020-11-12 04:26:43 -06:00
parent 438ea5f7b3
commit 0175d957d1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cliutils.nim
View File

@ -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 = @[]

3
cliutils.nimble
View File

@ -1,6 +1,6 @@
# Package # Package
version = "0.6.4" version = "0.6.5"
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"
@ -8,4 +8,3 @@ license = "MIT"
# Dependencies # Dependencies
requires @["nim >= 0.19.0", "docopt >= 0.6.8"] requires @["nim >= 0.19.0", "docopt >= 0.6.8"]