|
|
|
@ -1,21 +1,22 @@
|
|
|
|
|
import times
|
|
|
|
|
|
|
|
|
|
const zeroTime = fromUnix(0)
|
|
|
|
|
const ISO_8601_FULL_FORMAT = "yyyy-MM-dd'T'HH:mm:sszzz"
|
|
|
|
|
const ISO_8601_FORMATS = @[
|
|
|
|
|
"yyyy-MM-dd'T'HH:mm:ssz",
|
|
|
|
|
"yyyy-MM-dd'T'HH:mm:sszzz",
|
|
|
|
|
"yyyy-MM-dd'T'HH:mm:ss'.'fffzzz",
|
|
|
|
|
"yyyy-MM-dd HH:mm:ssz",
|
|
|
|
|
"yyyy-MM-dd HH:mm:sszzz",
|
|
|
|
|
"yyyy-MM-dd HH:mm:ss'.'fffzzz"
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
proc format*(ti: TimeInterval, fmt: string): string =
|
|
|
|
|
let info = (fromUnix(0) + ti).utc
|
|
|
|
|
let info = (zeroTime + ti).utc
|
|
|
|
|
return info.format(fmt)
|
|
|
|
|
|
|
|
|
|
# Will be deprecated in Nim 0.18.1 as it will exist in the standard times module.
|
|
|
|
|
proc `-`*(a, b: DateTime): Duration {.deprecated} =
|
|
|
|
|
return times.`-`(a,b)
|
|
|
|
|
|
|
|
|
|
proc `<`*(a, b: DateTime): bool {.deprecated} =
|
|
|
|
|
return times.`<`(a,b)
|
|
|
|
|
|
|
|
|
|
proc `<=`*(a, b: DateTime): bool {.deprecated} =
|
|
|
|
|
return times.`<=`(a,b)
|
|
|
|
|
proc format*(d: Duration, fmt: string): string =
|
|
|
|
|
let info = (fromUnix(0) + d).utc
|
|
|
|
|
return info.format(fmt)
|
|
|
|
|
|
|
|
|
|
proc `<`*(a, b: TimeInterval): bool =
|
|
|
|
|
return (zeroTime + a) < (zeroTime + b)
|
|
|
|
@ -48,10 +49,14 @@ proc startOfWeek*(ti: DateTime, startDay = dMon): DateTime =
|
|
|
|
|
return (ti - diff.days).startOfDay
|
|
|
|
|
|
|
|
|
|
proc parseIso8601*(val: string): DateTime =
|
|
|
|
|
return val.parse(ISO_8601_FULL_FORMAT)
|
|
|
|
|
var errString = ""
|
|
|
|
|
for df in ISO_8601_FORMATS:
|
|
|
|
|
try: return val.parse(df)
|
|
|
|
|
except: errString &= "\n" & getCurrentExceptionMsg()
|
|
|
|
|
raise newException(Exception, "Could not parse date. Tried:" & errString)
|
|
|
|
|
|
|
|
|
|
proc formatIso8601*(d: DateTime): string =
|
|
|
|
|
return d.format(ISO_8601_FULL_FORMAT)
|
|
|
|
|
return d.format(ISO_8601_FORMATS[2])
|
|
|
|
|
|
|
|
|
|
# This is a workaround needed due a bug in Nim's times.parse procedure.
|
|
|
|
|
# see: https://github.com/nim-lang/Nim/issues/4922
|
|
|
|
|