Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
e9351fbd9d | |||
8036af6bc8 | |||
b9a69809eb | |||
969af93425 |
13
cliutils.nim
13
cliutils.nim
@ -10,12 +10,12 @@ type
|
||||
|
||||
TermColor = ForegroundColor or BackgroundColor
|
||||
|
||||
proc getVal*(cfg: CombinedConfig, key, default: string): string =
|
||||
proc getVal*(cfg: CombinedConfig, key: string): string =
|
||||
let argKey = "--" & key
|
||||
let envKey = key.replace('-', '_').toUpper
|
||||
let jsonKey = key.replace(re"(-\w)", proc (m: RegexMatch): string = ($m)[1..1].toUpper)
|
||||
|
||||
if cfg.docopt[argKey]: return $cfg.docopt[argKey]
|
||||
if cfg.docopt.contains(argKey) and cfg.docopt[argKey]: return $cfg.docopt[argKey]
|
||||
elif existsEnv(envKey): return getEnv(envKey)
|
||||
elif cfg.json.hasKey(jsonKey):
|
||||
let node = cfg.json[jsonKey]
|
||||
@ -27,8 +27,11 @@ proc getVal*(cfg: CombinedConfig, key, default: string): string =
|
||||
of JNull: return ""
|
||||
of JObject: return $node
|
||||
of JArray: return $node
|
||||
else: return default
|
||||
else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"")
|
||||
|
||||
proc getVal*(cfg: CombinedConfig, key, default: string): string =
|
||||
try: return getVal(cfg, key)
|
||||
except: return default
|
||||
|
||||
proc loadEnv*(): StringTableRef =
|
||||
result = newStringTable()
|
||||
@ -207,5 +210,5 @@ proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
|
||||
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
|
||||
result.add("--" & k)
|
||||
if v != "true": result.add(v) # support things like ?verbose=true -> cmd --verbose
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Package
|
||||
|
||||
version = "0.6.1"
|
||||
version = "0.6.3"
|
||||
author = "Jonathan Bernard"
|
||||
description = "Helper functions for writing command line interfaces."
|
||||
license = "MIT"
|
||||
|
Reference in New Issue
Block a user