From 96ee649bf62540cf852ac0b4f87e9bce5f8577a7 Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan@jdbernard.com>
Date: Sat, 2 Apr 2022 08:45:30 -0500
Subject: [PATCH] Change the logic around how we load our config.

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.
---
 private/version.nim |  2 +-
 ptk.nim             | 23 ++++++++---------------
 ptk.nimble          |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/private/version.nim b/private/version.nim
index f816605..1fcb51a 100644
--- a/private/version.nim
+++ b/private/version.nim
@@ -1 +1 @@
-const PTK_VERSION* = "1.0.13"
\ No newline at end of file
+const PTK_VERSION* = "1.0.14"
\ No newline at end of file
diff --git a/ptk.nim b/ptk.nim
index 4d57352..a2b2f47 100644
--- a/ptk.nim
+++ b/ptk.nim
@@ -307,28 +307,21 @@ Options:
     quit()
 
   # Find and parse the .ptkrc file
-  let ptkrcLocations = @[
-    if args["--config"]: $args["--config"] else:"",
-    ".ptkrc", $getEnv("PTKRC"), $getEnv("HOME") & "/.ptkrc"]
+  let ptkrcLocations =
+    if args["--config"]: @[$args["--config"]]
+    else: @[".ptkrc", $getEnv("PTKRC"), $getEnv("HOME") & "/.ptkrc"]
 
-  var ptkrcFilename: string =
-    foldl(ptkrcLocations, if len(a) > 0: a elif fileExists(b): b else: "")
+  let foundPtkrcLocations =
+    ptkrcLocations.filterIt(it.len > 0 and fileExists(it))
 
   var cfg: JsonNode
-  var cfgFile: File
-  if not fileExists(ptkrcFilename):
+  if foundPtkrcLocations.len < 1:
     warn "ptk: could not find .ptkrc file."
     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,
-    "unable to read config file: " & ptkrcFilename &
+    "unable to read config file: " & foundPtkrcLocations[0] &
     "\x0D\x0A" & getCurrentExceptionMsg())
 
   # Find the time log file
diff --git a/ptk.nimble b/ptk.nimble
index b47d8c5..bca2e1b 100644
--- a/ptk.nimble
+++ b/ptk.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "1.0.13"
+version       = "1.0.14"
 author        = "Jonathan Bernard"
 description   = "Personal Time Keeper"
 license       = "MIT"