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

Config searches local directory as well, use CatchableError.

Browse Source
This commit is contained in:
Jonathan Bernard
2023-06-21 07:37:09 -05:00
parent b945534bd2
commit 0a49618ab3
3 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
cliutils/config.nim
View File

@ -6,11 +6,14 @@ type
docopt*: Table[string, Value]
json*: JsonNode
func keyNames(key: string): tuple[arg, env, json: string] =
result = (
"--" & key,
key.replace('-', '_').toUpper,
key.replace(re"(-\w)", proc (m: RegexMatch): string = ($m)[1..1].toUpper))
func keyNames(key: string): tuple[arg, env, json: string] {.raises: [KeyError].} =
try:
result = (
"--" & key,
key.replace('-', '_').toUpper,
key.replace(re"(-\w)", proc (m: RegexMatch): string = ($m)[1..1].toUpper))
except CatchableError:
raise newException(KeyError, "invalid config key: '" & key & "'")
template walkFieldDefs*(t: NimNode, body: untyped) =
let tTypeImpl = t.getTypeImpl
@ -51,7 +54,8 @@ proc initCombinedConfig*(
proc findConfigFile*(name: string, otherLocations: seq[string] = @[]): string =
let cfgLocations = @[
$getEnv(name.strip(chars = {'.'}).toUpper()),
$getEnv("HOME") / name ] & otherLocations
$getEnv("HOME") / name,
"." / name ] & otherLocations
result = cfgLocations.foldl(if fileExists(b): b else: a, "")
if result == "" or not fileExists(result):
@ -74,21 +78,33 @@ proc getVal*(cfg: CombinedConfig, key: string): string =
of JArray: return $node
else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"")
proc getVal*(cfg: CombinedConfig, key, default: string): string =
proc getVal*(cfg: CombinedConfig, key, default: string): string {.raises: [].} =
try: return getVal(cfg, key)
except: return default
except CatchableError: return default
proc getJson*(
cfg: CombinedConfig,
key: string
): JsonNode {.raises: [KeyError, ValueError, IOError, OSError]} =
proc getJson*(cfg: CombinedConfig, key: string): JsonNode =
let (argKey, envKey, jsonKey) = keyNames(key)
if cfg.docopt.contains(argKey) and cfg.docopt[argKey]: return parseJson($cfg.docopt[argKey])
elif existsEnv(envKey): return parseJson(getEnv(envKey))
elif cfg.json.hasKey(jsonKey): return cfg.json[jsonKey]
else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"")
try:
if cfg.docopt.contains(argKey) and cfg.docopt[argKey]: return parseJson($cfg.docopt[argKey])
elif existsEnv(envKey): return parseJson(getEnv(envKey))
elif cfg.json.hasKey(jsonKey): return cfg.json[jsonKey]
else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"")
except Exception:
raise newException(ValueError, "cannot parse value as JSON:" & getCurrentExceptionMsg())
proc getJson*(
cfg: CombinedConfig,
key: string,
default: JsonNode
) : JsonNode {.raises: []} =
proc getJson*(cfg: CombinedConfig, key: string, default: JsonNode): JsonNode =
try: return getJson(cfg, key)
except: return default
except CatchableError: return default
proc hasKey*(cfg: CombinedConfig, key: string): bool =
let (argKey, envKey, jsonKey) = keyNames(key)