From 3007e2ec4afab93f2ab5c69a1f8bca3b63c238b8 Mon Sep 17 00:00:00 2001 From: Aaron Raddon Date: Sat, 18 Nov 2017 10:21:24 -0800 Subject: [PATCH 1/6] 4/15/06 22:05 format closes #30 --- dateparse/main.go | 44 +++++++++++++++++++++++++++++++------------- parseany.go | 6 +++++- parseany_test.go | 10 +++++++++- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dateparse/main.go b/dateparse/main.go index 7e17d9f..cb543a8 100644 --- a/dateparse/main.go +++ b/dateparse/main.go @@ -56,13 +56,13 @@ func main() { for name, parser := range parsers { time.Local = nil - table.AddRow(name, "time.Local = nil", parser(datestr, nil), parser(datestr, nil).In(time.UTC)) + table.AddRow(name, "time.Local = nil", parser(datestr, nil, false), parser(datestr, nil, true)) if timezone != "" { time.Local = loc - table.AddRow(name, "time.Local = timezone arg", parser(datestr, loc), parser(datestr, loc).In(time.UTC)) + table.AddRow(name, "time.Local = timezone arg", parser(datestr, loc, false), parser(datestr, loc, true)) } time.Local = time.UTC - table.AddRow(name, "time.Local = time.UTC", parser(datestr, time.UTC), parser(datestr, time.UTC).In(time.UTC)) + table.AddRow(name, "time.Local = time.UTC", parser(datestr, time.UTC, false), parser(datestr, time.UTC, true)) } fmt.Println(table.Render()) @@ -72,20 +72,38 @@ func stuff() (string, string) { return "more", "stuff" } -type parser func(datestr string, loc *time.Location) time.Time +type parser func(datestr string, loc *time.Location, utc bool) string -func parseLocal(datestr string, loc *time.Location) time.Time { +func parseLocal(datestr string, loc *time.Location, utc bool) string { time.Local = loc - t, _ := dateparse.ParseLocal(datestr) - return t + t, err := dateparse.ParseLocal(datestr) + if err != nil { + return err.Error() + } + if utc { + return t.In(time.UTC).String() + } + return t.String() } -func parseIn(datestr string, loc *time.Location) time.Time { - t, _ := dateparse.ParseIn(datestr, loc) - return t +func parseIn(datestr string, loc *time.Location, utc bool) string { + t, err := dateparse.ParseIn(datestr, loc) + if err != nil { + return err.Error() + } + if utc { + return t.In(time.UTC).String() + } + return t.String() } -func parseAny(datestr string, loc *time.Location) time.Time { - t, _ := dateparse.ParseAny(datestr) - return t +func parseAny(datestr string, loc *time.Location, utc bool) string { + t, err := dateparse.ParseAny(datestr) + if err != nil { + return err.Error() + } + if utc { + return t.In(time.UTC).String() + } + return t.String() } diff --git a/parseany.go b/parseany.go index 81de181..7ba499c 100644 --- a/parseany.go +++ b/parseany.go @@ -374,6 +374,7 @@ iterRunes: // 04/2/2014 03:00:37 // 3/1/2012 10:11:59 // 4/8/2014 22:05 + // 4/8/14 22:05 switch r { case ':': state = stateDigitSlashWSColon @@ -384,6 +385,7 @@ iterRunes: // 04/2/2014 03:00:37 // 3/1/2012 10:11:59 // 4/8/2014 22:05 + // 4/8/14 22:05 // 3/1/2012 10:11:59 AM switch r { case ':': @@ -397,6 +399,7 @@ iterRunes: // 04/2/2014 03:00:37 // 3/1/2012 10:11:59 // 4/8/2014 22:05 + // 4/8/14 22:05 // 3/1/2012 10:11:59 AM switch r { case 'A', 'P': @@ -773,7 +776,7 @@ iterRunes: } } } else { - for _, layout := range []string{"01/02/2006 15:04", "01/2/2006 15:04", "1/02/2006 15:04", "1/2/2006 15:04"} { + for _, layout := range []string{"01/02/2006 15:04", "01/2/2006 15:04", "1/02/2006 15:04", "1/2/2006 15:04", "1/2/06 15:04", "01/02/06 15:04"} { if t, err := parse(layout, datestr, loc); err == nil { return t, nil } @@ -810,6 +813,7 @@ iterRunes: // 3/1/2012 10:11:59 // 03/1/2012 10:11:59 // 3/01/2012 10:11:59 + // 4/8/14 22:05 if firstSlash == 4 { for _, layout := range []string{"2006/01/02 15:04:05", "2006/1/02 15:04:05", "2006/01/2 15:04:05", "2006/1/2 15:04:05"} { if t, err := parse(layout, datestr, loc); err == nil { diff --git a/parseany_test.go b/parseany_test.go index 29bc70d..bc813f0 100644 --- a/parseany_test.go +++ b/parseany_test.go @@ -199,10 +199,18 @@ func TestParse(t *testing.T) { ts = MustParse("4/8/2014 22:05") assert.Equal(t, "2014-04-08 22:05:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) - + ts = MustParse("4/18/2014 22:05") + assert.Equal(t, "2014-04-18 22:05:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) ts = MustParse("04/08/2014 22:05") assert.Equal(t, "2014-04-08 22:05:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + ts = MustParse("4/8/14 22:05") + assert.Equal(t, "2014-04-08 22:05:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + ts = MustParse("4/18/14 22:05") + assert.Equal(t, "2014-04-18 22:05:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + ts = MustParse("10/18/14 22:05") + assert.Equal(t, "2014-10-18 22:05:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + ts = MustParse("04/2/2014 4:00:51") assert.Equal(t, "2014-04-02 04:00:51 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) From 27c51625d43db7cf72b6891013fe90b7279cfeeb Mon Sep 17 00:00:00 2001 From: Aaron Raddon Date: Sat, 18 Nov 2017 10:25:55 -0800 Subject: [PATCH 2/6] update example with new format --- README.md | 2 ++ example/main.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index db27f6f..89844be 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,7 @@ var examples = []string{ "8/1/71", "4/8/2014 22:05", "04/08/2014 22:05", + "4/8/14 22:05", "04/2/2014 03:00:51", "8/8/1965 12:00:00 AM", "8/8/1965 01:00:01 PM", @@ -182,6 +183,7 @@ func main() { | 8/1/71 | 1971-08-01 00:00:00 +0000 UTC | | 4/8/2014 22:05 | 2014-04-08 22:05:00 +0000 UTC | | 04/08/2014 22:05 | 2014-04-08 22:05:00 +0000 UTC | +| 4/8/14 22:05 | 2014-04-08 22:05:00 +0000 UTC | | 04/2/2014 03:00:51 | 2014-04-02 03:00:51 +0000 UTC | | 8/8/1965 12:00:00 AM | 1965-08-08 00:00:00 +0000 UTC | | 8/8/1965 01:00:01 PM | 1965-08-08 13:00:01 +0000 UTC | diff --git a/example/main.go b/example/main.go index 163f871..de6dfad 100644 --- a/example/main.go +++ b/example/main.go @@ -29,6 +29,7 @@ var examples = []string{ "8/1/71", "4/8/2014 22:05", "04/08/2014 22:05", + "4/8/14 22:05", "04/2/2014 03:00:51", "8/8/1965 12:00:00 AM", "8/8/1965 01:00:01 PM", @@ -131,6 +132,7 @@ func main() { | 8/1/71 | 1971-08-01 00:00:00 +0000 UTC | | 4/8/2014 22:05 | 2014-04-08 22:05:00 +0000 UTC | | 04/08/2014 22:05 | 2014-04-08 22:05:00 +0000 UTC | +| 4/8/14 22:05 | 2014-04-08 22:05:00 +0000 UTC | | 04/2/2014 03:00:51 | 2014-04-02 03:00:51 +0000 UTC | | 8/8/1965 12:00:00 AM | 1965-08-08 00:00:00 +0000 UTC | | 8/8/1965 01:00:01 PM | 1965-08-08 13:00:01 +0000 UTC | From f30ca3179c19d723d2f1f8c878fcce1089775c05 Mon Sep 17 00:00:00 2001 From: Aaron Raddon Date: Sat, 18 Nov 2017 11:07:33 -0800 Subject: [PATCH 3/6] Support Chinese Date Format --- README.md | 3 +++ example/main.go | 3 +++ parseany.go | 34 ++++++++++++++++++++++++++++------ parseany_test.go | 11 ++++++++++- 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 89844be..35a0982 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,8 @@ var examples = []string{ "2014/4/02 03:00:51", "2012/03/19 10:11:59", "2012/03/19 10:11:59.3186369", + // Chinese + "2014年04月08日", // yyyy-mm-ddThh "2006-01-02T15:04:05+0000", "2009-08-12T22:15:09-07:00", @@ -201,6 +203,7 @@ func main() { | 2014/4/02 03:00:51 | 2014-04-02 03:00:51 +0000 UTC | | 2012/03/19 10:11:59 | 2012-03-19 10:11:59 +0000 UTC | | 2012/03/19 10:11:59.3186369 | 2012-03-19 10:11:59.3186369 +0000 UTC | +| 2014年04月08日 | 2014-04-08 00:00:00 +0000 UTC | | 2006-01-02T15:04:05+0000 | 2006-01-02 15:04:05 +0000 UTC | | 2009-08-12T22:15:09-07:00 | 2009-08-12 22:15:09 -0700 -0700 | | 2009-08-12T22:15:09 | 2009-08-12 22:15:09 +0000 UTC | diff --git a/example/main.go b/example/main.go index de6dfad..379bb5b 100644 --- a/example/main.go +++ b/example/main.go @@ -48,6 +48,8 @@ var examples = []string{ "2014/4/02 03:00:51", "2012/03/19 10:11:59", "2012/03/19 10:11:59.3186369", + // Chinese + "2014年04月08日", // yyyy-mm-ddThh "2006-01-02T15:04:05+0000", "2009-08-12T22:15:09-07:00", @@ -150,6 +152,7 @@ func main() { | 2014/4/02 03:00:51 | 2014-04-02 03:00:51 +0000 UTC | | 2012/03/19 10:11:59 | 2012-03-19 10:11:59 +0000 UTC | | 2012/03/19 10:11:59.3186369 | 2012-03-19 10:11:59.3186369 +0000 UTC | +| 2014年04月08日 | 2014-04-08 00:00:00 +0000 UTC | | 2006-01-02T15:04:05+0000 | 2006-01-02 15:04:05 +0000 UTC | | 2009-08-12T22:15:09-07:00 | 2009-08-12 22:15:09 -0700 -0700 | | 2009-08-12T22:15:09 | 2009-08-12 22:15:09 +0000 UTC | diff --git a/parseany.go b/parseany.go index 7ba499c..ffe7a2c 100644 --- a/parseany.go +++ b/parseany.go @@ -8,6 +8,7 @@ import ( "strconv" "time" "unicode" + "unicode/utf8" ) type dateState int @@ -41,6 +42,8 @@ const ( stateDigitSlashWSColonAMPM stateDigitSlashWSColonColon stateDigitSlashWSColonColonAMPM + stateDigitChineseYear + stateDigitChineseYearWs stateDigitAlpha stateAlpha stateAlphaWS @@ -124,11 +127,11 @@ func parseTime(datestr string, loc *time.Location) (time.Time, error) { // we figure it out and then attempt a parse iterRunes: for i := 0; i < len(datestr); i++ { - r := rune(datestr[i]) - // r, bytesConsumed := utf8.DecodeRuneInString(datestr[ri:]) - // if bytesConsumed > 1 { - // ri += (bytesConsumed - 1) - // } + //r := rune(datestr[i]) + r, bytesConsumed := utf8.DecodeRuneInString(datestr[i:]) + if bytesConsumed > 1 { + i += (bytesConsumed - 1) + } switch state { case stateStart: @@ -141,6 +144,11 @@ iterRunes: if unicode.IsDigit(r) { continue } else if unicode.IsLetter(r) { + if r == '年' { + // Chinese Year + state = stateDigitChineseYear + continue + } state = stateDigitAlpha continue } @@ -405,6 +413,15 @@ iterRunes: case 'A', 'P': state = stateDigitSlashWSColonColonAMPM } + case stateDigitChineseYear: + // stateDigitChineseYear + // 2014年04月08日 + // weekday %Y年%m月%e日 %A %I:%M %p + // 2013年07月18日 星期四 10:27 上午 + if r == ' ' { + state = stateDigitChineseYearWs + break + } case stateDigitAlpha: // 12 Feb 2006, 19:17 // 12 Feb 2006, 19:17:22 @@ -849,7 +866,12 @@ iterRunes: } } } - + case stateDigitChineseYear: + // stateDigitChineseYear + // 2014年04月08日 + return parse("2006年01月02日", datestr, loc) + case stateDigitChineseYearWs: + return parse("2006年01月02日 15:04:05", datestr, loc) case stateWeekdayCommaOffset: // Monday, 02 Jan 2006 15:04:05 -0700 // Monday, 02 Jan 2006 15:04:05 +0100 diff --git a/parseany_test.go b/parseany_test.go index bc813f0..3d69af3 100644 --- a/parseany_test.go +++ b/parseany_test.go @@ -14,7 +14,7 @@ import ( // !!!!! The time-zone of local machine effects the results! // https://play.golang.org/p/IDHRalIyXh // https://github.com/golang/go/issues/18012 -func TestParseInLocation(t *testing.T) { +func TestInLocation(t *testing.T) { denverLoc, err := time.LoadLocation("America/Denver") assert.Equal(t, nil, err) @@ -180,6 +180,15 @@ func TestParse(t *testing.T) { ts = MustParse("2013-Feb-03") assert.Equal(t, "2013-02-03 00:00:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + //--------------------------------------------- + // Chinese 2014年04月18日 + + ts = MustParse("2014年04月08日") + assert.Equal(t, "2014-04-08 00:00:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + + ts = MustParse("2014年04月08日 19:17:22") + assert.Equal(t, "2014-04-08 19:17:22 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + //--------------------------------------------- // mm/dd/yyyy ? From 39fde9de9e014d69c661a5a909d8a4412c21e234 Mon Sep 17 00:00:00 2001 From: Aaron Raddon Date: Mon, 11 Dec 2017 10:53:38 -0800 Subject: [PATCH 4/6] new format: 2017-12-11 10:16 no seconds closes #31 --- parseany.go | 8 +++++++- parseany_test.go | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/parseany.go b/parseany.go index ffe7a2c..131e803 100644 --- a/parseany.go +++ b/parseany.go @@ -668,7 +668,13 @@ iterRunes: } case stateDigitDashWs: // starts digit then dash 02- then whitespace 1 << 2 << 5 + 3 // 2013-04-01 22:43:22 - return parse("2006-01-02 15:04:05", datestr, loc) + // 2013-04-01 22:43 + switch len(datestr) { + case len("2013-04-01 22:43"): + return parse("2006-01-02 15:04", datestr, loc) + default: + return parse("2006-01-02 15:04:05", datestr, loc) + } case stateDigitDashWsWsOffset: // 2006-01-02 15:04:05 -0700 diff --git a/parseany_test.go b/parseany_test.go index 3d69af3..35422e2 100644 --- a/parseany_test.go +++ b/parseany_test.go @@ -365,6 +365,9 @@ func TestParse(t *testing.T) { ts = MustParse("2012-08-03 18:31:59.257000000") assert.Equal(t, "2012-08-03 18:31:59.257 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + ts = MustParse("2013-04-01 22:43") + assert.Equal(t, "2013-04-01 22:43:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + ts = MustParse("2013-04-01 22:43:22") assert.Equal(t, "2013-04-01 22:43:22 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) From 626fadf64d2a5b300fe00da84d09e25e7f19424e Mon Sep 17 00:00:00 2001 From: Aaron Raddon Date: Mon, 11 Dec 2017 10:59:18 -0800 Subject: [PATCH 5/6] doc update for #31 --- README.md | 2 ++ example/main.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 35a0982..2928519 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,7 @@ var examples = []string{ "2014-04-26 17:24:37.3186369", "2012-08-03 18:31:59.257000000", "2014-04-26 17:24:37.123", + "2013-04-01 22:43", "2013-04-01 22:43:22", "2014-12-16 06:20:00 UTC", "2014-12-16 06:20:00 GMT", @@ -211,6 +212,7 @@ func main() { | 2014-04-26 17:24:37.3186369 | 2014-04-26 17:24:37.3186369 +0000 UTC | | 2012-08-03 18:31:59.257000000 | 2012-08-03 18:31:59.257 +0000 UTC | | 2014-04-26 17:24:37.123 | 2014-04-26 17:24:37.123 +0000 UTC | +| 2013-04-01 22:43 | 2013-04-01 22:43:00 +0000 UTC | | 2013-04-01 22:43:22 | 2013-04-01 22:43:22 +0000 UTC | | 2014-12-16 06:20:00 UTC | 2014-12-16 06:20:00 +0000 UTC | | 2014-12-16 06:20:00 GMT | 2014-12-16 06:20:00 +0000 UTC | diff --git a/example/main.go b/example/main.go index 379bb5b..a19eb17 100644 --- a/example/main.go +++ b/example/main.go @@ -59,6 +59,7 @@ var examples = []string{ "2014-04-26 17:24:37.3186369", "2012-08-03 18:31:59.257000000", "2014-04-26 17:24:37.123", + "2013-04-01 22:43", "2013-04-01 22:43:22", "2014-12-16 06:20:00 UTC", "2014-12-16 06:20:00 GMT", @@ -160,6 +161,7 @@ func main() { | 2014-04-26 17:24:37.3186369 | 2014-04-26 17:24:37.3186369 +0000 UTC | | 2012-08-03 18:31:59.257000000 | 2012-08-03 18:31:59.257 +0000 UTC | | 2014-04-26 17:24:37.123 | 2014-04-26 17:24:37.123 +0000 UTC | +| 2013-04-01 22:43 | 2013-04-01 22:43:00 +0000 UTC | | 2013-04-01 22:43:22 | 2013-04-01 22:43:22 +0000 UTC | | 2014-12-16 06:20:00 UTC | 2014-12-16 06:20:00 +0000 UTC | | 2014-12-16 06:20:00 GMT | 2014-12-16 06:20:00 +0000 UTC | From 031c38091560fef391de752ea46df69d91e9e37a Mon Sep 17 00:00:00 2001 From: Aaron Raddon Date: Thu, 4 Jan 2018 23:08:24 -0800 Subject: [PATCH 6/6] new date format closes #32 --- README.md | 2 ++ example/main.go | 4 +++- parseany.go | 8 ++++++++ parseany_test.go | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2928519..89f50c6 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ var examples = []string{ "Mon, 02 Jan 2006 15:04:05 MST", "Tue, 11 Jul 2017 16:28:13 +0200 (CEST)", "Mon, 02 Jan 2006 15:04:05 -0700", + "Thu, 4 Jan 2018 17:53:36 +0000", "Mon Aug 10 15:44:11 UTC+0100 2015", "Fri Jul 03 2015 18:04:07 GMT+0100 (GMT Daylight Time)", "12 Feb 2006, 19:17", @@ -176,6 +177,7 @@ func main() { | Mon, 02 Jan 2006 15:04:05 MST | 2006-01-02 15:04:05 +0000 MST | | Tue, 11 Jul 2017 16:28:13 +0200 (CEST) | 2017-07-11 16:28:13 +0200 +0200 | | Mon, 02 Jan 2006 15:04:05 -0700 | 2006-01-02 15:04:05 -0700 -0700 | +| Thu, 4 Jan 2018 17:53:36 +0000 | 2018-01-04 17:53:36 +0000 UTC | | Mon Aug 10 15:44:11 UTC+0100 2015 | 2015-08-10 15:44:11 +0000 UTC | | Fri Jul 03 2015 18:04:07 GMT+0100 (GMT Daylight Time) | 2015-07-03 18:04:07 +0100 GMT | | 12 Feb 2006, 19:17 | 2006-02-12 19:17:00 +0000 UTC | diff --git a/example/main.go b/example/main.go index a19eb17..75125ea 100644 --- a/example/main.go +++ b/example/main.go @@ -18,6 +18,7 @@ var examples = []string{ "Mon, 02 Jan 2006 15:04:05 MST", "Tue, 11 Jul 2017 16:28:13 +0200 (CEST)", "Mon, 02 Jan 2006 15:04:05 -0700", + "Thu, 4 Jan 2018 17:53:36 +0000", "Mon Aug 10 15:44:11 UTC+0100 2015", "Fri Jul 03 2015 18:04:07 GMT+0100 (GMT Daylight Time)", "12 Feb 2006, 19:17", @@ -125,6 +126,7 @@ func main() { | Mon, 02 Jan 2006 15:04:05 MST | 2006-01-02 15:04:05 +0000 MST | | Tue, 11 Jul 2017 16:28:13 +0200 (CEST) | 2017-07-11 16:28:13 +0200 +0200 | | Mon, 02 Jan 2006 15:04:05 -0700 | 2006-01-02 15:04:05 -0700 -0700 | +| Thu, 4 Jan 2018 17:53:36 +0000 | 2018-01-04 17:53:36 +0000 UTC | | Mon Aug 10 15:44:11 UTC+0100 2015 | 2015-08-10 15:44:11 +0000 UTC | | Fri Jul 03 2015 18:04:07 GMT+0100 (GMT Daylight Time) | 2015-07-03 18:04:07 +0100 GMT | | 12 Feb 2006, 19:17 | 2006-02-12 19:17:00 +0000 UTC | @@ -153,7 +155,7 @@ func main() { | 2014/4/02 03:00:51 | 2014-04-02 03:00:51 +0000 UTC | | 2012/03/19 10:11:59 | 2012-03-19 10:11:59 +0000 UTC | | 2012/03/19 10:11:59.3186369 | 2012-03-19 10:11:59.3186369 +0000 UTC | -| 2014年04月08日 | 2014-04-08 00:00:00 +0000 UTC | +| 2014年04月08日 | 2014-04-08 00:00:00 +0000 UTC | | 2006-01-02T15:04:05+0000 | 2006-01-02 15:04:05 +0000 UTC | | 2009-08-12T22:15:09-07:00 | 2009-08-12 22:15:09 -0700 -0700 | | 2009-08-12T22:15:09 | 2009-08-12 22:15:09 +0000 UTC | diff --git a/parseany.go b/parseany.go index 131e803..0c2526a 100644 --- a/parseany.go +++ b/parseany.go @@ -487,6 +487,7 @@ iterRunes: // stateWeekdayAbbrevCommaOffset // Mon, 02 Jan 2006 15:04:05 -0700 // Thu, 13 Jul 2017 08:58:40 +0100 + // Thu, 4 Jan 2018 17:53:36 +0000 // stateWeekdayAbbrevCommaOffsetZone // Tue, 11 Jul 2017 16:28:13 +0200 (CEST) switch { @@ -503,6 +504,7 @@ iterRunes: // stateWeekdayAbbrevCommaOffset // Mon, 02 Jan 2006 15:04:05 -0700 // Thu, 13 Jul 2017 08:58:40 +0100 + // Thu, 4 Jan 2018 17:53:36 +0000 // stateWeekdayAbbrevCommaOffsetZone // Tue, 11 Jul 2017 16:28:13 +0200 (CEST) if r == '(' { @@ -890,6 +892,12 @@ iterRunes: // Mon, 02 Jan 2006 15:04:05 -0700 // Thu, 13 Jul 2017 08:58:40 +0100 // RFC1123Z = "Mon, 02 Jan 2006 15:04:05 -0700" // RFC1123 with numeric zone + // + // Thu, 4 Jan 2018 17:53:36 +0000 + if len(datestr) > 10 && datestr[6] == ' ' { + // this really appears to be an invalid RFC1123 with non zero filled day + return parse("Mon, 2 Jan 2006 15:04:05 -0700", datestr, loc) + } return parse("Mon, 02 Jan 2006 15:04:05 -0700", datestr, loc) case stateWeekdayAbbrevCommaOffsetZone: // Tue, 11 Jul 2017 16:28:13 +0200 (CEST) diff --git a/parseany_test.go b/parseany_test.go index 35422e2..2fb3a34 100644 --- a/parseany_test.go +++ b/parseany_test.go @@ -170,6 +170,9 @@ func TestParse(t *testing.T) { ts = MustParse("Mon, 02 Jan 2006 15:04:05 -0700") assert.Equal(t, "2006-01-02 22:04:05 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + ts = MustParse("Thu, 4 Jan 2018 17:53:36 +0000") + assert.Equal(t, "2018-01-04 17:53:36 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC))) + // not sure if this is anything close to a standard, never seen it before ts = MustParse("12 Feb 2006, 19:17") assert.Equal(t, "2006-02-12 19:17:00 +0000 UTC", fmt.Sprintf("%v", ts.In(time.UTC)))