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

Fix "ipfs ls" to once again work on arbitrary dag objects.

Browse Source 
License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
This commit is contained in:
Kevin Atkinson 2017-08-29 23:04:59 -04:00
parent 90d9c95240
commit 2fbb4515d9
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/commands/ls.go
View File

@ -106,15 +106,20 @@ The JSON output contains type information.
output := make([]LsObject, len(req.Arguments()))
for i, dagnode := range dagnodes {
dir, err := uio.NewDirectoryFromNode(nd.DAG, dagnode)
if err != nil {
if err != nil && err != uio.ErrNotADir {
res.SetError(err, cmds.ErrNormal)
return
}
links, err := dir.Links(req.Context())
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
var links []*node.Link
if dir == nil {
links = dagnode.Links()
} else {
links, err = dir.Links(req.Context())
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
}
output[i] = LsObject{

13
test/sharness/t0045-ls.sh
View File

@ -101,15 +101,28 @@ test_ls_cmd_raw_leaves() {
'
}
test_ls_object() {
test_expect_success "ipfs add medium size file then 'ipfs ls' works as expected" '
random 500000 2 > somefile &&
HASH=$(ipfs add somefile -q) &&
echo "QmPrM8S5T7Q3M8DQvQMS7m41m3Aq4jBjzAzvky5fH3xfr4 262158 " > ls-expect &&
echo "QmdaAntAzQqqVMo4B8V69nkQd5d918YjHXUe2oF6hr72ri 237870 " >> ls-expect &&
ipfs ls $HASH > ls-actual &&
test_cmp ls-actual ls-expect
'
}
# should work offline
test_ls_cmd
test_ls_cmd_raw_leaves
test_ls_object
# should work online
test_launch_ipfs_daemon
test_ls_cmd
test_ls_cmd_raw_leaves
test_kill_ipfs_daemon
test_ls_object
#
# test for ls --resolve-type=false