bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 16:21:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve gtime.ParseDuration

Browse Source
This commit is contained in:
john
2020-07-29 11:44:58 +08:00
parent 91cd34b26a
commit c4b28b0bc4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
os/gtime/gtime.go
View File

@ -404,7 +404,7 @@ func ParseDuration(s string) (time.Duration, error) {
}
return time.Duration(v), nil
}
match, err := gregex.MatchString(`^([\-\d]+)[dD](.+)$`, s)
match, err := gregex.MatchString(`^([\-\d]+)[dD](.*)$`, s)
if err != nil {
return 0, err
}

5
os/gtime/gtime_z_unit_basic_test.go
View File

@ -221,6 +221,11 @@ func Test_ConvertZone(t *testing.T) {
}
func Test_ParseDuration(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
d, err := gtime.ParseDuration("1d")
t.Assert(err, nil)
t.Assert(d.String(), "24h0m0s")
})
gtest.C(t, func(t *gtest.T) {
d, err := gtime.ParseDuration("1d2h3m")
t.Assert(err, nil)