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

commands/block: don't use default for -f

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-03-10 23:44:34 +01:00
parent 6f68eac5bc
commit efb74199bf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/commands/block.go
View File

@ -132,7 +132,7 @@ than 'sha2-256' or format to anything other than 'v0' will result in CIDv1.
cmdkit.FileArg("data", true, false, "The data to be stored as an IPFS block.").EnableStdin(), cmdkit.FileArg("data", true, false, "The data to be stored as an IPFS block.").EnableStdin(),
}, },
Options: []cmdkit.Option{ Options: []cmdkit.Option{
cmdkit.StringOption("format", "f", "cid format for blocks to be created with.").WithDefault(""), cmdkit.StringOption("format", "f", "cid format for blocks to be created with."),
cmdkit.StringOption("mhtype", "multihash hash function").WithDefault("sha2-256"), cmdkit.StringOption("mhtype", "multihash hash function").WithDefault("sha2-256"),
cmdkit.IntOption("mhlen", "multihash hash length").WithDefault(-1), cmdkit.IntOption("mhlen", "multihash hash length").WithDefault(-1),
}, },
@ -172,8 +172,8 @@ than 'sha2-256' or format to anything other than 'v0' will result in CIDv1.
var pref cid.Prefix var pref cid.Prefix
pref.Version = 1 pref.Version = 1
format := req.Options["format"].(string) format, formatSet := req.Options["format"].(string)
if format == "" { if !formatSet {
if mhtval == mh.SHA2_256 { if mhtval == mh.SHA2_256 {
format = "v0" format = "v0"
} else { } else {
@ -186,7 +186,7 @@ than 'sha2-256' or format to anything other than 'v0' will result in CIDv1.
} }
formatval, ok := cid.Codecs[format] formatval, ok := cid.Codecs[format]
if !ok { if !ok {
res.SetError(fmt.Errorf("unrecognized format: %s", format), cmdkit.ErrNormal) res.SetError(fmt.Errorf("unrecognized format: '%s'", format), cmdkit.ErrNormal)
return return
} }
if mhtval != mh.SHA2_256 && pref.Version == 0 { if mhtval != mh.SHA2_256 && pref.Version == 0 {