aboutsummaryrefslogtreecommitdiff
path: root/tracker
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-06-17 23:54:29 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-06-17 23:54:29 +0200
commit3dc50f53ca79d9a86c9ffd0ea3f6eb71bb9d1d71 (patch)
tree20a1d5f79465514b9b6ca21b492ac72760cad822 /tracker
parent1f34fe7b9dde7d0dfdca711f9a3eb44b4a3ff02d (diff)
parse params
Diffstat (limited to 'tracker')
-rw-r--r--tracker/query.go24
-rw-r--r--tracker/query_test.go4
2 files changed, 26 insertions, 2 deletions
diff --git a/tracker/query.go b/tracker/query.go
index c042c55..5f9e695 100644
--- a/tracker/query.go
+++ b/tracker/query.go
@@ -25,6 +25,23 @@ func MarshalQuery(v interface{}) (string, error) {
return marshalQuery(val)
}
+func parseTag(tag string) (string, string) {
+ if i := strings.Index(tag, ","); i != -1 {
+ return tag[:i], tag[i+1:]
+ }
+ return tag, ""
+}
+
+func isEmtpy(v reflect.Value) bool {
+ switch v.Kind() {
+ case reflect.String:
+ return v.String() == ""
+ case reflect.Int:
+ return v.Int() == 0
+ }
+ return false
+}
+
func marshalQuery(v reflect.Value) (string, error) {
if v.Kind() != reflect.Struct {
return "", errors.New("must be a struct")
@@ -33,7 +50,14 @@ func marshalQuery(v reflect.Value) (string, error) {
t := v.Type()
for i := 0; i < t.NumField(); i++ {
name := strings.ToLower(t.Field(i).Name)
+ tag, param := parseTag(t.Field(i).Tag.Get("query"))
+ if tag != "" {
+ name = tag
+ }
f := v.Field(i)
+ if param == "optional" && isEmtpy(f) {
+ continue
+ }
switch f.Kind() {
case reflect.Int:
q.Add(name, strconv.Itoa(int(f.Int())))
diff --git a/tracker/query_test.go b/tracker/query_test.go
index 04c5a23..c0665a0 100644
--- a/tracker/query_test.go
+++ b/tracker/query_test.go
@@ -4,9 +4,9 @@ import "testing"
func TestMarshalQuery(t *testing.T) {
q := struct {
- A string
+ A string `query:"x"`
B int
- C string
+ C string `query:",optional"`
D []byte
}{
A: "test",