From 37faccb93a8e0a6c7beb46259e09fe556cd3b1ea Mon Sep 17 00:00:00 2001
From: Grégoire Duchêne <gduchene@awhk.org>
Date: Sun, 26 Jun 2022 09:34:51 +0100
Subject: Add FlagVarDef and FlagVarSliceDef

---
 flag.go | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'flag.go')

diff --git a/flag.go b/flag.go
index bed32eb..ce394b8 100644
--- a/flag.go
+++ b/flag.go
@@ -15,6 +15,12 @@ func FlagVar[T any](fs *flag.FlagSet, name, usage string, parse ParseFunc[T]) *T
 	return v.Value
 }
 
+func FlagVarDef[T any](fs *flag.FlagSet, name, usage string, parse ParseFunc[T], def T) *T {
+	val := def
+	FlagVarPtr(fs, name, usage, parse, &val)
+	return &val
+}
+
 func FlagVarPtr[T any](fs *flag.FlagSet, name, usage string, parse ParseFunc[T], val *T) {
 	fs.Var(&flagValue[T]{Parse: parse, Value: val}, name, usage)
 }
@@ -25,6 +31,13 @@ func FlagVarSlice[T any](fs *flag.FlagSet, name, usage string, parse ParseFunc[T
 	return v.Values
 }
 
+func FlagVarSliceDef[T any](fs *flag.FlagSet, name, usage string, parse ParseFunc[T], def []T) *[]T {
+	vals := make([]T, len(def))
+	copy(vals, def)
+	FlagVarSlicePtr(fs, name, usage, parse, &vals)
+	return &vals
+}
+
 func FlagVarSlicePtr[T any](fs *flag.FlagSet, name, usage string, parse ParseFunc[T], vals *[]T) {
 	fs.Var(&flagValueSlice[T]{Parse: parse, Values: vals}, name, usage)
 }
@@ -66,6 +79,8 @@ func (f *flagValue[T]) String() string {
 type flagValueSlice[T any] struct {
 	Parse  ParseFunc[T]
 	Values *[]T
+
+	shouldAppend bool
 }
 
 var _ flag.Value = &flagValueSlice[any]{}
@@ -75,7 +90,12 @@ func (f *flagValueSlice[T]) Set(s string) error {
 	if err != nil {
 		return err
 	}
-	*f.Values = append(*f.Values, val)
+	if f.shouldAppend {
+		*f.Values = append(*f.Values, val)
+	} else {
+		*f.Values = []T{val}
+		f.shouldAppend = true
+	}
 	return nil
 }
 
-- 
cgit v1.2.3-70-g09d2