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

couple new date formats

Browse Source
This commit is contained in:
Aaron Raddon 2014-05-20 22:53:52 -07:00
parent 3706ed61ad
commit 85a0c6b618
2 changed files with 79 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
parseany.go
View File

@ -26,6 +26,7 @@ const (
ST_ALPHA ST_ALPHA
ST_ALPHAWS ST_ALPHAWS
ST_ALPHAWSCOMMA ST_ALPHAWSCOMMA
ST_ALPHAWSALPHA
ST_ALPHACOMMA ST_ALPHACOMMA
//ST_ALPHADIGIT //ST_ALPHADIGIT
) )
@ -174,8 +175,8 @@ iterRunes:
switch { switch {
case r == ' ': case r == ' ':
state = ST_ALPHAWS state = ST_ALPHAWS
// case r == ',': TODO case r == ',':
// state = ST_ALPHACOMMA state = ST_ALPHACOMMA
// case unicode.IsDigit(r): // case unicode.IsDigit(r):
// state = ST_ALPHADIGIT // state = ST_ALPHADIGIT
} }
@ -186,7 +187,28 @@ iterRunes:
case r == ',': case r == ',':
state = ST_ALPHAWSCOMMA state = ST_ALPHAWSCOMMA
case unicode.IsLetter(r): case unicode.IsLetter(r):
state = state << 9 state = ST_ALPHAWSALPHA
}
case ST_ALPHACOMMA: // Starts alpha then comma
// Mon, 02 Jan 2006 15:04:05 MST
// Mon, 02 Jan 2006 15:04:05 -0700
switch {
case r == '-':
//RFC1123Z = "Mon, 02 Jan 2006 15:04:05 -0700" // RFC1123 with numeric zone
// TODO: this doesn't work???
if t, err := time.Parse(time.RFC1123Z, datestr); err == nil {
return t, nil
} else {
u.Errorf("'%s' err=%v", datestr, err)
break iterRunes
}
case unicode.IsLetter(r):
if t, err := time.Parse("Jan 2, 2006 3:04:05 PM", datestr); err == nil {
return t, nil
} else {
u.Errorf("'%s' err=%v", datestr, err)
break iterRunes
}
} }
case ST_ALPHAWSCOMMA: // Starts Alpha, whitespace, digit, comma case ST_ALPHAWSCOMMA: // Starts Alpha, whitespace, digit, comma
// May 8, 2009 5:57:51 PM // May 8, 2009 5:57:51 PM
@ -195,6 +217,32 @@ iterRunes:
} else { } else {
u.Error(err) u.Error(err)
} }
case ST_ALPHAWSALPHA: // Starts Alpha, whitespace, alpha
// ANSIC = "Mon Jan _2 15:04:05 2006"
// UnixDate = "Mon Jan _2 15:04:05 MST 2006"
// RubyDate = "Mon Jan 02 15:04:05 -0700 2006"
if len(datestr) == len("Mon Jan _2 15:04:05 2006") {
if t, err := time.Parse(time.ANSIC, datestr); err == nil {
return t, nil
} else {
u.Errorf("'%s' err=%v", datestr, err)
break iterRunes
}
} else if len(datestr) == len("Mon Jan _2 15:04:05 MST 2006") {
if t, err := time.Parse(time.UnixDate, datestr); err == nil {
return t, nil
} else {
u.Error(err)
break iterRunes
}
} else if len(datestr) == len("Mon Jan 02 15:04:05 -0700 2006") {
if t, err := time.Parse(time.RubyDate, datestr); err == nil {
return t, nil
} else {
u.Error(err)
break iterRunes
}
}
default: default:
//u.Infof("no case for: %d", state) //u.Infof("no case for: %d", state)
break iterRunes break iterRunes
@ -334,6 +382,7 @@ iterRunes:
u.Error(err) u.Error(err)
} }
} }
default: default:
u.Infof("no case for: %d : %s", state, datestr) u.Infof("no case for: %d : %s", state, datestr)
} }

33
parseany_test.go
View File

@ -59,6 +59,27 @@ func TestParse(t *testing.T) {
//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC)) //u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
assert.T(t, "2009-05-08 17:57:51 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) assert.T(t, "2009-05-08 17:57:51 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
// ANSIC = "Mon Jan _2 15:04:05 2006"
ts, err = ParseAny("Mon Jan 2 15:04:05 2006")
//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
assert.T(t, "2006-01-02 15:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
// UnixDate = "Mon Jan _2 15:04:05 MST 2006"
ts, err = ParseAny("Mon Jan 2 15:04:05 MST 2006")
//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
assert.T(t, "2006-01-02 15:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
// RubyDate = "Mon Jan 02 15:04:05 -0700 2006"
ts, err = ParseAny("Mon Jan 02 15:04:05 -0700 2006")
//u.Debug(fmt.Sprintf("%v", ts.In(time.UTC)), " ---- ", ts)
// Are we SURE this is right time?
assert.T(t, "2006-01-02 22:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
// Wat? Go can't parse a date that it supplies a format for?
// ts, err = ParseAny("Mon, 02 Jan 2006 15:04:05 -0700")
// //u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
// assert.T(t, "2006-01-02 15:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("03/19/2012 10:11:59") ts, err = ParseAny("03/19/2012 10:11:59")
assert.Tf(t, err == nil, "%v", err) assert.Tf(t, err == nil, "%v", err)
//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC)) //u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
@ -140,9 +161,9 @@ func TestParse(t *testing.T) {
assert.T(t, "2014-05-11 08:20:13.787 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) assert.T(t, "2014-05-11 08:20:13.787 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
} }
func TestWIP(t *testing.T) { // func TestWIP(t *testing.T) {
ts, err := ParseAny("2013-04-01 22:43:22") // ts, err := ParseAny("2013-04-01 22:43:22")
assert.Tf(t, err == nil, "%v", err) // assert.Tf(t, err == nil, "%v", err)
u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC)) // u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
assert.T(t, "2013-04-01 22:43:22 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) // assert.T(t, "2013-04-01 22:43:22 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
} // }