👽️ Support changes in go-dateparser
This commit is contained in:
parent
e9c1bf7070
commit
ece9256745
2 changed files with 16 additions and 3 deletions
|
|
@ -1,6 +1,7 @@
|
|||
package tools
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
dp "github.com/markusmobius/go-dateparser"
|
||||
|
|
@ -23,6 +24,19 @@ func ParseDate(in string) (t time.Time, err error) {
|
|||
return MaxTime, nil
|
||||
}
|
||||
|
||||
var er error
|
||||
for _, format := range []string{time.RFC3339, DateFormat} {
|
||||
if t, er = time.ParseInLocation(format, in, nil); er == nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
var ts int64
|
||||
if ts, er = strconv.ParseInt(in, 10, 0); er == nil {
|
||||
t = time.Unix(ts, 0)
|
||||
return
|
||||
}
|
||||
|
||||
conf := dp.Configuration{
|
||||
CurrentTime: time.Now().Local(),
|
||||
ReturnTimeAsPeriod: true,
|
||||
|
|
@ -32,12 +46,11 @@ func ParseDate(in string) (t time.Time, err error) {
|
|||
d, err := dp.Parse(&conf, in)
|
||||
t = d.Time
|
||||
if err != nil {
|
||||
d, err = dp.Parse(&conf, in, DateFormat)
|
||||
t = d.Time
|
||||
return
|
||||
}
|
||||
|
||||
y, mon, day, h, loc := t.Year(), t.Month(), t.Day(), t.Hour(), t.Location()
|
||||
|
||||
switch d.Period {
|
||||
case date.Second:
|
||||
t = t.Truncate(time.Second)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue