Skip to content

Commit

Permalink
add support time.Duration on mapping (#1794)
Browse files Browse the repository at this point in the history
  • Loading branch information
vkd authored and thinkerou committed Mar 4, 2019
1 parent f8f1459 commit 805b2d4
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
17 changes: 17 additions & 0 deletions binding/binding_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1413,3 +1413,20 @@ func TestBindingUnknownTypeChan(t *testing.T) {
assert.Error(t, err)
assert.Equal(t, errUnknownType, err)
}

func TestBindingTimeDuration(t *testing.T) {
var s struct {
Timeout time.Duration `form:"timeout"`
}

// ok
req := formPostRequest("", "timeout=5s")
err := Form.Bind(req, &s)
assert.NoError(t, err)
assert.Equal(t, 5*time.Second, s.Timeout)

// error
req = formPostRequest("", "timeout=wrong")
err = Form.Bind(req, &s)
assert.Error(t, err)
}
13 changes: 13 additions & 0 deletions binding/form_mapping.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ func setWithProperType(val string, value reflect.Value, field reflect.StructFiel
case reflect.Int32:
return setIntField(val, 32, value)
case reflect.Int64:
switch value.Interface().(type) {
case time.Duration:
return setTimeDuration(val, value, field)
}
return setIntField(val, 64, value)
case reflect.Uint:
return setUintField(val, 0, value)
Expand Down Expand Up @@ -263,6 +267,15 @@ func setSlice(vals []string, value reflect.Value, field reflect.StructField) err
return nil
}

func setTimeDuration(val string, value reflect.Value, field reflect.StructField) error {
d, err := time.ParseDuration(val)
if err != nil {
return err
}
value.Set(reflect.ValueOf(d))
return nil
}

func head(str, sep string) (head string, tail string) {
idx := strings.Index(str, sep)
if idx < 0 {
Expand Down

0 comments on commit 805b2d4

Please sign in to comment.