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

allow cid format selection in block put command

Browse Source 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
This commit is contained in:
Jeromy
2016-10-18 17:05:38 -07:00
parent 1c6e84ce7c
commit f68e1843f4
2 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/commands/block.go
View File

@ -2,7 +2,6 @@ package commands
import (
"bytes"
"errors"
"fmt"
"io"
"io/ioutil"
@ -11,7 +10,9 @@ import (
"github.com/ipfs/go-ipfs/blocks"
util "github.com/ipfs/go-ipfs/blocks/blockstore/util"
cmds "github.com/ipfs/go-ipfs/commands"
cid "gx/ipfs/QmXfiyr2RWEXpVDdaYnD2HNiBk6UBddsvEP4RPfXb6nGqY/go-cid"
mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
)
@ -114,6 +115,9 @@ It reads from stdin, and <key> is a base58 encoded multihash.
Arguments: []cmds.Argument{
cmds.FileArg("data", true, false, "The data to be stored as an IPFS block.").EnableStdin(),
},
Options: []cmds.Option{
cmds.StringOption("format", "f", "cid format for blocks to be created with.").Default("v0"),
},
Run: func(req cmds.Request, res cmds.Response) {
n, err := req.InvocContext().GetNode()
if err != nil {
@ -139,7 +143,39 @@ It reads from stdin, and <key> is a base58 encoded multihash.
return
}
b := blocks.NewBlock(data)
format, _, _ := req.Option("format").String()
var pref cid.Prefix
pref.MhType = mh.SHA2_256
pref.MhLength = -1
pref.Version = 1
switch format {
case "cbor":
pref.Codec = cid.CBOR
case "json":
pref.Codec = cid.JSON
case "protobuf":
pref.Codec = cid.Protobuf
case "raw":
pref.Codec = cid.Raw
case "v0":
pref.Version = 0
pref.Codec = cid.Protobuf
default:
res.SetError(fmt.Errorf("unrecognized format: %s", format), cmds.ErrNormal)
return
}
bcid, err := pref.Sum(data)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
b, err := blocks.NewBlockWithCid(data, bcid)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
log.Debugf("BlockPut key: '%q'", b.Cid())
k, err := n.Blocks.AddBlock(b)
@ -163,15 +199,15 @@ It reads from stdin, and <key> is a base58 encoded multihash.
}
func getBlockForKey(req cmds.Request, skey string) (blocks.Block, error) {
if len(skey) == 0 {
return nil, fmt.Errorf("zero length cid invalid")
}
n, err := req.InvocContext().GetNode()
if err != nil {
return nil, err
}
if !u.IsValidHash(skey) {
return nil, errors.New("Not a valid hash")
}
c, err := cid.Decode(skey)
if err != nil {
return nil, err

15
test/sharness/t0050-block.sh
View File

@ -169,6 +169,21 @@ test_expect_success "multi-block 'ipfs block rm -q' produces no output" '
test ! -s block_rm_out
'
test_expect_success "can set cid format on block put" '
HASH=$(ipfs block put --format=protobuf ../t0051-object-data/testPut.pb)
'
test_expect_success "created an object correctly!" '
ipfs object get $HASH > obj_out &&
echo "{\"Links\":[],\"Data\":\"test json for sharness test\"}" > obj_exp &&
test_cmp obj_out obj_exp
'
test_expect_success "block get output looks right" '
ipfs block get $HASH > pb_block_out &&
test_cmp pb_block_out ../t0051-object-data/testPut.pb
'
#
# Misc tests
#