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

Merge pull request #5509 from ipfs/chores/add-sessions-to-ls-command-4908

Browse Source 
Add sessions when fetching MerkleDAG in LS
This commit is contained in:
Steven Allen
2018-10-02 16:06:41 -07:00
committed by GitHub
parent d8ed9aba7d 47f3c4048d
commit 080b0e1754
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/commands/ls.go
View File

@ -107,9 +107,11 @@ The JSON output contains type information.
} }
output := make([]LsObject, len(req.Arguments())) output := make([]LsObject, len(req.Arguments()))
ng := merkledag.NewSession(req.Context(), nd.DAG)
ro := merkledag.NewReadOnlyDagService(ng)
for i, dagnode := range dagnodes { for i, dagnode := range dagnodes {
dir, err := uio.NewDirectoryFromNode(nd.DAG, dagnode) dir, err := uio.NewDirectoryFromNode(ro, dagnode)
if err != nil && err != uio.ErrNotADir { if err != nil && err != uio.ErrNotADir {
res.SetError(fmt.Errorf("the data in %s (at %q) is not a UnixFS directory: %s", dagnode.Cid(), paths[i], err), cmdkit.ErrNormal) res.SetError(fmt.Errorf("the data in %s (at %q) is not a UnixFS directory: %s", dagnode.Cid(), paths[i], err), cmdkit.ErrNormal)
return return