opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-08-06 03:19:47 +08:00
Code Issues Projects Releases Wiki Activity

commands/cli: Made Parse return a Request object instead of separate values

Browse Source
This commit is contained in:
Matt Bell
2014-10-15 16:36:46 -07:00
committed by Juan Batiz-Benet
parent 7a36278dbc
commit 968ec344e5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
commands/cli/parse.go
View File

@ -7,23 +7,23 @@ import (
"github.com/jbenet/go-ipfs/commands"
)
func Parse(input []string, root *commands.Command) ([]string, []string, map[string]string, error) {
func Parse(input []string, root *commands.Command) (*commands.Request, error) {
path, input, err := parsePath(input, root)
if err != nil {
return nil, nil, nil, err
return nil, err
}
options, err := root.GetOptions(path)
if err != nil {
return nil, nil, nil, err
return nil, err
}
opts, args, err := parseOptions(input, options)
if err != nil {
return nil, nil, nil, err
return nil, err
}
return path, args, opts, nil
return commands.NewRequest(path, opts, args), nil
}
// parsePath gets the command path from the command line input
@ -49,8 +49,8 @@ func parsePath(input []string, root *commands.Command) ([]string, []string, erro
// parseOptions parses the raw string values of the given options
// returns the parsed options as strings, along with the CLI args
func parseOptions(input []string, options map[string]commands.Option) (map[string]string, []string, error) {
opts := make(map[string]string)
func parseOptions(input []string, options map[string]commands.Option) (map[string]interface{}, []string, error) {
opts := make(map[string]interface{})
args := make([]string, 0)
// TODO: error if one option is defined multiple times