bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 16:21:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve package gcmd

Browse Source
This commit is contained in:
John Guo
2021-12-11 00:12:58 +08:00
parent f0c25d8476
commit 3a20883a81
1 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
os/gcmd/gcmd_command_object.go
View File

@ -62,32 +62,24 @@ func NewFromObject(object interface{}) (rootCmd *Command, err error) {
}
for i := 0; i < originValueAndKind.InputValue.NumMethod(); i++ {
var (
method = originValueAndKind.InputValue.Method(i)
methodCommand *Command
method = originValueAndKind.InputValue.Method(i)
methodCmd *Command
)
methodCommand, err = newCommandFromMethod(object, method)
methodCmd, err = newCommandFromMethod(object, method)
if err != nil {
return
}
if nameSet.Contains(methodCommand.Name) {
if nameSet.Contains(methodCmd.Name) {
err = gerror.Newf(
`command name should be unique, found duplicated command name in method "%s"`,
method.Type().String(),
)
return
}
if rootCommandName == methodCommand.Name {
if rootCmd.Func == nil {
rootCmd.Func = methodCommand.Func
}
if rootCmd.FuncWithValue == nil {
rootCmd.FuncWithValue = methodCommand.FuncWithValue
}
if len(rootCmd.Arguments) == 0 {
rootCmd.Arguments = methodCommand.Arguments
}
if rootCommandName == methodCmd.Name {
methodToRootCmdWhenNameEqual(rootCmd, methodCmd)
} else {
subCommands = append(subCommands, methodCommand)
subCommands = append(subCommands, methodCmd)
}
}
if len(subCommands) > 0 {
@ -96,6 +88,39 @@ func NewFromObject(object interface{}) (rootCmd *Command, err error) {
return
}
func methodToRootCmdWhenNameEqual(rootCmd *Command, methodCmd *Command) {
if rootCmd.Usage == "" {
rootCmd.Usage = methodCmd.Usage
}
if rootCmd.Brief == "" {
rootCmd.Brief = methodCmd.Brief
}
if rootCmd.Description == "" {
rootCmd.Description = methodCmd.Description
}
if rootCmd.Examples == "" {
rootCmd.Examples = methodCmd.Examples
}
if rootCmd.Func == nil {
rootCmd.Func = methodCmd.Func
}
if rootCmd.FuncWithValue == nil {
rootCmd.FuncWithValue = methodCmd.FuncWithValue
}
if rootCmd.HelpFunc == nil {
rootCmd.HelpFunc = methodCmd.HelpFunc
}
if len(rootCmd.Arguments) == 0 {
rootCmd.Arguments = methodCmd.Arguments
}
if !rootCmd.Strict {
rootCmd.Strict = methodCmd.Strict
}
if rootCmd.Config == "" {
rootCmd.Config = methodCmd.Config
}
}
func newCommandFromObjectMeta(object interface{}) (command *Command, err error) {
var (
metaData = gmeta.Data(object)