Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow cid format selection in block put command #3324

Merged
merged 1 commit into from
Oct 30, 2016
Merged

allow cid format selection in block put command #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 42 additions & 6 deletions core/commands/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package commands

import (
"bytes"
"errors"
"fmt"
"io"
"io/ioutil"
Expand All @@ -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"
)

Expand Down Expand Up @@ -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 {
Expand All @@ -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)
Expand All @@ -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
Expand Down
15 changes: 15 additions & 0 deletions test/sharness/t0050-block.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down