refact(cmd/object): change option string to const
License: MIT Signed-off-by: chenminjian <727180553@qq.com>
chenminjian committed
Jan 19, 2019 at 17:05 UTC
d89410d17e92689a4e11d74ebbb4063ee913a153
1 file changed
+21
-12
core/commands/object/object.go
+21
-12
@@ -36,6 +36,15 @@ type Object struct {
36
37
var ErrDataEncoding = errors.New("unkown data field encoding")
38
39
+const (
40
+ headersOptionName = "headers"
41
+ encodingOptionName = "data-encoding"
42
+ inputencOptionName = "inputenc"
43
+ datafieldencOptionName = "datafieldenc"
44
+ pinOptionName = "pin"
45
+ quietOptionName = "quiet"
46
+)
47
+
48
var ObjectCmd = &cmds.Command{
49
Helptext: cmdkit.HelpText{
50
Tagline: "Interact with IPFS objects.",
@@ -111,7 +120,7 @@ multihash.
120
cmdkit.StringArg("key", true, false, "Key of the object to retrieve, in base58-encoded multihash format.").EnableStdin(),
121
},
122
Options: []cmdkit.Option{
114
- cmdkit.BoolOption("headers", "v", "Print table headers (Hash, Size, Name)."),
123
+ cmdkit.BoolOption(headersOptionName, "v", "Print table headers (Hash, Size, Name)."),
124
},
125
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
126
api, err := cmdenv.GetApi(env, req)
@@ -153,7 +162,7 @@ multihash.
162
Encoders: cmds.EncoderMap{
163
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *Object) error {
164
tw := tabwriter.NewWriter(w, 1, 2, 1, ' ', 0)
156
- headers, _ := req.Options["headers"].(bool)
165
+ headers, _ := req.Options[headersOptionName].(bool)
166
if headers {
167
fmt.Fprintln(tw, "Hash\tSize\tName")
168
}
@@ -201,7 +210,7 @@ Supported values are:
210
cmdkit.StringArg("key", true, false, "Key of the object to retrieve, in base58-encoded multihash format.").EnableStdin(),
211
},
212
Options: []cmdkit.Option{
204
- cmdkit.StringOption("data-encoding", "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
213
+ cmdkit.StringOption(encodingOptionName, "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
214
},
215
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
216
api, err := cmdenv.GetApi(env, req)
@@ -214,7 +223,7 @@ Supported values are:
223
return err
224
}
225
217
- datafieldenc, _ := req.Options["data-encoding"].(string)
226
+ datafieldenc, _ := req.Options[encodingOptionName].(string)
227
if err != nil {
228
return err
229
}
@@ -380,10 +389,10 @@ And then run:
389
cmdkit.FileArg("data", true, false, "Data to be stored as a DAG object.").EnableStdin(),
390
},
391
Options: []cmdkit.Option{
383
- cmdkit.StringOption("inputenc", "Encoding type of input data. One of: {\"protobuf\", \"json\"}.").WithDefault("json"),
384
- cmdkit.StringOption("datafieldenc", "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
385
- cmdkit.BoolOption("pin", "Pin this object when adding."),
386
- cmdkit.BoolOption("quiet", "q", "Write minimal output."),
392
+ cmdkit.StringOption(inputencOptionName, "Encoding type of input data. One of: {\"protobuf\", \"json\"}.").WithDefault("json"),
393
+ cmdkit.StringOption(datafieldencOptionName, "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
394
+ cmdkit.BoolOption(pinOptionName, "Pin this object when adding."),
395
+ cmdkit.BoolOption(quietOptionName, "q", "Write minimal output."),
396
},
397
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
398
api, err := cmdenv.GetApi(env, req)
@@ -396,17 +405,17 @@ And then run:
405
return err
406
}
407
399
- inputenc, _ := req.Options["inputenc"].(string)
408
+ inputenc, _ := req.Options[inputencOptionName].(string)
409
if err != nil {
410
return err
411
}
412
404
- datafieldenc, _ := req.Options["datafieldenc"].(string)
413
+ datafieldenc, _ := req.Options[datafieldencOptionName].(string)
414
if err != nil {
415
return err
416
}
417
409
- dopin, _ := req.Options["pin"].(bool)
418
+ dopin, _ := req.Options[pinOptionName].(bool)
419
if err != nil {
420
return err
421
}
@@ -423,7 +432,7 @@ And then run:
432
},
433
Encoders: cmds.EncoderMap{
434
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *Object) error {
426
- quiet, _ := req.Options["quiet"].(bool)
435
+ quiet, _ := req.Options[quietOptionName].(bool)
436
437
o := out.Hash
438
if !quiet {