Improve formatting of CSums and UUIDs

2 files changed, 166 insertions, 0 deletions

diff --git a/pkg/util/fmt.go b/pkg/util/fmt.go
new file mode 100644
index 0000000..c0ff596
--- /dev/null
+++ b/pkg/util/fmt.go
@@ -0,0 +1,67 @@
+package util
+
+import (
+	"fmt"
+	"strings"
+)
+
+// FmtStateString returns the fmt.Printf string that produced a given
+// fmt.State and verb.
+func FmtStateString(st fmt.State, verb rune) string {
+	var ret strings.Builder
+	ret.WriteByte('%')
+	for _, flag := range []int{'-', '+', '#', ' ', '0'} {
+		if st.Flag(flag) {
+			ret.WriteByte(byte(flag))
+		}
+	}
+	if width, ok := st.Width(); ok {
+		fmt.Fprintf(&ret, "%d", width)
+	}
+	if prec, ok := st.Precision(); ok {
+		if prec == 0 {
+			ret.WriteByte('.')
+		} else {
+			fmt.Fprintf(&ret, ".%d", prec)
+		}
+	}
+	ret.WriteRune(verb)
+	return ret.String()
+}
+
+// FormatByteArrayStringer is function for helping to implement
+// fmt.Formatter for []byte or [n]byte types that have a custom string
+// representation.  Use it like:
+//
+//     type MyType [16]byte
+//
+//     func (val MyType) String() string {
+//         …
+//     }
+//
+//     func (val MyType) Format(f fmt.State, verb rune) {
+//         util.FormatByteArrayStringer(val, val[:], f, verb)
+//     }
+func FormatByteArrayStringer(
+	obj interface {
+		fmt.Stringer
+		fmt.Formatter
+	},
+	objBytes []byte,
+	f fmt.State, verb rune) {
+	switch verb {
+	case 'v':
+		if !f.Flag('#') {
+			FormatByteArrayStringer(obj, objBytes, f, 's') // as a string
+		} else {
+			byteStr := fmt.Sprintf("%#v", objBytes)
+			objType := fmt.Sprintf("%T", obj)
+			objStr := objType + strings.TrimPrefix(byteStr, "[]byte")
+			fmt.Fprintf(f, FmtStateString(f, 's'), objStr)
+		}
+	case 's', 'q': // string
+		fmt.Fprintf(f, FmtStateString(f, verb), obj.String())
+	default:
+		fmt.Fprintf(f, FmtStateString(f, verb), objBytes)
+	}
+}
diff --git a/pkg/util/fmt_test.go b/pkg/util/fmt_test.go
new file mode 100644
index 0000000..d2579d0
--- /dev/null
+++ b/pkg/util/fmt_test.go
@@ -0,0 +1,99 @@
+package util_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"lukeshu.com/btrfs-tools/pkg/util"
+)
+
+type FmtState struct {
+	MWidth     int
+	MPrec      int
+	MFlagMinus bool
+	MFlagPlus  bool
+	MFlagSharp bool
+	MFlagSpace bool
+	MFlagZero  bool
+}
+
+func (st FmtState) Width() (int, bool) {
+	if st.MWidth < 1 {
+		return 0, false
+	}
+	return st.MWidth, true
+}
+
+func (st FmtState) Precision() (int, bool) {
+	if st.MPrec < 1 {
+		return 0, false
+	}
+	return st.MPrec, true
+}
+
+func (st FmtState) Flag(b int) bool {
+	switch b {
+	case '-':
+		return st.MFlagMinus
+	case '+':
+		return st.MFlagPlus
+	case '#':
+		return st.MFlagSharp
+	case ' ':
+		return st.MFlagSpace
+	case '0':
+		return st.MFlagZero
+	}
+	return false
+}
+
+func (st FmtState) Write([]byte) (int, error) {
+	panic("not implemented")
+}
+
+func (dst *FmtState) Format(src fmt.State, verb rune) {
+	if width, ok := src.Width(); ok {
+		dst.MWidth = width
+	}
+	if prec, ok := src.Precision(); ok {
+		dst.MPrec = prec
+	}
+	dst.MFlagMinus = src.Flag('-')
+	dst.MFlagPlus = src.Flag('+')
+	dst.MFlagSharp = src.Flag('#')
+	dst.MFlagSpace = src.Flag(' ')
+	dst.MFlagZero = src.Flag('0')
+}
+
+// letters only? No 'p', 'T', or 'w'.
+const verbs = "abcdefghijklmnoqrstuvxyzABCDEFGHIJKLMNOPQRSUVWXYZ"
+
+func FuzzFmtStateString(f *testing.F) {
+	f.Fuzz(func(t *testing.T,
+		width, prec uint8,
+		flagMinus, flagPlus, flagSharp, flagSpace, flagZero bool,
+		verbIdx uint8,
+	) {
+		if flagMinus {
+			flagZero = false
+		}
+		input := FmtState{
+			MWidth:     int(width),
+			MPrec:      int(prec),
+			MFlagMinus: flagMinus,
+			MFlagPlus:  flagPlus,
+			MFlagSharp: flagSharp,
+			MFlagSpace: flagSpace,
+			MFlagZero:  flagZero,
+		}
+		verb := rune(verbs[int(verbIdx)%len(verbs)])
+
+		t.Logf("(%#v, %c) => %q", input, verb, util.FmtStateString(input, verb))
+
+		var output FmtState
+		assert.Equal(t, "", fmt.Sprintf(util.FmtStateString(input, verb), &output))
+		assert.Equal(t, input, output)
+	})
+}