engineering/sshpiper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better naming

Browse source
This commit is contained in:
Boshi Lian 2019-01-06 06:15:02 -08:00
parent fa85805222
commit 34656417d4
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sshpiperd/cmd.go
View file

@ -19,8 +19,8 @@ func (s *subCommand) Execute(args []string) error {
return s.callback(args) return s.callback(args)
} }
func addSubCommand(parser *flags.Command, name, desc string, callback interface{}) *flags.Command { func addSubCommand(command *flags.Command, name, desc string, callback interface{}) *flags.Command {
c, err := parser.AddCommand(name, desc, "", callback) c, err := command.AddCommand(name, desc, "", callback)
if err != nil { if err != nil {
panic(err) panic(err)
@ -29,15 +29,15 @@ func addSubCommand(parser *flags.Command, name, desc string, callback interface{
return c return c
} }
func addOpt(parser *flags.Group, name string, data interface{}) { func addOpt(group *flags.Group, name string, data interface{}) {
_, err := parser.AddGroup(name, "", data) _, err := group.AddGroup(name, "", data)
if err != nil { if err != nil {
panic(err) panic(err)
} }
} }
func addPlugins(parser *flags.Group, name string, pluginNames []string, getter func(n string) registry.Plugin) { func addPlugins(group *flags.Group, name string, pluginNames []string, getter func(n string) registry.Plugin) {
for _, n := range pluginNames { for _, n := range pluginNames {
p := getter(n) p := getter(n)
@ -48,7 +48,7 @@ func addPlugins(parser *flags.Group, name string, pluginNames []string, getter f
continue continue
} }
_, err := parser.AddGroup(name+"."+p.GetName(), "", opt) _, err := group.AddGroup(name+"."+p.GetName(), "", opt)
if err != nil { if err != nil {
panic(err) panic(err)
@ -118,7 +118,6 @@ func main() {
for _, p := range all { for _, p := range all {
fmt.Println(p) fmt.Println(p)
} }
} }
if len(args) == 0 { if len(args) == 0 {
@ -235,7 +234,6 @@ func main() {
// options, for snap only at the moment // options, for snap only at the moment
addSubCommand(c, "options", "list all options for daemon mode", &subCommand{func(args []string) error { addSubCommand(c, "options", "list all options for daemon mode", &subCommand{func(args []string) error {
var printOpts func(*flags.Group) var printOpts func(*flags.Group)
printOpts = func(group *flags.Group) { printOpts = func(group *flags.Group) {
@ -246,13 +244,11 @@ func main() {
for _, g := range group.Groups() { for _, g := range group.Groups() {
printOpts(g) printOpts(g)
} }
} }
printOpts(c.Group) printOpts(c.Group)
return nil return nil
}}) }})
} }
parser.Parse() parser.Parse()