mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

toml: add date and time checks (#12427)

Browse Source
This commit is contained in:
Larpon
2021-11-11 06:27:41 +01:00
committed by GitHub
parent 823a3ab838
commit 69fa87ad24
4 changed files with 125 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vlib/time/parse.c.v
View File

@ -4,22 +4,26 @@
module time
// parse_rfc3339 returns time from a date string in RFC 3339 datetime format.
// See also https://ijmacd.github.io/rfc3339-iso8601/ for a visual reference of
// the differences between ISO-8601 and RFC 3339.
pub fn parse_rfc3339(s string) ?Time {
if s == '' {
return error_invalid_time(0)
}
mut t := parse_iso8601(s) or { Time{} }
// Normalize the input before parsing. Good since iso8601 doesn't permit lower case `t` and `z`.
sn := s.replace_each(['t', 'T', 'z', 'Z'])
mut t := parse_iso8601(sn) or { Time{} }
// If parse_iso8601 DID NOT result in default values (i.e. date was parsed correctly)
if t != Time{} {
return t
}
t_i := s.index('T') or { -1 }
parts := if t_i != -1 { [s[..t_i], s[t_i + 1..]] } else { s.split(' ') }
t_i := sn.index('T') or { -1 }
parts := if t_i != -1 { [sn[..t_i], sn[t_i + 1..]] } else { sn.split(' ') }
// Check if s is date only
// Check if sn is date only
if !parts[0].contains_any(' Z') && parts[0].contains('-') {
year, month, day := parse_iso8601_date(s) ?
year, month, day := parse_iso8601_date(sn) ?
t = new_time(Time{
year: year
month: month
@ -27,7 +31,7 @@ pub fn parse_rfc3339(s string) ?Time {
})
return t
}
// Check if s is time only
// Check if sn is time only
if !parts[0].contains('-') && parts[0].contains(':') {
mut hour_, mut minute_, mut second_, mut microsecond_, mut unix_offset, mut is_local_time := 0, 0, 0, 0, i64(0), true
hour_, minute_, second_, microsecond_, unix_offset, is_local_time = parse_iso8601_time(parts[0]) ?
@ -173,6 +177,15 @@ fn parse_iso8601_date(s string) ?(int, int, int) {
if count != 3 {
return error_invalid_time(10)
}
if year > 9999 {
return error_invalid_time(13)
}
if month > 12 {
return error_invalid_time(14)
}
if day > 31 {
return error_invalid_time(15)
}
return year, month, day
}

2
vlib/time/parse_test.v
View File

@ -112,6 +112,8 @@ fn test_parse_iso8601_invalid() {
'2020-06-05Z',
'2020-06-05+00:00',
'15:38:06',
'2020-06-32T15:38:06.015959',
'2020-13-13T15:38:06.015959',
]
for format in formats {
time.parse_iso8601(format) or {