dan/my-log
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 Only trim bang on out

Browse source
This commit is contained in:
Dan Jones 2024-10-31 15:09:42 -05:00
commit 0b2e178066
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/parse.go
View file

@ -18,7 +18,7 @@ func ParseString(in string) any {
}
if strings.HasPrefix(s, "!") {
return strings.TrimPrefix(s, "!")
return s
}
yesno := regexp.MustCompile("^(y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)$")

8
tools/parse_test.go
View file

@ -38,10 +38,10 @@ func TestParse(t *testing.T) {
{"on-value", "on", true},
{"no-value", "no", false},
{"off-value", "off", false},
{"skip-parsing-num", "!42", "42"},
{"skip-parsing-bool", "!false", "false"},
{"skip-parsing-time", "!" + when.Format(time.RFC3339), when.Format(time.RFC3339)},
{"skip-parsing-duration", "!15 mins", "15 mins"},
{"skip-parsing-num", "!42", "!42"},
{"skip-parsing-bool", "!false", "!false"},
{"skip-parsing-time", "!" + when.Format(time.RFC3339), "!" + when.Format(time.RFC3339)},
{"skip-parsing-duration", "!15 mins", "!15 mins"},
}
for _, tt := range tests {

7
tools/write_buffer.go
View file

@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"strconv"
"strings"
"time"
)
@ -27,6 +28,9 @@ func WriteValue(buff *bytes.Buffer, val any) (n int, err error) {
return buff.Write(o)
}
case string:
if strings.HasPrefix(v, "!") {
return buff.WriteString(strings.TrimPrefix(v, "!"))
}
return buff.WriteString(v)
case int:
return buff.WriteString(strconv.Itoa(v))
@ -39,6 +43,9 @@ func WriteValue(buff *bytes.Buffer, val any) (n int, err error) {
case json.RawMessage:
return buff.Write(v)
case []byte:
if v[0] == '!' {
return buff.Write(v[1:])
}
return buff.Write(v)
case byte:
err = buff.WriteByte(v)

8
tools/write_buffer_test.go
View file

@ -33,6 +33,14 @@ func TestWriteBuffer(t *testing.T) {
{"slice", []any{1, 2, "foo"}, `[1,2,"foo"]`, nil},
{"map", map[string]any{"baz": 42, "foo": "bar"}, `{"baz":42,"foo":"bar"}`, nil},
{"struct", struct{}{}, "", errors.New("Unsupported type struct {}")},
{"skip-bang-num", "!42", "42", nil},
{"skip-bang-bool", "!false", "false", nil},
{"skip-bang-time", "!" + when.Format(time.RFC3339), when.Format(time.RFC3339), nil},
{"skip-bang-duration", "!15 mins", "15 mins", nil},
{"skip-bang-bytes-num", []byte("!42"), "42", nil},
{"skip-bang-bytes-bool", []byte("!false"), "false", nil},
{"skip-bang-bytes-time", []byte("!" + when.Format(time.RFC3339)), when.Format(time.RFC3339), nil},
{"skip-bang-bytes-duration", []byte("!15 mins"), "15 mins", nil},
}
for _, tt := range tests {