[chore]: Bump codeberg.org/gruf/go-kv from 1.6.0 to 1.6.1 (#1619)

Bumps codeberg.org/gruf/go-kv from 1.6.0 to 1.6.1.

---
updated-dependencies:
- dependency-name: codeberg.org/gruf/go-kv
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
dependabot[bot]
2023-03-13 07:52:13 +00:00
committed by GitHub
parent 6e10175229
commit 0a864623f3
7 changed files with 56 additions and 11 deletions

View File

@ -75,7 +75,7 @@ type Field struct {
// Key returns the formatted key string of this Field.
func (f Field) Key() string {
buf := byteutil.Buffer{B: make([]byte, 0, bufsize/2)}
AppendQuote(&buf, f.K)
AppendQuoteString(&buf, f.K)
return buf.String()
}

View File

@ -25,7 +25,7 @@ func (f Field) AppendFormat(buf *byteutil.Buffer, vbose bool) {
} else /* regular */ {
fmtstr = `%+v`
}
AppendQuote(buf, f.K)
AppendQuoteString(buf, f.K)
buf.WriteByte('=')
appendValuef(buf, fmtstr, f.V)
}
@ -50,7 +50,7 @@ func appendValuef(buf *byteutil.Buffer, format string, args ...interface{}) {
fmtbuf.B = fmt.Appendf(fmtbuf.B, format, args...)
// Append quoted value to dst buffer
AppendQuote(buf, fmtbuf.String())
AppendQuoteValue(buf, fmtbuf.String())
// Drop overly large capacity buffers
if fmtbuf.Cap() > int(^uint16(0)) {

View File

@ -16,7 +16,7 @@ func (f Field) AppendFormat(buf *byteutil.Buffer, vbose bool) {
} else /* regular */ {
fmtstr = "{:v}"
}
AppendQuote(buf, f.K)
AppendQuoteString(buf, f.K)
buf.WriteByte('=')
format.Appendf(buf, fmtstr, f.V)
}

View File

@ -8,8 +8,8 @@ import (
"codeberg.org/gruf/go-kv/format"
)
// AppendQuote will append (and escape/quote where necessary) a formatted field string.
func AppendQuote(buf *byteutil.Buffer, str string) {
// AppendQuoteString will append (and escape/quote where necessary) a field string.
func AppendQuoteString(buf *byteutil.Buffer, str string) {
switch {
case len(str) == 0:
// Append empty quotes.
@ -27,7 +27,52 @@ func AppendQuote(buf *byteutil.Buffer, str string) {
return
case !isQuoted(str):
// Single/double quoted already.
// Not single/double quoted already.
if format.ContainsSpaceOrTab(str) {
// Quote un-enclosed spaces.
buf.B = append(buf.B, '"')
buf.B = append(buf.B, str...)
buf.B = append(buf.B, '"')
return
}
if format.ContainsDoubleQuote(str) {
// Contains double quote, double quote
// and append escaped existing.
buf.B = append(buf.B, '"')
buf.B = format.AppendEscape(buf.B, str)
buf.B = append(buf.B, '"')
return
}
}
// Double quoted, enclosed in braces, or
// literally anything else: append as-is.
buf.B = append(buf.B, str...)
return
}
// AppendQuoteValue will append (and escape/quote where necessary) a formatted value string.
func AppendQuoteValue(buf *byteutil.Buffer, str string) {
switch {
case len(str) == 0:
// Append empty quotes.
buf.B = append(buf.B, `""`...)
return
case len(str) == 1:
// Append quote single byte.
appendQuoteByte(buf, str[0])
return
case len(str) > format.SingleTermLine || !format.IsSafeASCII(str):
// Long line or contains non-ascii chars.
buf.B = strconv.AppendQuote(buf.B, str)
return
case !isQuoted(str):
// Not single/double quoted already.
// Get space / tab indices (if any).
s := strings.IndexByte(str, ' ')