Refactor color functions to provide a unified interface for fore/back ground.

This commit is contained in:
Jonathan Bernard 2018-05-29 14:18:14 -05:00
parent 49342818ec
commit b5d4e4fa71
2 changed files with 8 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
@ -172,14 +174,12 @@ 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"

View File

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