go-pkg/dateparse
2
0
Fork 0
mirror of https://github.com/araddon/dateparse.git synced 2024-11-13 05:06:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13 from araddon/parse_plus_offset

Browse Source 
Parse plus offset date
This commit is contained in:
Aaron Raddon 2017-07-11 14:10:22 -07:00 committed by GitHub
commit c1b49336a8
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
parseany.go
View File

@ -35,7 +35,7 @@ const (
ST_DIGITDASHT ST_DIGITDASHT
ST_DIGITDASHTZ ST_DIGITDASHTZ
ST_DIGITDASHTZDIGIT ST_DIGITDASHTZDIGIT
ST_DIGITDASHTDASH ST_DIGITDASHTDELTA
ST_DIGITCOMMA ST_DIGITCOMMA
ST_DIGITCOLON ST_DIGITCOLON
ST_DIGITSLASH ST_DIGITSLASH
@ -217,9 +217,10 @@ iterRunes:
// With another dash aka time-zone at end // With another dash aka time-zone at end
// ST_DIGITDASHTDASH // ST_DIGITDASHTDASH
// 2017-06-25T17:46:57.45706582-07:00 // 2017-06-25T17:46:57.45706582-07:00
// 2017-06-25T17:46:57+04:00
switch { switch {
case r == '-': case r == '-', r == '+':
state = ST_DIGITDASHTDASH state = ST_DIGITDASHTDELTA
case r == 'Z': case r == 'Z':
state = ST_DIGITDASHTZ state = ST_DIGITDASHTZ
} }
@ -499,16 +500,16 @@ iterRunes:
return time.Time{}, err return time.Time{}, err
} }
} }
case ST_DIGITDASHTDASH: case ST_DIGITDASHTDELTA:
// With another dash aka time-zone at end // With another +/- time-zone at end
// 2006-01-02T15:04:05.999999999+07:00
// 2006-01-02T15:04:05.999999999-07:00 // 2006-01-02T15:04:05.999999999-07:00
// 2006-01-02T15:04:05.99999999-07:00 // 2006-01-02T15:04:05.999999+07:00
// 2006-01-02T15:04:05.9999999-07:00
// 2006-01-02T15:04:05.999999-07:00 // 2006-01-02T15:04:05.999999-07:00
// 2006-01-02T15:04:05.99999-07:00 // 2006-01-02T15:04:05.999+07:00
// 2006-01-02T15:04:05.9999-07:00
// 2006-01-02T15:04:05.999-07:00 // 2006-01-02T15:04:05.999-07:00
// 2006-01-02T15:04:05.99-07:00 // 2006-01-02T15:04:05+07:00
// 2006-01-02T15:04:05-07:00
if t, err := time.Parse("2006-01-02T15:04:05-07:00", datestr); err == nil { if t, err := time.Parse("2006-01-02T15:04:05-07:00", datestr); err == nil {
return t, nil return t, nil
} else { } else {

8
parseany_test.go
View File

@ -393,6 +393,14 @@ func TestParse(t *testing.T) {
assertf(t, err == nil, "%v", err) assertf(t, err == nil, "%v", err)
assert(t, "2014-05-11 08:20:13 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) assert(t, "2014-05-11 08:20:13 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("2016-06-21T19:55:00+01:00")
assertf(t, err == nil, "%v", err)
assert(t, "2016-06-21 18:55:00 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("2016-06-21T19:55:00.799+01:00")
assertf(t, err == nil, "%v", err)
assert(t, "2016-06-21 18:55:00.799 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("2014-05-11 08:20:13 +0000") ts, err = ParseAny("2014-05-11 08:20:13 +0000")
assertf(t, err == nil, "%v", err) assertf(t, err == nil, "%v", err)
assert(t, "2014-05-11 08:20:13 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) assert(t, "2014-05-11 08:20:13 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))