Merge pull request #392 from anaprimawaty/ana/add-option-for-key-value-delimiter

jessevdk · web-flow · commit c4265d9cc9f7 · 2024-06-15T11:02:48.000+02:00
Add option for key value delimiter
diff --git a/convert.go b/convert.go
@@ -271,7 +271,12 @@ func convert(val string, retval reflect.Value, options multiTag) error {
 
 		retval.Set(reflect.Append(retval, elemval))
 	case reflect.Map:
-		parts := strings.SplitN(val, ":", 2)
+		keyValueDelimiter := options.Get("key-value-delimiter")
+		if keyValueDelimiter == "" {
+			keyValueDelimiter = ":"
+		}
+
+		parts := strings.SplitN(val, keyValueDelimiter, 2)
 
 		key := parts[0]
 		var value string
diff --git a/convert_test.go b/convert_test.go
@@ -157,3 +157,22 @@ func TestConvertToStringInvalidUintBase(t *testing.T) {
 
 	assertError(t, err, ErrMarshal, "strconv.ParseInt: parsing \"no\": invalid syntax")
 }
+
+func TestConvertToMapWithDelimiter(t *testing.T) {
+	var opts = struct {
+		StringStringMap map[string]string `long:"string-string-map" key-value-delimiter:"="`
+	}{}
+
+	p := NewNamedParser("test", Default)
+	grp, _ := p.AddGroup("test group", "", &opts)
+	o := grp.Options()[0]
+
+	err := convert("key=value", o.value, o.tag)
+
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	assertString(t, opts.StringStringMap["key"], "value")
+}
