blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-23 18:22:23 +08:00
Code Issues Projects Releases Wiki Activity

remove duplicate code

Browse Source
This commit is contained in:
thinkerou 2018-06-07 09:34:56 +08:00
parent 51386de165
commit 2b1decda0b
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
context.go
View File

@ -370,18 +370,7 @@ func (c *Context) QueryMap(key string) map[string]string {
// GetQueryMap returns a map for a given query key, plus a boolean value // GetQueryMap returns a map for a given query key, plus a boolean value
// whether at least one value exists for the given key. // whether at least one value exists for the given key.
func (c *Context) GetQueryMap(key string) (map[string]string, bool) { func (c *Context) GetQueryMap(key string) (map[string]string, bool) {
params := c.Request.URL.Query() return c.get(c.Request.URL.Query(), key)
dicts := make(map[string]string)
exist := false
for k, v := range params {
if i := strings.IndexByte(k, '['); i >= 1 && k[0:i] == key {
if j := strings.IndexByte(k[i+1:], ']'); j >= 1 {
exist = true
dicts[k[i+1:][:j]] = v[0]
}
}
}
return dicts, exist
} }
// PostForm returns the specified key from a POST urlencoded form or multipart form // PostForm returns the specified key from a POST urlencoded form or multipart form
@ -451,9 +440,21 @@ func (c *Context) GetPostFormMap(key string) (map[string]string, bool) {
req := c.Request req := c.Request
req.ParseForm() req.ParseForm()
req.ParseMultipartForm(c.engine.MaxMultipartMemory) req.ParseMultipartForm(c.engine.MaxMultipartMemory)
dicts, exist := c.get(req.PostForm, key)
// when go version is 1.6, exist is false
if !exist && req.MultipartForm != nil && req.MultipartForm.File != nil {
dicts, exist = c.get(req.MultipartForm.Value, key)
}
return dicts, exist
}
// get is an internal method and returns a map which satisfy conditions.
func (c *Context) get(m map[string][]string, key string) (map[string]string, bool) {
dicts := make(map[string]string) dicts := make(map[string]string)
exist := false exist := false
for k, v := range req.PostForm { for k, v := range m {
if i := strings.IndexByte(k, '['); i >= 1 && k[0:i] == key { if i := strings.IndexByte(k, '['); i >= 1 && k[0:i] == key {
if j := strings.IndexByte(k[i+1:], ']'); j >= 1 { if j := strings.IndexByte(k[i+1:], ']'); j >= 1 {
exist = true exist = true
@ -461,17 +462,6 @@ func (c *Context) GetPostFormMap(key string) (map[string]string, bool) {
} }
} }
} }
if !exist && req.MultipartForm != nil && req.MultipartForm.File != nil {
for k, v := range req.MultipartForm.Value {
if i := strings.IndexByte(k, '['); i >= 1 && k[0:i] == key {
if j := strings.IndexByte(k[i+1:], ']'); j >= 1 {
exist = true
dicts[k[i+1:][:j]] = v[0]
}
}
}
}
return dicts, exist return dicts, exist
} }