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

New date formats

Browse Source
This commit is contained in:
Aaron Raddon 2017-06-25 19:09:06 -07:00
parent b008e51bc1
commit 4d8007b10b
2 changed files with 157 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
parseany.go
View File

@ -21,6 +21,9 @@ const (
ST_DIGITDASHWSDOTPLUS ST_DIGITDASHWSDOTPLUS
ST_DIGITDASHWSDOTPLUSALPHA ST_DIGITDASHWSDOTPLUSALPHA
ST_DIGITDASHT ST_DIGITDASHT
ST_DIGITDASHTZ
ST_DIGITDASHTZDIGIT
ST_DIGITDASHTDASH
ST_DIGITCOMMA ST_DIGITCOMMA
ST_DIGITCOLON ST_DIGITCOLON
ST_DIGITSLASH ST_DIGITSLASH
@ -102,6 +105,7 @@ iterRunes:
} }
case ST_DIGITDASH: // starts digit then dash 02- case ST_DIGITDASH: // starts digit then dash 02-
// 2006-01-02T15:04:05Z07:00 // 2006-01-02T15:04:05Z07:00
// 2017-06-25T17:46:57.45706582-07:00
// 2006-01-02T15:04:05.999999999Z07:00 // 2006-01-02T15:04:05.999999999Z07:00
// 2012-08-03 18:31:59.257000000 // 2012-08-03 18:31:59.257000000
// 2014-04-26 17:24:37.3186369 // 2014-04-26 17:24:37.3186369
@ -179,9 +183,9 @@ iterRunes:
} }
case ST_DIGITDASHT: // starts digit then dash 02- then T case ST_DIGITDASHT: // starts digit then dash 02- then T
// 2006-01-02T15:04:05Z07:00 // ST_DIGITDASHT
// 2006-01-02T15:04:05 // 2006-01-02T15:04:05
// 2006-01-02T15:04:05.999999999Z07:00 // ST_DIGITDASHTZ
// 2006-01-02T15:04:05.999999999Z // 2006-01-02T15:04:05.999999999Z
// 2006-01-02T15:04:05.99999999Z // 2006-01-02T15:04:05.99999999Z
// 2006-01-02T15:04:05.9999999Z // 2006-01-02T15:04:05.9999999Z
@ -190,32 +194,21 @@ iterRunes:
// 2006-01-02T15:04:05.9999Z // 2006-01-02T15:04:05.9999Z
// 2006-01-02T15:04:05.999Z // 2006-01-02T15:04:05.999Z
// 2006-01-02T15:04:05.99Z // 2006-01-02T15:04:05.99Z
if len(datestr) == len("2006-01-02T15:04:05Z07:00") { // ST_DIGITDASHTZDIGIT
if t, err := time.Parse("2006-01-02T15:04:05Z07:00", datestr); err == nil { // 2006-01-02T15:04:05.999999999Z07:00
return t, nil // 2006-01-02T15:04:05Z07:00
} else { // With another dash aka time-zone at end
return time.Time{}, err // ST_DIGITDASHTDASH
} // 2017-06-25T17:46:57.45706582-07:00
} else if len(datestr) == len("2006-01-02T15:04:05.999999999Z07:00") { switch {
if t, err := time.Parse("2006-01-02T15:04:05.999999999Z07:00", datestr); err == nil { case r == '-':
return t, nil state = ST_DIGITDASHTDASH
} else { case r == 'Z':
return time.Time{}, err state = ST_DIGITDASHTZ
}
} else if len(datestr) == len("2006-01-02T15:04:05") {
if t, err := time.Parse("2006-01-02T15:04:05", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else {
if t, err := time.Parse("2006-01-02T15:04:05Z", datestr); err == nil {
return t, nil
} else if t, err := time.Parse("2006-01-02T15:04:05", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
} }
case ST_DIGITDASHTZ:
if unicode.IsDigit(r) {
state = ST_DIGITDASHTZDIGIT
} }
case ST_DIGITSLASH: // starts digit then slash 02/ case ST_DIGITSLASH: // starts digit then slash 02/
// 2014/07/10 06:55:38.156283 // 2014/07/10 06:55:38.156283
@ -436,6 +429,30 @@ iterRunes:
} }
} }
/*
ST_DIGITDASHT
ST_DIGITDASHTZ
ST_DIGITDASHTZDIGIT
ST_DIGITDASHTDASH
// ST_DIGITDASHT
// 2006-01-02T15:04:05
// ST_DIGITDASHTZ
// 2006-01-02T15:04:05.999999999Z
// 2006-01-02T15:04:05.99999999Z
// 2006-01-02T15:04:05.9999999Z
// 2006-01-02T15:04:05.999999Z
// 2006-01-02T15:04:05.99999Z
// 2006-01-02T15:04:05.9999Z
// 2006-01-02T15:04:05.999Z
// 2006-01-02T15:04:05.99Z
// ST_DIGITDASHTZDIGIT
// 2006-01-02T15:04:05.999999999Z07:00
// 2006-01-02T15:04:05Z07:00
// With another dash aka time-zone at end
// ST_DIGITDASHTDASH
// 2017-06-25T17:46:57.45706582-07:00
*/
switch state { switch state {
case ST_DIGIT: case ST_DIGIT:
// unixy timestamps ish // unixy timestamps ish
@ -498,6 +515,110 @@ iterRunes:
return time.Time{}, err return time.Time{}, err
} }
} }
case ST_DIGITDASHTDASH:
// With another dash aka time-zone at end
// 2006-01-02T15:04:05.999999999-07:00
// 2006-01-02T15:04:05.99999999-07:00
// 2006-01-02T15:04:05.9999999-07:00
// 2006-01-02T15:04:05.999999-07:00
// 2006-01-02T15:04:05.99999-07:00
// 2006-01-02T15:04:05.9999-07:00
// 2006-01-02T15:04:05.999-07:00
// 2006-01-02T15:04:05.99-07:00
if len(datestr) == len("2006-01-02T15:04:05.999999999-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.999999999-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.99999999-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.99999999-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.9999999-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.9999999-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.999999-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.999999-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.99999-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.99999-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.9999-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.9999-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.999-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.999-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.99-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.99-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05.9-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.9-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
} else if len(datestr) == len("2006-01-02T15:04:05-07:00") {
if t, err := time.Parse("2006-01-02T15:04:05-07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
}
case ST_DIGITDASHTZDIGIT:
// With a time-zone at end after Z
// 2006-01-02T15:04:05.999999999Z07:00
// 2006-01-02T15:04:05Z07:00
if len(datestr) == len("2006-01-02T15:04:05Z07:00") {
if t, err := time.Parse("2006-01-02T15:04:05Z07:00", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
}
case ST_DIGITDASHT: // starts digit then dash 02- then T
// 2006-01-02T15:04:05.999999
// 2006-01-02T15:04:05.999999
if t, err := time.Parse("2006-01-02T15:04:05", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
case ST_DIGITDASHTZ: // starts digit then dash 02- then T Then Z
// 2006-01-02T15:04:05.999999999Z
// 2006-01-02T15:04:05.99999999Z
// 2006-01-02T15:04:05.9999999Z
// 2006-01-02T15:04:05.999999Z
// 2006-01-02T15:04:05.99999Z
// 2006-01-02T15:04:05.9999Z
// 2006-01-02T15:04:05.999Z
// 2006-01-02T15:04:05.99Z
if t, err := time.Parse("2006-01-02T15:04:05Z", datestr); err == nil {
return t, nil
} else {
return time.Time{}, err
}
case ST_DIGITDASHWS: // starts digit then dash 02- then whitespace 1 << 2 << 5 + 3 case ST_DIGITDASHWS: // starts digit then dash 02- then whitespace 1 << 2 << 5 + 3
// 2013-04-01 22:43:22 // 2013-04-01 22:43:22
if t, err := time.Parse("2006-01-02 15:04:05", datestr); err == nil { if t, err := time.Parse("2006-01-02 15:04:05", datestr); err == nil {
@ -535,28 +656,7 @@ iterRunes:
// 2014-04-26 17:24:37.3186369 // 2014-04-26 17:24:37.3186369
// 2017-01-27 00:07:31.945167 // 2017-01-27 00:07:31.945167
// 2016-03-14 00:00:00.000 // 2016-03-14 00:00:00.000
var t time.Time if t, err := time.Parse("2006-01-02 15:04:05", datestr); err == nil {
var err error
switch len(datestr) {
case len("2012-08-03 18:31:59.257000000"):
t, err = time.Parse("2006-01-02 15:04:05.000000000", datestr)
case len("2014-04-26 05:24:37.3186369"):
t, err = time.Parse("2006-01-02 15:04:05.0000000", datestr)
case len("2014-04-26 05:24:37.945167"):
t, err = time.Parse("2006-01-02 15:04:05.000000", datestr)
case len("2014-04-26 05:24:37.94516"):
t, err = time.Parse("2006-01-02 15:04:05.00000", datestr)
case len("2014-04-26 05:24:37.9451"):
t, err = time.Parse("2006-01-02 15:04:05.0000", datestr)
case len("2014-04-26 05:24:37.000"):
t, err = time.Parse("2006-01-02 15:04:05.000", datestr)
case len("2014-04-26 05:24:37.00"):
t, err = time.Parse("2006-01-02 15:04:05.00", datestr)
case len("2014-04-26 05:24:37.0"):
t, err = time.Parse("2006-01-02 15:04:05.0", datestr)
}
if err == nil {
return t, nil return t, nil
} else { } else {
return time.Time{}, err return time.Time{}, err

8
parseany_test.go
View File

@ -265,10 +265,13 @@ func TestParse(t *testing.T) {
ts, err = ParseAny("2009-08-12T22:15:09-07:00") ts, err = ParseAny("2009-08-12T22:15:09-07:00")
assertf(t, err == nil, "%v", err) assertf(t, err == nil, "%v", err)
assert(t, "2009-08-13 05:15:09 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) assert(t, "2009-08-13 05:15:09 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("2009-08-12T22:15:09.123-07:00")
assertf(t, err == nil, "%v", err)
assertf(t, "2009-08-13 05:15:09.123 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)), "%v", ts.In(time.UTC))
ts, err = ParseAny("2009-08-12T22:15:09Z") ts, err = ParseAny("2009-08-12T22:15:09Z")
assertf(t, err == nil, "%v", err) assertf(t, err == nil, "%v", err)
assert(t, "2009-08-12 22:15:09 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) assertf(t, "2009-08-12 22:15:09 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)), "%v", ts.In(time.UTC))
ts, err = ParseAny("2009-08-12T22:15:09.99Z") ts, err = ParseAny("2009-08-12T22:15:09.99Z")
assertf(t, err == nil, "%v", err) assertf(t, err == nil, "%v", err)
@ -285,6 +288,9 @@ func TestParse(t *testing.T) {
ts, err = ParseAny("2009-08-12T22:15:09.123") ts, err = ParseAny("2009-08-12T22:15:09.123")
assertf(t, err == nil, "%v", err) assertf(t, err == nil, "%v", err)
assert(t, "2009-08-12 22:15:09.123 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) assert(t, "2009-08-12 22:15:09.123 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("2009-08-12T22:15:09.123456")
assertf(t, err == nil, "%v", err)
assert(t, "2009-08-12 22:15:09.123456 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("2009-08-12T22:15:09.12") ts, err = ParseAny("2009-08-12T22:15:09.12")
assertf(t, err == nil, "%v", err) assertf(t, err == nil, "%v", err)