Merge pull request #1851 from dearchap/issue_1850

Fix:(issue_1850) Add RunAction for uint/uint64 slice flags
urfave · Dec 26, 2023 · 83ffe99 · 83ffe99
2 parents c667cc0 + c5d5b78
commit 83ffe99
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 0 deletions.
diff --git a/app_test.go b/app_test.go
@@ -2888,6 +2888,16 @@ func TestFlagAction(t *testing.T) {
 					return err
 				},
 			},
+			&UintSliceFlag{
+				Name: "f_uint_slice",
+				Action: func(c *Context, v []uint) error {
+					if len(v) > 0 && v[0] == 0 {
+						return fmt.Errorf("invalid uint slice")
+					}
+					_, err := c.App.Writer.Write([]byte(fmt.Sprintf("%v ", v)))
+					return err
+				},
+			},
 			&Uint64Flag{
 				Name: "f_uint64",
 				Action: func(c *Context, v uint64) error {
@@ -2898,6 +2908,16 @@ func TestFlagAction(t *testing.T) {
 					return err
 				},
 			},
+			&Uint64SliceFlag{
+				Name: "f_uint64_slice",
+				Action: func(c *Context, v []uint64) error {
+					if len(v) > 0 && v[0] == 0 {
+						return fmt.Errorf("invalid uint64 slice")
+					}
+					_, err := c.App.Writer.Write([]byte(fmt.Sprintf("%v ", v)))
+					return err
+				},
+			},
 		},
 		Action: func(ctx *Context) error { return nil },
 	}
@@ -3048,11 +3068,31 @@ func TestFlagAction(t *testing.T) {
 			args: []string{"app", "--f_uint=0"},
 			err:  fmt.Errorf("zero uint"),
 		},
+		{
+			name: "flag_uint_slice",
+			args: []string{"app", "--f_uint_slice=1,2,3"},
+			exp:  "[1 2 3] ",
+		},
+		{
+			name: "flag_uint_slice",
+			args: []string{"app", "--f_uint_slice=0"},
+			err:  fmt.Errorf("invalid uint slice"),
+		},
 		{
 			name: "flag_uint64",
 			args: []string{"app", "--f_uint64=1"},
 			exp:  "1 ",
 		},
+		{
+			name: "flag_uint64_slice",
+			args: []string{"app", "--f_uint64_slice=1,2,3"},
+			exp:  "[1 2 3] ",
+		},
+		{
+			name: "flag_uint64_slice",
+			args: []string{"app", "--f_uint64_slice=0"},
+			err:  fmt.Errorf("invalid uint64 slice"),
+		},
 		{
 			name: "flag_uint64_error",
 			args: []string{"app", "--f_uint64=0"},

diff --git a/flag_uint64_slice.go b/flag_uint64_slice.go
@@ -190,6 +190,15 @@ func (f *Uint64SliceFlag) Get(ctx *Context) []uint64 {
 	return ctx.Uint64Slice(f.Name)
 }
 
+// RunAction executes flag action if set
+func (f *Uint64SliceFlag) RunAction(c *Context) error {
+	if f.Action != nil {
+		return f.Action(c, c.Uint64Slice(f.Name))
+	}
+
+	return nil
+}
+
 // Uint64Slice looks up the value of a local Uint64SliceFlag, returns
 // nil if not found
 func (cCtx *Context) Uint64Slice(name string) []uint64 {

diff --git a/flag_uint_slice.go b/flag_uint_slice.go
@@ -201,6 +201,15 @@ func (f *UintSliceFlag) Get(ctx *Context) []uint {
 	return ctx.UintSlice(f.Name)
 }
 
+// RunAction executes flag action if set
+func (f *UintSliceFlag) RunAction(c *Context) error {
+	if f.Action != nil {
+		return f.Action(c, c.UintSlice(f.Name))
+	}
+
+	return nil
+}
+
 // UintSlice looks up the value of a local UintSliceFlag, returns
 // nil if not found
 func (cCtx *Context) UintSlice(name string) []uint {

diff --git a/godoc-current.txt b/godoc-current.txt
@@ -2146,6 +2146,9 @@ func (f *Uint64SliceFlag) IsVisible() bool
 func (f *Uint64SliceFlag) Names() []string
     Names returns the names of the flag
 
+func (f *Uint64SliceFlag) RunAction(c *Context) error
+    RunAction executes flag action if set
+
 func (f *Uint64SliceFlag) String() string
     String returns a readable representation of this value (for usage defaults)
 
@@ -2311,6 +2314,9 @@ func (f *UintSliceFlag) IsVisible() bool
 func (f *UintSliceFlag) Names() []string
     Names returns the names of the flag
 
+func (f *UintSliceFlag) RunAction(c *Context) error
+    RunAction executes flag action if set
+
 func (f *UintSliceFlag) String() string
     String returns a readable representation of this value (for usage defaults)
 

diff --git a/testdata/godoc-v2.x.txt b/testdata/godoc-v2.x.txt
@@ -2146,6 +2146,9 @@ func (f *Uint64SliceFlag) IsVisible() bool
 func (f *Uint64SliceFlag) Names() []string
     Names returns the names of the flag
 
+func (f *Uint64SliceFlag) RunAction(c *Context) error
+    RunAction executes flag action if set
+
 func (f *Uint64SliceFlag) String() string
     String returns a readable representation of this value (for usage defaults)
 
@@ -2311,6 +2314,9 @@ func (f *UintSliceFlag) IsVisible() bool
 func (f *UintSliceFlag) Names() []string
     Names returns the names of the flag
 
+func (f *UintSliceFlag) RunAction(c *Context) error
+    RunAction executes flag action if set
+
 func (f *UintSliceFlag) String() string
     String returns a readable representation of this value (for usage defaults)