blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

improve AddObject to support Command/*Command parameter for package gcmd (#2587)

Browse Source
This commit is contained in:
John Guo 2023-04-18 10:09:07 +08:00 committed by GitHub
parent 3991eb053c
commit da8297d770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/gcmd/gcmd_command.go
View File

@ -103,9 +103,7 @@ func (c *Command) doAddCommand(command *Command) error {
// AddObject adds one or more sub-commands to current command using struct object.
func (c *Command) AddObject(objects ...interface{}) error {
var (
commands []*Command
)
var commands []*Command
for _, object := range objects {
rootCommand, err := NewFromObject(object)
if err != nil {

7
os/gcmd/gcmd_command_object.go
View File

@ -35,6 +35,13 @@ var (
// NewFromObject creates and returns a root command object using given object.
func NewFromObject(object interface{}) (rootCmd *Command, err error) {
switch c := object.(type) {
case Command:
return &c, nil
case *Command:
return c, nil
}
originValueAndKind := reflection.OriginValueAndKind(object)
if originValueAndKind.OriginKind != reflect.Struct {
err = gerror.Newf(

5
os/gcmd/gcmd_z_unit_test.go
View File

@ -133,6 +133,11 @@ gf get golang.org/x/sys
}
err = commandRoot.AddCommand(
commandEnv,
)
if err != nil {
g.Log().Fatal(ctx, err)
}
err = commandRoot.AddObject(
commandTest,
)
if err != nil {