|
5 | 5 | package context
|
6 | 6 |
|
7 | 7 | import (
|
8 |
| - "errors" |
9 |
| - "net/http" |
10 |
| - "net/url" |
11 | 8 | "strconv"
|
12 | 9 | "strings"
|
13 |
| - "text/template" |
14 | 10 |
|
15 |
| - "code.gitea.io/gitea/modules/log" |
16 | 11 | "code.gitea.io/gitea/modules/util"
|
17 | 12 | )
|
18 | 13 |
|
19 |
| -// Forms a new enhancement of http.Request |
20 |
| -type Forms http.Request |
21 |
| - |
22 |
| -// Values returns http.Request values |
23 |
| -func (f *Forms) Values() url.Values { |
24 |
| - return (*http.Request)(f).Form |
25 |
| -} |
26 |
| - |
27 |
| -// String returns request form as string |
28 |
| -func (f *Forms) String(key string) (string, error) { |
29 |
| - return (*http.Request)(f).FormValue(key), nil |
30 |
| -} |
31 |
| - |
32 |
| -// Trimmed returns request form as string with trimed spaces left and right |
33 |
| -func (f *Forms) Trimmed(key string) (string, error) { |
34 |
| - return strings.TrimSpace((*http.Request)(f).FormValue(key)), nil |
| 14 | +// FormString returns the first value matching the provided key in the form as a string |
| 15 | +func (ctx *Context) FormString(key string) string { |
| 16 | + return ctx.Req.FormValue(key) |
35 | 17 | }
|
36 | 18 |
|
37 |
| -// Strings returns request form as strings |
38 |
| -func (f *Forms) Strings(key string) ([]string, error) { |
39 |
| - if (*http.Request)(f).Form == nil { |
40 |
| - if err := (*http.Request)(f).ParseMultipartForm(32 << 20); err != nil { |
41 |
| - return nil, err |
| 19 | +// FormStrings returns a string slice for the provided key from the form |
| 20 | +func (ctx *Context) FormStrings(key string) []string { |
| 21 | + if ctx.Req.Form == nil { |
| 22 | + if err := ctx.Req.ParseMultipartForm(32 << 20); err != nil { |
| 23 | + return nil |
42 | 24 | }
|
43 | 25 | }
|
44 |
| - if v, ok := (*http.Request)(f).Form[key]; ok { |
45 |
| - return v, nil |
46 |
| - } |
47 |
| - return nil, errors.New("not exist") |
48 |
| -} |
49 |
| - |
50 |
| -// Escape returns request form as escaped string |
51 |
| -func (f *Forms) Escape(key string) (string, error) { |
52 |
| - return template.HTMLEscapeString((*http.Request)(f).FormValue(key)), nil |
53 |
| -} |
54 |
| - |
55 |
| -// Int returns request form as int |
56 |
| -func (f *Forms) Int(key string) (int, error) { |
57 |
| - return strconv.Atoi((*http.Request)(f).FormValue(key)) |
58 |
| -} |
59 |
| - |
60 |
| -// Int32 returns request form as int32 |
61 |
| -func (f *Forms) Int32(key string) (int32, error) { |
62 |
| - v, err := strconv.ParseInt((*http.Request)(f).FormValue(key), 10, 32) |
63 |
| - return int32(v), err |
64 |
| -} |
65 |
| - |
66 |
| -// Int64 returns request form as int64 |
67 |
| -func (f *Forms) Int64(key string) (int64, error) { |
68 |
| - return strconv.ParseInt((*http.Request)(f).FormValue(key), 10, 64) |
69 |
| -} |
70 |
| - |
71 |
| -// Uint returns request form as uint |
72 |
| -func (f *Forms) Uint(key string) (uint, error) { |
73 |
| - v, err := strconv.ParseUint((*http.Request)(f).FormValue(key), 10, 64) |
74 |
| - return uint(v), err |
75 |
| -} |
76 |
| - |
77 |
| -// Uint32 returns request form as uint32 |
78 |
| -func (f *Forms) Uint32(key string) (uint32, error) { |
79 |
| - v, err := strconv.ParseUint((*http.Request)(f).FormValue(key), 10, 32) |
80 |
| - return uint32(v), err |
81 |
| -} |
82 |
| - |
83 |
| -// Uint64 returns request form as uint64 |
84 |
| -func (f *Forms) Uint64(key string) (uint64, error) { |
85 |
| - return strconv.ParseUint((*http.Request)(f).FormValue(key), 10, 64) |
86 |
| -} |
87 |
| - |
88 |
| -// Bool returns request form as bool |
89 |
| -func (f *Forms) Bool(key string) (bool, error) { |
90 |
| - return strconv.ParseBool((*http.Request)(f).FormValue(key)) |
91 |
| -} |
92 |
| - |
93 |
| -// Float32 returns request form as float32 |
94 |
| -func (f *Forms) Float32(key string) (float32, error) { |
95 |
| - v, err := strconv.ParseFloat((*http.Request)(f).FormValue(key), 64) |
96 |
| - return float32(v), err |
97 |
| -} |
98 |
| - |
99 |
| -// Float64 returns request form as float64 |
100 |
| -func (f *Forms) Float64(key string) (float64, error) { |
101 |
| - return strconv.ParseFloat((*http.Request)(f).FormValue(key), 64) |
102 |
| -} |
103 |
| - |
104 |
| -// MustString returns request form as string with default |
105 |
| -func (f *Forms) MustString(key string, defaults ...string) string { |
106 |
| - if v := (*http.Request)(f).FormValue(key); len(v) > 0 { |
| 26 | + if v, ok := ctx.Req.Form[key]; ok { |
107 | 27 | return v
|
108 | 28 | }
|
109 |
| - if len(defaults) > 0 { |
110 |
| - return defaults[0] |
111 |
| - } |
112 |
| - return "" |
| 29 | + return nil |
113 | 30 | }
|
114 | 31 |
|
115 |
| -// MustTrimmed returns request form as string with default |
116 |
| -func (f *Forms) MustTrimmed(key string, defaults ...string) string { |
117 |
| - return strings.TrimSpace(f.MustString(key, defaults...)) |
| 32 | +// FormTrim returns the first value for the provided key in the form as a space trimmed string |
| 33 | +func (ctx *Context) FormTrim(key string) string { |
| 34 | + return strings.TrimSpace(ctx.Req.FormValue(key)) |
118 | 35 | }
|
119 | 36 |
|
120 |
| -// MustStrings returns request form as strings with default |
121 |
| -func (f *Forms) MustStrings(key string, defaults ...[]string) []string { |
122 |
| - if (*http.Request)(f).Form == nil { |
123 |
| - if err := (*http.Request)(f).ParseMultipartForm(32 << 20); err != nil { |
124 |
| - log.Error("ParseMultipartForm: %v", err) |
125 |
| - return []string{} |
126 |
| - } |
127 |
| - } |
128 |
| - |
129 |
| - if v, ok := (*http.Request)(f).Form[key]; ok { |
130 |
| - return v |
131 |
| - } |
132 |
| - if len(defaults) > 0 { |
133 |
| - return defaults[0] |
134 |
| - } |
135 |
| - return []string{} |
136 |
| -} |
137 |
| - |
138 |
| -// MustEscape returns request form as escaped string with default |
139 |
| -func (f *Forms) MustEscape(key string, defaults ...string) string { |
140 |
| - if v := (*http.Request)(f).FormValue(key); len(v) > 0 { |
141 |
| - return template.HTMLEscapeString(v) |
142 |
| - } |
143 |
| - if len(defaults) > 0 { |
144 |
| - return defaults[0] |
145 |
| - } |
146 |
| - return "" |
147 |
| -} |
148 |
| - |
149 |
| -// MustInt returns request form as int with default |
150 |
| -func (f *Forms) MustInt(key string, defaults ...int) int { |
151 |
| - v, err := strconv.Atoi((*http.Request)(f).FormValue(key)) |
152 |
| - if len(defaults) > 0 && err != nil { |
153 |
| - return defaults[0] |
154 |
| - } |
155 |
| - return v |
156 |
| -} |
157 |
| - |
158 |
| -// MustInt32 returns request form as int32 with default |
159 |
| -func (f *Forms) MustInt32(key string, defaults ...int32) int32 { |
160 |
| - v, err := strconv.ParseInt((*http.Request)(f).FormValue(key), 10, 32) |
161 |
| - if len(defaults) > 0 && err != nil { |
162 |
| - return defaults[0] |
163 |
| - } |
164 |
| - return int32(v) |
165 |
| -} |
166 |
| - |
167 |
| -// MustInt64 returns request form as int64 with default |
168 |
| -func (f *Forms) MustInt64(key string, defaults ...int64) int64 { |
169 |
| - v, err := strconv.ParseInt((*http.Request)(f).FormValue(key), 10, 64) |
170 |
| - if len(defaults) > 0 && err != nil { |
171 |
| - return defaults[0] |
172 |
| - } |
| 37 | +// FormInt returns the first value for the provided key in the form as an int |
| 38 | +func (ctx *Context) FormInt(key string) int { |
| 39 | + v, _ := strconv.Atoi(ctx.Req.FormValue(key)) |
173 | 40 | return v
|
174 | 41 | }
|
175 | 42 |
|
176 |
| -// MustUint returns request form as uint with default |
177 |
| -func (f *Forms) MustUint(key string, defaults ...uint) uint { |
178 |
| - v, err := strconv.ParseUint((*http.Request)(f).FormValue(key), 10, 64) |
179 |
| - if len(defaults) > 0 && err != nil { |
180 |
| - return defaults[0] |
181 |
| - } |
182 |
| - return uint(v) |
183 |
| -} |
184 |
| - |
185 |
| -// MustUint32 returns request form as uint32 with default |
186 |
| -func (f *Forms) MustUint32(key string, defaults ...uint32) uint32 { |
187 |
| - v, err := strconv.ParseUint((*http.Request)(f).FormValue(key), 10, 32) |
188 |
| - if len(defaults) > 0 && err != nil { |
189 |
| - return defaults[0] |
190 |
| - } |
191 |
| - return uint32(v) |
192 |
| -} |
193 |
| - |
194 |
| -// MustUint64 returns request form as uint64 with default |
195 |
| -func (f *Forms) MustUint64(key string, defaults ...uint64) uint64 { |
196 |
| - v, err := strconv.ParseUint((*http.Request)(f).FormValue(key), 10, 64) |
197 |
| - if len(defaults) > 0 && err != nil { |
198 |
| - return defaults[0] |
199 |
| - } |
200 |
| - return v |
201 |
| -} |
202 |
| - |
203 |
| -// MustFloat32 returns request form as float32 with default |
204 |
| -func (f *Forms) MustFloat32(key string, defaults ...float32) float32 { |
205 |
| - v, err := strconv.ParseFloat((*http.Request)(f).FormValue(key), 32) |
206 |
| - if len(defaults) > 0 && err != nil { |
207 |
| - return defaults[0] |
208 |
| - } |
209 |
| - return float32(v) |
210 |
| -} |
211 |
| - |
212 |
| -// MustFloat64 returns request form as float64 with default |
213 |
| -func (f *Forms) MustFloat64(key string, defaults ...float64) float64 { |
214 |
| - v, err := strconv.ParseFloat((*http.Request)(f).FormValue(key), 64) |
215 |
| - if len(defaults) > 0 && err != nil { |
216 |
| - return defaults[0] |
217 |
| - } |
| 43 | +// FormInt64 returns the first value for the provided key in the form as an int64 |
| 44 | +func (ctx *Context) FormInt64(key string) int64 { |
| 45 | + v, _ := strconv.ParseInt(ctx.Req.FormValue(key), 10, 64) |
218 | 46 | return v
|
219 | 47 | }
|
220 | 48 |
|
221 |
| -// MustBool returns request form as bool with default |
222 |
| -func (f *Forms) MustBool(key string, defaults ...bool) bool { |
223 |
| - v, err := strconv.ParseBool((*http.Request)(f).FormValue(key)) |
224 |
| - if len(defaults) > 0 && err != nil { |
225 |
| - return defaults[0] |
226 |
| - } |
| 49 | +// FormBool returns true if the value for the provided key in the form is "1" or "true" |
| 50 | +func (ctx *Context) FormBool(key string) bool { |
| 51 | + v, _ := strconv.ParseBool(ctx.Req.FormValue(key)) |
227 | 52 | return v
|
228 | 53 | }
|
229 | 54 |
|
230 |
| -// MustOptionalBool returns request form as OptionalBool with default |
231 |
| -func (f *Forms) MustOptionalBool(key string, defaults ...util.OptionalBool) util.OptionalBool { |
232 |
| - value := (*http.Request)(f).FormValue(key) |
| 55 | +// FormOptionalBool returns an OptionalBoolTrue or OptionalBoolFalse if the value |
| 56 | +// for the provided key exists in the form else it returns OptionalBoolNone |
| 57 | +func (ctx *Context) FormOptionalBool(key string) util.OptionalBool { |
| 58 | + value := ctx.Req.FormValue(key) |
233 | 59 | if len(value) == 0 {
|
234 | 60 | return util.OptionalBoolNone
|
235 | 61 | }
|
236 |
| - v, err := strconv.ParseBool((*http.Request)(f).FormValue(key)) |
237 |
| - if len(defaults) > 0 && err != nil { |
238 |
| - return defaults[0] |
239 |
| - } |
| 62 | + v, _ := strconv.ParseBool(ctx.Req.FormValue(key)) |
240 | 63 | return util.OptionalBoolOf(v)
|
241 | 64 | }
|
0 commit comments