Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
69177ffa17 | |||
8b6405441a |
@ -22,10 +22,18 @@ const ISO_TIME_FORMAT* = "yyyy-MM-dd'T'HH:mm:ss"
|
||||
## The canonical time format used by PTK.
|
||||
|
||||
const TIME_FORMATS* = @[
|
||||
(fmtStr: "yyyy-MM-dd'T'HH:mm:sszzz", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd HH:mm:sszzz", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd'T'HH:mm:sszz", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd HH:mm:sszz", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd'T'HH:mm:ssz", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd HH:mm:ssz", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd'T'HH:mm:ss", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd HH:mm:ss", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd'T'HH:mm", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd HH:mm", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM-dd", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "yyyy-MM", offsetFrom: OffsetFrom.None),
|
||||
(fmtStr: "MM-dd'T'HH:mm:ss", offsetFrom: OffsetFrom.Year),
|
||||
(fmtStr: "MM-dd HH:mm:ss", offsetFrom: OffsetFrom.Year),
|
||||
(fmtStr: "MM-dd'T'HH:mm", offsetFrom: OffsetFrom.Year),
|
||||
@ -48,15 +56,16 @@ proc getIfExists*(n: JsonNode, key: string): JsonNode =
|
||||
|
||||
proc parseTime*(timeStr: string): DateTime =
|
||||
## Helper to parse time strings trying multiple known formats.
|
||||
let now = now()
|
||||
|
||||
for fmt in TIME_FORMATS:
|
||||
try:
|
||||
let now = now()
|
||||
let parsed = parse(timeStr, fmt.fmtStr)
|
||||
case fmt.offsetFrom:
|
||||
of OffsetFrom.None:
|
||||
return parsed
|
||||
of OffsetFrom.Year:
|
||||
return initDateTime(parsed.monthday, parsed.month, now.year,
|
||||
return dateTime(now.year, parsed.month, parsed.monthday,
|
||||
parsed.hour, parsed.minute, parsed.second, parsed.nanosecond,
|
||||
now.timezone)
|
||||
of OffsetFrom.Month:
|
||||
|
@ -1 +1 @@
|
||||
const PTK_VERSION* = "1.0.11"
|
||||
const PTK_VERSION* = "1.0.13"
|
13
ptk.nim
13
ptk.nim
@ -318,12 +318,13 @@ Options:
|
||||
var cfgFile: File
|
||||
if not fileExists(ptkrcFilename):
|
||||
warn "ptk: could not find .ptkrc file."
|
||||
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)
|
||||
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)
|
||||
except: raise newException(IOError,
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Package
|
||||
|
||||
version = "1.0.11"
|
||||
version = "1.0.13"
|
||||
author = "Jonathan Bernard"
|
||||
description = "Personal Time Keeper"
|
||||
license = "MIT"
|
||||
|
Reference in New Issue
Block a user