jdb/ptk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the logic around how we load our config.

Browse Source 
The previous logic that was intended to find the first non-empty
filename that represented a valid file location was wrong. Replaced with
a simpler filter-based version.

Additionally, if the user provides a specific configuration filename, we
no longer fall back to the defaults if it is not found. Instead we just
err out and inform them that the file the specified was not found.
This commit is contained in:
Jonathan Bernard 2022-04-02 08:45:30 -05:00
parent 69177ffa17
commit 96ee649bf6
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
private/version.nim
View File

@ -1 +1 @@
const PTK_VERSION* = "1.0.13" const PTK_VERSION* = "1.0.14"

23
ptk.nim
View File

@ -307,28 +307,21 @@ Options:
quit() quit()
# Find and parse the .ptkrc file # Find and parse the .ptkrc file
let ptkrcLocations = @[ let ptkrcLocations =
if args["--config"]: $args["--config"] else:"", if args["--config"]: @[$args["--config"]]
".ptkrc", $getEnv("PTKRC"), $getEnv("HOME") & "/.ptkrc"] else: @[".ptkrc", $getEnv("PTKRC"), $getEnv("HOME") & "/.ptkrc"]
var ptkrcFilename: string = let foundPtkrcLocations =
foldl(ptkrcLocations, if len(a) > 0: a elif fileExists(b): b else: "") ptkrcLocations.filterIt(it.len > 0 and fileExists(it))
var cfg: JsonNode var cfg: JsonNode
var cfgFile: File if foundPtkrcLocations.len < 1:
if not fileExists(ptkrcFilename):
warn "ptk: could not find .ptkrc file." warn "ptk: could not find .ptkrc file."
debug "ptk: considered the following locations:\n\t" & ptkrcLocations.join("\n\t") debug "ptk: considered the following locations:\n\t" & ptkrcLocations.join("\n\t")
#ptkrcFilename = $getEnv("HOME") & "/.ptkrc"
#try:
# cfgFile = open(ptkrcFilename, fmWrite)
# cfgFile.write("{\"timelineLogFile\": \"timeline.log.json\"}")
#except: warn "ptk: could not write default .ptkrc to " & ptkrcFilename
#finally: close(cfgFile)
try: cfg = parseFile(ptkrcFilename) try: cfg = parseFile(foundPtkrcLocations[0])
except: raise newException(IOError, except: raise newException(IOError,
"unable to read config file: " & ptkrcFilename & "unable to read config file: " & foundPtkrcLocations[0] &
"\x0D\x0A" & getCurrentExceptionMsg()) "\x0D\x0A" & getCurrentExceptionMsg())
# Find the time log file # Find the time log file

2
ptk.nimble
View File

@ -1,6 +1,6 @@
# Package # Package
version = "1.0.13" version = "1.0.14"
author = "Jonathan Bernard" author = "Jonathan Bernard"
description = "Personal Time Keeper" description = "Personal Time Keeper"
license = "MIT" license = "MIT"