coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-24 11:57:44 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge pull request #3517 from ipfs/fix/dag-get-accept-paths

Browse Source 
dag/get: accept paths and not just cids
This commit is contained in:
Jeromy Johnson 2016-12-20 11:14:38 -08:00 committed by GitHub
commit a15360f349
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/commands/dag/dag.go
View File

@ -6,6 +6,7 @@ import (
"strings"
cmds "github.com/ipfs/go-ipfs/commands"
path "github.com/ipfs/go-ipfs/path"
node "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node"
ipldcbor "gx/ipfs/QmbuuwTd9x4NReZ7sxtiKk7wFcfDUo54MfWBdtF5MRCPGR/go-ipld-cbor"
@ -105,7 +106,7 @@ var DagGetCmd = &cmds.Command{
`,
},
Arguments: []cmds.Argument{
cmds.StringArg("cid", true, false, "The cid of the object to get").EnableStdin(),
cmds.StringArg("ref", true, false, "The object to get").EnableStdin(),
},
Run: func(req cmds.Request, res cmds.Response) {
n, err := req.InvocContext().GetNode()
@ -114,13 +115,13 @@ var DagGetCmd = &cmds.Command{
return
}
c, err := cid.Decode(req.Arguments()[0])
p, err := path.ParsePath(req.Arguments()[0])
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
obj, err := n.DAG.Get(req.Context(), c)
obj, err := n.Resolver.ResolvePath(req.Context(), p)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return

9
test/sharness/t0053-dag.sh
View File

@ -59,6 +59,15 @@ test_dag_cmd() {
echo "{\"data\":\"CAISB2Zvb2JhcgoYBw==\",\"links\":[]}" > dag_get_pb_exp &&
test_cmp dag_get_pb_exp dag_get_pb_out
'
test_expect_success "can call dag get with a path" '
ipfs dag get $IPLDHASH/cats/0 > cat_out
'
test_expect_success "output looks correct" '
echo "{\"data\":\"CAISBGZvbwoYBA==\",\"links\":[]}" > cat_exp &&
test_cmp cat_exp cat_out
'
}
# should work offline