Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refact(cmd/object): change option string to const #5932

Merged
merged 1 commit into from
Jan 21, 2019
Merged

refact(cmd/object): change option string to const #5932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions core/commands/object/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ type Object struct {

var ErrDataEncoding = errors.New("unkown data field encoding")

const (
headersOptionName = "headers"
encodingOptionName = "data-encoding"
inputencOptionName = "inputenc"
datafieldencOptionName = "datafieldenc"
pinOptionName = "pin"
quietOptionName = "quiet"
)

var ObjectCmd = &cmds.Command{
Helptext: cmdkit.HelpText{
Tagline: "Interact with IPFS objects.",
Expand Down Expand Up @@ -111,7 +120,7 @@ multihash.
cmdkit.StringArg("key", true, false, "Key of the object to retrieve, in base58-encoded multihash format.").EnableStdin(),
},
Options: []cmdkit.Option{
cmdkit.BoolOption("headers", "v", "Print table headers (Hash, Size, Name)."),
cmdkit.BoolOption(headersOptionName, "v", "Print table headers (Hash, Size, Name)."),
},
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
api, err := cmdenv.GetApi(env, req)
Expand Down Expand Up @@ -153,7 +162,7 @@ multihash.
Encoders: cmds.EncoderMap{
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *Object) error {
tw := tabwriter.NewWriter(w, 1, 2, 1, ' ', 0)
headers, _ := req.Options["headers"].(bool)
headers, _ := req.Options[headersOptionName].(bool)
if headers {
fmt.Fprintln(tw, "Hash\tSize\tName")
}
Expand Down Expand Up @@ -201,7 +210,7 @@ Supported values are:
cmdkit.StringArg("key", true, false, "Key of the object to retrieve, in base58-encoded multihash format.").EnableStdin(),
},
Options: []cmdkit.Option{
cmdkit.StringOption("data-encoding", "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
cmdkit.StringOption(encodingOptionName, "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
},
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
api, err := cmdenv.GetApi(env, req)
Expand All @@ -214,7 +223,7 @@ Supported values are:
return err
}

datafieldenc, _ := req.Options["data-encoding"].(string)
datafieldenc, _ := req.Options[encodingOptionName].(string)
if err != nil {
return err
}
Expand Down Expand Up @@ -380,10 +389,10 @@ And then run:
cmdkit.FileArg("data", true, false, "Data to be stored as a DAG object.").EnableStdin(),
},
Options: []cmdkit.Option{
cmdkit.StringOption("inputenc", "Encoding type of input data. One of: {\"protobuf\", \"json\"}.").WithDefault("json"),
cmdkit.StringOption("datafieldenc", "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
cmdkit.BoolOption("pin", "Pin this object when adding."),
cmdkit.BoolOption("quiet", "q", "Write minimal output."),
cmdkit.StringOption(inputencOptionName, "Encoding type of input data. One of: {\"protobuf\", \"json\"}.").WithDefault("json"),
cmdkit.StringOption(datafieldencOptionName, "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
cmdkit.BoolOption(pinOptionName, "Pin this object when adding."),
cmdkit.BoolOption(quietOptionName, "q", "Write minimal output."),
},
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
api, err := cmdenv.GetApi(env, req)
Expand All @@ -396,17 +405,17 @@ And then run:
return err
}

inputenc, _ := req.Options["inputenc"].(string)
inputenc, _ := req.Options[inputencOptionName].(string)
if err != nil {
return err
}

datafieldenc, _ := req.Options["datafieldenc"].(string)
datafieldenc, _ := req.Options[datafieldencOptionName].(string)
if err != nil {
return err
}

dopin, _ := req.Options["pin"].(bool)
dopin, _ := req.Options[pinOptionName].(bool)
if err != nil {
return err
}
Expand All @@ -423,7 +432,7 @@ And then run:
},
Encoders: cmds.EncoderMap{
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *Object) error {
quiet, _ := req.Options["quiet"].(bool)
quiet, _ := req.Options[quietOptionName].(bool)

o := out.Hash
if !quiet {
Expand Down