total re-write

This commit is contained in:
Aaron Raddon 2014-05-06 21:15:43 -07:00
parent a793d0cb31
commit 9e4b7a4b46
2 changed files with 227 additions and 253 deletions

View File

@ -4,186 +4,193 @@ import (
"fmt"
u "github.com/araddon/gou"
"strconv"
"strings"
"time"
"unicode"
//"unicode/utf8"
"unicode/utf8"
)
const (
ST_START uint64 = 1
)
var _ = u.EMPTY
const (
S_START = 0
S_NUMERIC = 1
S_COMMA = 2
S_SEMICOLON = 3
S_COLON = 4
S_AMPM = 5 // AM or PM after numeric
S_ALPHA = 6
S_DASH = 7 // -
s_WHITESPACE = 8
)
/*
features = []uint8{
}
*/
type Features []TimeFeature
func (f Features) Has(ask TimeFeature) bool {
return f[ask] == ask
}
func (f Features) ParseString() string {
return ""
}
type TimeFeature uint8
const (
ALL_NUMERIC TimeFeature = 0
STARTS_ALPHA TimeFeature = 1
STARTS_NUMERIC TimeFeature = 2
HAS_NUMERIC TimeFeature = 3
HAS_ALPHA TimeFeature = 4
HAS_WHITESPACE TimeFeature = 5
HAS_COMMA TimeFeature = 6
HAS_SLASH TimeFeature = 7
HAS_DASH TimeFeature = 8
HAS_Z TimeFeature = 9
HAS_T TimeFeature = 10
HAS_COLON TimeFeature = 11
HAS_AMPM TimeFeature = 12
)
func parseFeatures(datestr string) Features {
features := make(Features, 20)
// totalLen := len(datestr)
// switch {
// case totalLen < 4:
// u.Debug("len < 4")
// }
// if unicode.IsLetter(datestr[0]) {
// features = append(FEAUTURES, STARTS_ALPHA)
// }
var lexeme string
state := S_START
//prevState := S_START
next := int32(datestr[0])
//prev := int32(datestr[0])
for i := 0; i < len(datestr); i++ {
char := int32(datestr[i])
if i+1 < len(datestr) {
next = int32(datestr[i+1])
//u.Debugf("set next: %s", string(next))
}
switch char {
case ' ', '\n', '\t':
features[HAS_WHITESPACE] = HAS_WHITESPACE
case ',':
features[HAS_COMMA] = HAS_COMMA
case '-':
features[HAS_DASH] = HAS_DASH
case ':':
features[HAS_COLON] = HAS_COLON
case '/':
features[HAS_SLASH] = HAS_SLASH
case 'Z':
features[HAS_Z] = HAS_Z
case 'T':
features[HAS_T] = HAS_T
case 'A', 'P':
if next == 'M' {
//u.Info("Found feature AMPM")
features[HAS_AMPM] = HAS_AMPM
}
}
switch state {
case S_START:
lexeme = lexeme + string(char)
if unicode.IsLetter(char) {
state = S_ALPHA
features[STARTS_ALPHA] = STARTS_ALPHA
features[HAS_ALPHA] = HAS_ALPHA
} else if unicode.IsNumber(char) {
state = S_NUMERIC
features[STARTS_NUMERIC] = STARTS_NUMERIC
features[HAS_NUMERIC] = HAS_NUMERIC
} else if char == ' ' {
//u.Info("is whitespace")
//state = s_WHITESPACE
} else {
//u.Error("unrecognized input? ", char, " ", string(char))
}
case S_ALPHA:
if unicode.IsLetter(char) {
features[STARTS_ALPHA] = STARTS_ALPHA
features[HAS_ALPHA] = HAS_ALPHA
} else if unicode.IsNumber(char) {
state = S_NUMERIC
features[STARTS_NUMERIC] = STARTS_NUMERIC
features[HAS_NUMERIC] = HAS_NUMERIC
} else if char == ' ' {
//u.Info("is whitespace")
state = s_WHITESPACE
} else {
//u.Error("unrecognized input? ", char, " ", string(char))
}
lexeme = lexeme + string(char)
case S_NUMERIC:
//u.Infof("numeric: %v", string(char))
if unicode.IsLetter(char) {
features[HAS_ALPHA] = HAS_ALPHA
} else if unicode.IsNumber(char) {
features[HAS_NUMERIC] = HAS_NUMERIC
} else if char == ' ' {
//u.Info("is whitespace")
//state = s_WHITESPACE
} else {
//u.Error("unrecognized input? ", char, " ", string(char))
}
lexeme = lexeme + string(char)
}
//prev = char
}
return features
}
// Given an unknown date format, detect the type, parse, return time
func ParseAny(datestr string) (time.Time, error) {
f := parseFeatures(datestr)
//u.Infof("%s alpha?%v colon?%v whitespace?%v dash?%v slash?%v AMPM?%v", datestr, f.Has(HAS_ALPHA),
// f.Has(HAS_COLON), f.Has(HAS_WHITESPACE), f.Has(HAS_DASH), f.Has(HAS_SLASH), f.Has(HAS_AMPM))
switch {
case f.Has(HAS_T):
//RFC3339 = "2006-01-02T15:04:05Z07:00"
if len(datestr) == len(time.RFC3339) {
if t, err := time.Parse(time.RFC3339, datestr); err == nil {
return t, nil
} else {
u.Error(err)
var state uint64 = 1
iterRunes:
for i := 0; i < len(datestr); i++ {
r, _ := utf8.DecodeRuneInString(datestr[i:])
//u.Infof("r=%s st=%d ", string(r), state)
switch state {
case ST_START:
if unicode.IsDigit(r) {
state = state << 1 // 2
} else if unicode.IsLetter(r) {
state = state << 2 // 4
}
} else if len(datestr) == len(time.RFC3339Nano) {
// RFC3339Nano = "2006-01-02T15:04:05.999999999Z07:00"
if t, err := time.Parse(time.RFC3339Nano, datestr); err == nil {
case 2: // starts digit 1 << 2
if unicode.IsDigit(r) {
continue
}
switch r {
case ' ':
state = state << 3
case ',':
state = state << 4
case '-':
state = state << 5
case ':':
state = state << 6
case '/':
state = state << 7
}
case 64: // starts digit then dash 02- 1 << 2 << 5
// 2006-01-02T15:04:05Z07:00
// 2006-01-02T15:04:05.999999999Z07:00
// 2014-04-26 17:24:37.3186369
// 2016-03-14 00:00:00.000
// 2006-01-02
// 2014-04-26 05:24:37 PM
switch {
case r == ' ':
state = state + 1
case r == 'T':
state = state + 3
}
case 65: // starts digit then dash 02- then whitespace 1 << 2 << 5 + 1
// 2014-04-26 17:24:37.3186369
// 2016-03-14 00:00:00.000
// 2014-04-26 05:24:37 PM
switch r {
case 'A', 'P':
if len(datestr) == len("2014-04-26 03:24:37 PM") {
if t, err := time.Parse("2006-01-02 03:04:05 PM", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
}
case f.Has(HAS_DASH) && !f.Has(HAS_SLASH):
}
case 67: // starts digit then dash 02- then T 1 << 2 << 5 + 3
// 2006-01-02T15:04:05Z07:00
// 2006-01-02T15:04:05.999999999Z07: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 {
u.Error(err)
}
} 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 {
return t, nil
} else {
u.Error(err)
}
}
case 256: // starts digit then slash 02/
// 03/19/2012 10:11:59
// 3/1/2012 10:11:59
// 4/8/2014 22:05
// 3/1/2014
// 10/13/2014
// 01/02/2006
if unicode.IsDigit(r) || r == '/' {
continue
}
switch r {
case ' ':
state = state << 3
}
case 2048: // starts digit then slash 02/ more digits/slashes then whitespace
// 03/19/2012 10:11:59
// 3/1/2012 10:11:59
// 4/8/2014 22:05
switch r {
case ':':
state = state << 8
}
case 524288: // starts digit then slash 02/ more digits/slashes then whitespace
// 03/19/2012 10:11:59
// 3/1/2012 10:11:59
// 4/8/2014 22:05
switch r {
case ':':
state = state << 9
}
case 4: // starts alpha 1 << 2
if unicode.IsLetter(r) {
continue
}
switch {
case f.Has(HAS_WHITESPACE) && f.Has(HAS_COLON) && !f.Has(HAS_ALPHA):
//2014-04-26 05:24:37.3186369
//2006-01-02 15:04:05.000
//2006-01-02
case r == ' ':
state = state << 3
case r == ',':
state = state << 4
case unicode.IsDigit(r):
state = state << 5
}
case 32: // Starts alpha then whitespace 1 << 2 << 3
switch {
case r == ' ':
state = state << 6
case r == ',':
state = state << 7
case unicode.IsDigit(r):
state = state << 8
case unicode.IsLetter(r):
state = state << 9
}
case 8192: // Starts Alpha then whitespace then digit 1 << 2 << 8
// May 8, 2009 5:57:51 PM
if t, err := time.Parse("Jan 2, 2006 3:04:05 PM", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
default:
//u.Infof("no case for: %d", state)
break iterRunes
}
}
switch state {
case 2:
// unixy timestamps ish
if len(datestr) >= len("13980450781991351") {
if nanoSecs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(0, nanoSecs), nil
} else {
u.Error(err)
}
} else if len(datestr) >= len("13980450781991") {
if microSecs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(0, microSecs*1000), nil
} else {
u.Error(err)
}
} else {
if secs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(secs, 0), nil
} else {
u.Error(err)
}
}
case 64: // starts digit then dash 02- 1 << 2 << 5
// 2006-01-02
if len(datestr) == len("2014-04-26") {
if t, err := time.Parse("2006-01-02", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
}
case 65: // starts digit then dash 02- then whitespace 1 << 2 << 5 + 3
// 2014-04-26 17:24:37.3186369
// 2016-03-14 00:00:00.000
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 {
return t, nil
@ -197,56 +204,17 @@ func ParseAny(datestr string) (time.Time, error) {
u.Error(err)
}
}
case f.Has(HAS_ALPHA):
//2006-01-02 03:04:05 PM
if len(datestr) == len("2014-04-26 03:24:37 PM") {
if t, err := time.Parse("2006-01-02 03:04:05 PM", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
}
default:
}
case f.Has(HAS_SLASH):
switch {
case f.Has(HAS_WHITESPACE) && f.Has(HAS_COLON):
// 03/03/2012 10:11:59
// 3/1/2012 10:11:59
// 4/8/2014 22:05
colonCt := strings.Count(datestr, ":")
if len(datestr) >= len("03/03/2012 10:11:59") {
if t, err := time.Parse("01/02/2006 15:04:05", datestr); err == nil {
return t, nil
} else {
if t, err := time.Parse("1/2/2006 15:04:05", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
}
} else if colonCt == 1 {
if t, err := time.Parse("01/02/2006 15:04", datestr); err == nil {
return t, nil
} else {
if t, err := time.Parse("1/2/2006 15:04", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
}
} else {
u.Error("unknown format: ", datestr)
}
default:
case 256: // starts digit then slash 02/
// 3/1/2014
// 10/13/2014
// 01/02/2006
if len(datestr) == len("01/02/2006") {
if t, err := time.Parse("01/02/2006", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
} else {
if t, err := time.Parse("1/2/2006", datestr); err == nil {
return t, nil
@ -254,42 +222,42 @@ func ParseAny(datestr string) (time.Time, error) {
u.Error(err)
}
}
case 524288: // starts digit then slash 02/ more digits/slashes then whitespace
// 4/8/2014 22:05
if len(datestr) == len("01/02/2006 15:04") {
if t, err := time.Parse("01/02/2006 15:04", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
case f.Has(HAS_ALPHA) && f.Has(HAS_COMMA):
switch {
case f.Has(HAS_AMPM):
//u.Debugf("trying format: 2006-01-02 15:04:05 PM ")
//May 8, 2009 5:57:51 PM 2006-01-02 15:04:05.000
if t, err := time.Parse("Jan 2, 2006 3:04:05 PM", datestr); err == nil {
} else {
if t, err := time.Parse("1/2/2006 15:04", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
}
case f.Has(HAS_NUMERIC) && !f.Has(HAS_ALPHA) && !f.Has(HAS_WHITESPACE):
if len(datestr) >= len("13980450781991351") {
if nanoSecs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(0, nanoSecs), nil
} else {
u.Error(err)
}
} else {
if secs, err := strconv.ParseInt(datestr, 10, 64); err == nil {
return time.Unix(secs, 0), nil
} else {
u.Error(err)
}
}
case 268435456: // starts digit then slash 02/ more digits/slashes then whitespace double colons
// 03/19/2012 10:11:59
// 3/1/2012 10:11:59
if len(datestr) == len("01/02/2006 15:04:05") {
if t, err := time.Parse("01/02/2006 15:04:05", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
} else {
if t, err := time.Parse("1/2/2006 15:04:05", datestr); err == nil {
return t, nil
} else {
u.Error(err)
}
}
default:
u.Errorf("Could not find format: %s", datestr)
}
return time.Now(), fmt.Errorf("Not found: %s", datestr)
u.Infof("no case for: %d", state)
}
// Given an unknown date format, detect the type and return
// the
func FindParseFormat(datestr string) (string, error) {
return "", fmt.Errorf("Not recognized: %s", datestr)
return time.Now(), fmt.Errorf("Could not find date format for %s", datestr)
}

View File

@ -52,12 +52,9 @@ func init() {
}
func TestParse(t *testing.T) {
//f := parseFeatures("May 8, 2009 5:57:51 PM")
ts, err := ParseAny("May 8, 2009 5:57:51 PM")
assert.T(t, err == nil)
//u.Debug(" ", ts.Unix())
//u.Debugf("%v", f)
//u.Debugf("%v", ts)
assert.T(t, ts.In(time.UTC).Unix() == 1241805471)
ts, err = ParseAny("03/19/2012 10:11:59")
@ -65,21 +62,26 @@ func TestParse(t *testing.T) {
//u.Debug(ts.Unix(), ts)
assert.T(t, ts.Unix() == 1332151919)
ts, err = ParseAny("3/31/2014")
assert.T(t, err == nil)
//u.Debug(ts.Unix(), ts)
assert.T(t, ts.Unix() == 1396224000)
ts, err = ParseAny("03/31/2014")
assert.T(t, err == nil)
//u.Debug(ts.Unix(), ts)
assert.T(t, ts.Unix() == 1396224000)
ts, err = ParseAny("4/8/2014 22:05")
assert.T(t, err == nil)
//u.Debug(ts.Unix(), ts)
assert.T(t, ts.Unix() == 1396994700)
assert.T(t, "2014-04-08 22:05:00 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("04/08/2014 22:05")
assert.T(t, err == nil)
//u.Debug(ts.Unix(), ts)
assert.T(t, ts.Unix() == 1396994700)
ts, err = ParseAny("3/31/2014")
assert.T(t, err == nil)
//u.Debug(ts.Unix(), ts)
assert.T(t, ts.Unix() == 1396224000)
// Unix Time Stamp
ts, err = ParseAny("1332151919")
assert.T(t, err == nil)
@ -100,14 +102,18 @@ func TestParse(t *testing.T) {
//2014-04-26 17:24:37.123
ts, err = ParseAny("2014-04-26 17:24:37.123")
assert.T(t, err == nil)
u.Debugf("unix=%v ts='%v'", ts.Unix(), ts)
//u.Debugf("unix=%v ts='%v'", ts.Unix(), ts)
assert.T(t, "2014-04-26 17:24:37.123 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
//2014-04-26 05:24:37 PM
ts, err = ParseAny("2014-04-26 05:24:37 PM")
assert.T(t, err == nil)
u.Debug(ts.Unix(), ts)
//u.Debug(ts.Unix(), ts)
assert.T(t, "2014-04-26 17:24:37 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
ts, err = ParseAny("2014-04-26")
assert.T(t, err == nil)
//u.Debug(ts.Unix(), ts)
assert.T(t, "2014-04-26 00:00:00 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
}
// func TestParseAMPM(t *testing.T) {