jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Assume local DST iff no timezone is given

Browse source
This commit is contained in:
Felix Krause 2016-11-14 18:36:03 +01:00
commit 0587a57807
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/pure/times.nim
View file

@ -1097,6 +1097,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
else: else:
raise newException(ValueError, raise newException(ValueError,
"Couldn't parse timezone offset (z), got: " & value[j]) "Couldn't parse timezone offset (z), got: " & value[j])
info.isDST = false
j += 2 j += 2
of "zz": of "zz":
if value[j] == '+': if value[j] == '+':
@ -1106,6 +1107,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
else: else:
raise newException(ValueError, raise newException(ValueError,
"Couldn't parse timezone offset (zz), got: " & value[j]) "Couldn't parse timezone offset (zz), got: " & value[j])
info.isDST = false
j += 3 j += 3
of "zzz": of "zzz":
var factor = 0 var factor = 0
@ -1118,6 +1120,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
j += 4 j += 4
info.timezone += factor * value[j..j+1].parseInt() * 60 info.timezone += factor * value[j..j+1].parseInt() * 60
j += 2 j += 2
info.isDST = false
else: else:
# Ignore the token and move forward in the value string by the same length # Ignore the token and move forward in the value string by the same length
j += token.len j += token.len
@ -1167,7 +1170,8 @@ proc parse*(value, layout: string): TimeInfo =
info.hour = 0 info.hour = 0
info.minute = 0 info.minute = 0
info.second = 0 info.second = 0
info.isDST = false # DST is never encoded in timestamps. info.isDST = true # using this is flag for checking whether a timezone has \
# been read (because DST is always false when a tz is parsed)
while true: while true:
case layout[i] case layout[i]
of ' ', '-', '/', ':', '\'', '\0', '(', ')', '[', ']', ',': of ' ', '-', '/', ':', '\'', '\0', '(', ')', '[', ']', ',':
@ -1197,8 +1201,17 @@ proc parse*(value, layout: string): TimeInfo =
parseToken(info, token, value, j) parseToken(info, token, value, j)
token = "" token = ""
# Now we process it again with the correct isDST to correct things like if info.isDST:
# weekday and yearday. # means that no timezone has been parsed. In this case, we need to check
# whether the date is within DST of the local time.
let tmp = getLocalTime(toTime(info))
# correctly set isDST so that the following step works on the correct time
info.isDST = tmp.isDST
# Correct weekday and yearday; transform timestamp to local time.
# There currently is no way of returning this with the original (parsed)
# timezone while also setting weekday and yearday (we are depending on stdlib
# to provide this calculation).
return getLocalTime(toTime(info)) return getLocalTime(toTime(info))
# Leap year calculations are adapted from: # Leap year calculations are adapted from: