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 format, RFC850

Browse Source
This commit is contained in:
Aaron Raddon 2014-06-15 11:18:20 -07:00
parent 5750806565
commit 34163bbbdb
2 changed files with 83 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
parseany.go
View File

@ -28,6 +28,8 @@ const (
ST_ALPHAWSCOMMA ST_ALPHAWSCOMMA
ST_ALPHAWSALPHA ST_ALPHAWSALPHA
ST_ALPHACOMMA ST_ALPHACOMMA
ST_ALPHACOMMADASH
ST_ALPHACOMMADASHDASH
//ST_ALPHADIGIT //ST_ALPHADIGIT
) )
@ -93,7 +95,7 @@ iterRunes:
if t, err := time.Parse("2006-01-02 03:04:05 PM", datestr); err == nil { if t, err := time.Parse("2006-01-02 03:04:05 PM", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
case ',': case ',':
@ -104,9 +106,9 @@ iterRunes:
if err == nil { if err == nil {
return time.Unix(0, t.UnixNano()+int64(ms)*1e6), nil return time.Unix(0, t.UnixNano()+int64(ms)*1e6), nil
} }
u.Error(err) //u.Error(err)
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
} }
@ -117,13 +119,13 @@ iterRunes:
if t, err := time.Parse("2006-01-02T15:04:05Z07:00", datestr); err == nil { if t, err := time.Parse("2006-01-02T15:04:05Z07:00", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else if len(datestr) == len("2006-01-02T15:04:05.999999999Z07:00") { } else if len(datestr) == len("2006-01-02T15:04:05.999999999Z07:00") {
if t, err := time.Parse("2006-01-02T15:04:05.999999999Z07:00", datestr); err == nil { if t, err := time.Parse("2006-01-02T15:04:05.999999999Z07:00", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
case ST_DIGITSLASH: // starts digit then slash 02/ case ST_DIGITSLASH: // starts digit then slash 02/
@ -190,30 +192,25 @@ iterRunes:
case ST_ALPHACOMMA: // Starts alpha then comma case ST_ALPHACOMMA: // Starts alpha then comma
// Mon, 02 Jan 2006 15:04:05 MST // Mon, 02 Jan 2006 15:04:05 MST
// Mon, 02 Jan 2006 15:04:05 -0700 // Mon, 02 Jan 2006 15:04:05 -0700
// Monday, 02-Jan-06 15:04:05 MST
switch { switch {
case r == '-': case r == '-':
//RFC1123Z = "Mon, 02 Jan 2006 15:04:05 -0700" // RFC1123 with numeric zone state = ST_ALPHACOMMADASH
// TODO: this doesn't work??? }
if t, err := time.Parse(time.RFC1123Z, datestr); err == nil {
return t, nil case ST_ALPHACOMMADASH: // Starts alpha then comma and one dash
} else { // Mon, 02 Jan 2006 15:04:05 -0700
u.Errorf("'%s' err=%v", datestr, err) // Monday, 02-Jan-06 15:04:05 MST
break iterRunes switch {
} case r == '-':
case unicode.IsLetter(r): state = ST_ALPHACOMMADASHDASH
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
if t, err := time.Parse("Jan 2, 2006 3:04:05 PM", datestr); err == nil { if t, err := time.Parse("Jan 2, 2006 3:04:05 PM", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
case ST_ALPHAWSALPHA: // Starts Alpha, whitespace, alpha case ST_ALPHAWSALPHA: // Starts Alpha, whitespace, alpha
// ANSIC = "Mon Jan _2 15:04:05 2006" // ANSIC = "Mon Jan _2 15:04:05 2006"
@ -223,21 +220,21 @@ iterRunes:
if t, err := time.Parse(time.ANSIC, datestr); err == nil { if t, err := time.Parse(time.ANSIC, datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Errorf("'%s' err=%v", datestr, err) //u.Errorf("'%s' err=%v", datestr, err)
break iterRunes break iterRunes
} }
} else if len(datestr) == len("Mon Jan _2 15:04:05 MST 2006") { } else if len(datestr) == len("Mon Jan _2 15:04:05 MST 2006") {
if t, err := time.Parse(time.UnixDate, datestr); err == nil { if t, err := time.Parse(time.UnixDate, datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
break iterRunes break iterRunes
} }
} else if len(datestr) == len("Mon Jan 02 15:04:05 -0700 2006") { } else if len(datestr) == len("Mon Jan 02 15:04:05 -0700 2006") {
if t, err := time.Parse(time.RubyDate, datestr); err == nil { if t, err := time.Parse(time.RubyDate, datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
break iterRunes break iterRunes
} }
} }
@ -254,19 +251,19 @@ iterRunes:
if nanoSecs, err := strconv.ParseInt(datestr, 10, 64); err == nil { if nanoSecs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(0, nanoSecs), nil return time.Unix(0, nanoSecs), nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else if len(datestr) >= len("13980450781991") { } else if len(datestr) >= len("13980450781991") {
if microSecs, err := strconv.ParseInt(datestr, 10, 64); err == nil { if microSecs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(0, microSecs*1000), nil return time.Unix(0, microSecs*1000), nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else { } else {
if secs, err := strconv.ParseInt(datestr, 10, 64); err == nil { if secs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(secs, 0), nil return time.Unix(secs, 0), nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
case ST_DIGITDASH: // starts digit then dash 02- case ST_DIGITDASH: // starts digit then dash 02-
@ -275,7 +272,7 @@ iterRunes:
if t, err := time.Parse("2006-01-02", datestr); err == nil { if t, err := time.Parse("2006-01-02", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(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
@ -287,25 +284,25 @@ iterRunes:
if t, err := time.Parse("2006-01-02 15:04:05.000000000", datestr); err == nil { if t, err := time.Parse("2006-01-02 15:04:05.000000000", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else if len(datestr) == len("2014-04-26 05:24:37.3186369") { } else if len(datestr) == len("2014-04-26 05:24:37.3186369") {
if t, err := time.Parse("2006-01-02 15:04:05.0000000", datestr); err == nil { if t, err := time.Parse("2006-01-02 15:04:05.0000000", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else if len(datestr) == len("2014-04-26 05:24:37.000") { } else if len(datestr) == len("2014-04-26 05:24:37.000") {
if t, err := time.Parse("2006-01-02 15:04:05.000", datestr); err == nil { if t, err := time.Parse("2006-01-02 15:04:05.000", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else if len(datestr) == len("2013-04-01 22:43:22") { } else if len(datestr) == len("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 {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
case ST_DIGITSLASH: // starts digit then slash 02/ (but nothing else) case ST_DIGITSLASH: // starts digit then slash 02/ (but nothing else)
@ -317,13 +314,13 @@ iterRunes:
if t, err := time.Parse("01/02/2006", datestr); err == nil { if t, err := time.Parse("01/02/2006", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else { } else {
if t, err := time.Parse("1/2/2006", datestr); err == nil { if t, err := time.Parse("1/2/2006", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
@ -333,7 +330,7 @@ iterRunes:
if t, err := time.Parse("01/02/2006 15:04", datestr); err == nil { if t, err := time.Parse("01/02/2006 15:04", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else if len(datestr) == len("01/2/2006 15:04") { } else if len(datestr) == len("01/2/2006 15:04") {
if t, err := time.Parse("01/2/2006 15:04", datestr); err == nil { if t, err := time.Parse("01/2/2006 15:04", datestr); err == nil {
@ -342,14 +339,14 @@ iterRunes:
if t, err := time.Parse("1/02/2006 15:04", datestr); err == nil { if t, err := time.Parse("1/02/2006 15:04", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
} else { } else {
if t, err := time.Parse("1/2/2006 15:04", datestr); err == nil { if t, err := time.Parse("1/2/2006 15:04", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} }
case ST_DIGITSLASHWSCOLONCOLON: // starts digit then slash 02/ more digits/slashes then whitespace double colons case ST_DIGITSLASHWSCOLONCOLON: // starts digit then slash 02/ more digits/slashes then whitespace double colons
@ -361,7 +358,7 @@ iterRunes:
if t, err := time.Parse("01/02/2006 15:04:05", datestr); err == nil { if t, err := time.Parse("01/02/2006 15:04:05", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
} }
} else if len(datestr) == len("01/2/2006 15:04:05") { } else if len(datestr) == len("01/2/2006 15:04:05") {
if t, err := time.Parse("01/2/2006 15:04:05", datestr); err == nil { if t, err := time.Parse("01/2/2006 15:04:05", datestr); err == nil {
@ -370,20 +367,49 @@ iterRunes:
if t, err := time.Parse("1/02/2006 15:04:05", datestr); err == nil { if t, err := time.Parse("1/02/2006 15:04:05", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
return time.Time{}, err
} }
} }
} else { } else {
if t, err := time.Parse("1/2/2006 15:04:05", datestr); err == nil { if t, err := time.Parse("1/2/2006 15:04:05", datestr); err == nil {
return t, nil return t, nil
} else { } else {
u.Error(err) //u.Error(err)
return time.Time{}, err
} }
} }
case ST_ALPHACOMMA: // Starts alpha then comma but no DASH
// Mon, 02 Jan 2006 15:04:05 MST
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)
return time.Time{}, err
}
case ST_ALPHACOMMADASH: // Starts alpha then comma and one dash
// Mon, 02 Jan 2006 15:04:05 -0700
//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)
return time.Time{}, err
}
case ST_ALPHACOMMADASHDASH: // Starts alpha then comma and two dash'es
// Monday, 02-Jan-06 15:04:05 MST
if t, err := time.Parse("Monday, 02-Jan-06 15:04:05 MST", datestr); err == nil {
return t, nil
} else {
//u.Errorf("'%s' err=%v", datestr, err)
return time.Time{}, err
}
default: default:
u.Infof("no case for: %d : %s", state, datestr) //u.Infof("no case for: %d : %s", state, datestr)
} }
return time.Now(), fmt.Errorf("Could not find date format for %s", datestr) return time.Time{}, fmt.Errorf("Could not find date format for %s", datestr)
} }

19
parseany_test.go
View File

@ -53,7 +53,12 @@ func init() {
func TestParse(t *testing.T) { func TestParse(t *testing.T) {
ts, err := ParseAny("May 8, 2009 5:57:51 PM") zeroTime := time.Time{}.Unix()
ts, err := ParseAny("INVALID")
assert.T(t, ts.Unix() == zeroTime)
assert.T(t, err != nil)
ts, err = ParseAny("May 8, 2009 5:57:51 PM")
//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)))
@ -73,10 +78,16 @@ func TestParse(t *testing.T) {
// Are we SURE this is right time? // Are we SURE this is right time?
assert.T(t, "2006-01-02 15:04:05 -0700 -0700" == fmt.Sprintf("%v", ts)) assert.T(t, "2006-01-02 15:04:05 -0700 -0700" == fmt.Sprintf("%v", ts))
// RFC850 = "Monday, 02-Jan-06 15:04:05 MST"
ts, err = ParseAny("Monday, 02-Jan-06 15:04:05 MST")
//u.Debug(fmt.Sprintf("%v", ts.In(time.UTC)), " ---- ", ts)
assert.T(t, "2006-01-02 15:04:05 +0000 MST" == fmt.Sprintf("%v", ts))
// Wat? Go can't parse a date that it supplies a format for? // Wat? Go can't parse a date that it supplies a format for?
// ts, err = ParseAny("Mon, 02 Jan 2006 15:04:05 -0700") // TODO: fixme
// //u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC)) //ts, err = ParseAny("Mon, 02 Jan 2006 15:04:05 -0700")
// assert.T(t, "2006-01-02 15:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC))) //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)