rnhmjoj/magnetico
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

better error handling at iso8601

Browse Source
This commit is contained in:
Bora M. Alper 2018-12-30 08:24:33 +03:00
parent 32fbe90604
commit e7f5fb0831
No known key found for this signature in database
GPG Key ID: 8F1A9504E1BD114D
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/persistence/iso8601.go
View File

@ -31,32 +31,44 @@ func ParseISO8601(s string) (*time.Time, Granularity, error) {
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
} }
t := time.Date(year, time.December, daysOfMonth(time.December, year), 23, 59, 59, 0, time.UTC) t := time.Date(year, time.December, daysOfMonth(time.December, year), 23, 59, 59, 0, time.UTC)
return &t, Year, nil return &t, Year, nil
} }
if matches := monthRE.FindStringSubmatch(s); len(matches) != 0 { if matches := monthRE.FindStringSubmatch(s); len(matches) != 0 {
month, err := parseMonth(matches[2]) month, err := parseMonth(matches[2])
if err != nil {
return nil, -1, err
}
year, err := parseYear(matches[1]) year, err := parseYear(matches[1])
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
} }
t := time.Date(year, month, 31, 23, 59, 59, 0, time.UTC) t := time.Date(year, month, 31, 23, 59, 59, 0, time.UTC)
return &t, Month, nil return &t, Month, nil
} }
if matches := weekRE.FindStringSubmatch(s); len(matches) != 0 { if matches := weekRE.FindStringSubmatch(s); len(matches) != 0 {
week, err := parseWeek(matches[2]) week, err := parseWeek(matches[2])
if err != nil {
return nil, -1, err
}
year, err := parseYear(matches[1]) year, err := parseYear(matches[1])
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
} }
t := time.Date(year, time.January, week*7, 23, 59, 59, 0, time.UTC) t := time.Date(year, time.January, week*7, 23, 59, 59, 0, time.UTC)
return &t, Week, nil return &t, Week, nil
} }
if matches := dayRE.FindStringSubmatch(s); len(matches) != 0 { if matches := dayRE.FindStringSubmatch(s); len(matches) != 0 {
month, err := parseMonth(matches[2]) month, err := parseMonth(matches[2])
if err != nil {
return nil, -1, err
}
year, err := parseYear(matches[1]) year, err := parseYear(matches[1])
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
@ -65,21 +77,29 @@ func ParseISO8601(s string) (*time.Time, Granularity, error) {
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
} }
t := time.Date(year, month, day, 23, 59, 59, 0, time.UTC) t := time.Date(year, month, day, 23, 59, 59, 0, time.UTC)
return &t, Day, nil return &t, Day, nil
} }
if matches := hourRE.FindStringSubmatch(s); len(matches) != 0 { if matches := hourRE.FindStringSubmatch(s); len(matches) != 0 {
month, err := parseMonth(matches[2]) month, err := parseMonth(matches[2])
if err != nil {
return nil, -1, err
}
year, err := parseYear(matches[1]) year, err := parseYear(matches[1])
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
} }
hour, err := parseHour(matches[4]) hour, err := parseHour(matches[4])
if err != nil {
return nil, -1, err
}
day, err := parseDay(matches[3], daysOfMonth(month, year)) day, err := parseDay(matches[3], daysOfMonth(month, year))
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
} }
t := time.Date(year, month, day, hour, 59, 59, 0, time.UTC) t := time.Date(year, month, day, hour, 59, 59, 0, time.UTC)
return &t, Hour, nil return &t, Hour, nil
} }