From d89410d17e92689a4e11d74ebbb4063ee913a153 Mon Sep 17 00:00:00 2001 From: chenminjian <727180553@qq.com> Date: Sat, 19 Jan 2019 17:05:02 +0800 Subject: [PATCH] refact(cmd/object): change option string to const License: MIT Signed-off-by: chenminjian <727180553@qq.com> --- core/commands/object/object.go | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 4f5780e20..b4d4947bf 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -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.", @@ -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) @@ -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") } @@ -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) @@ -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 } @@ -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) @@ -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 } @@ -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 {