ipfs block put: Add CID Codecs to "ipfs block put"
Adding codecs found in Use the codec map implemented in https://github.com/ipfs/go-cid/pull/26 License: MIT Signed-off-by: Herman Junge <chpdg42@gmail.com>
Herman Junge committed
Jun 28, 2017 at 22:09 UTC
f512a33998f9eae6b898f1dbb0e05d9fea81a55b
1 file changed
+7
-12
core/commands/block.go
+7
-12
@@ -9,10 +9,10 @@ import (
9
10
util "github.com/ipfs/go-ipfs/blocks/blockstore/util"
11
cmds "github.com/ipfs/go-ipfs/commands"
12
- "gx/ipfs/QmXxGS5QsUxpR3iqL5DjmsYPHR1Yz74siRQ4ChJqWFosMh/go-block-format"
12
13
mh "gx/ipfs/QmVGtdTZdTFaLsaj2RwdVG8jcjNNcp1DE914DKZ2kHmXHw/go-multihash"
14
u "gx/ipfs/QmWbjfz3u6HkAdPh34dgPchGbQjob6LXLhAeCGii2TX69n/go-ipfs-util"
15
+ blocks "gx/ipfs/QmXxGS5QsUxpR3iqL5DjmsYPHR1Yz74siRQ4ChJqWFosMh/go-block-format"
16
cid "gx/ipfs/Qma4RJSuh7mMeJQYCqMbKzekn6EwBo7HEs5AQYjVRMQATB/go-cid"
17
)
18
@@ -149,20 +149,15 @@ It reads from stdin, and <key> is a base58 encoded multihash.
149
pref.Version = 1
150
151
format, _, _ := req.Option("format").String()
152
- switch format {
153
- case "cbor":
154
- pref.Codec = cid.DagCBOR
155
- case "protobuf":
156
- pref.Codec = cid.DagProtobuf
157
- case "raw":
158
- pref.Codec = cid.Raw
159
- case "v0":
160
- pref.Version = 0
161
- pref.Codec = cid.DagProtobuf
162
- default:
152
+ formatval, ok := cid.Codecs[format]
153
+ if !ok {
154
res.SetError(fmt.Errorf("unrecognized format: %s", format), cmds.ErrNormal)
155
return
156
}
157
+ if format == "v0" {
158
+ pref.Version = 0
159
+ }
160
+ pref.Codec = formatval
161
162
mhtype, _, _ := req.Option("mhtype").String()
163
mhtval, ok := mh.Names[mhtype]