cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix unixfs selector root node selection

Browse Source
This commit is contained in:
Łukasz Magiera 2021-11-10 18:39:06 +01:00
parent b868769ec8
commit b9bd061bdd
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node/impl/client/client.go
View File

@ -951,7 +951,7 @@ func (a *API) ClientExport(ctx context.Context, exportRef api.ExportRef, ref api
return a.outputCAR(ctx, exportRef.Root, sel, retrievalBs, ref) return a.outputCAR(ctx, exportRef.Root, sel, retrievalBs, ref)
} }
return a.outputUnixFS(ctx, exportRef.Root, exportRef.DatamodelPathSelector != nil, sel, retrievalBs, ref) return a.outputUnixFS(ctx, exportRef.Root, exportRef.DatamodelPathSelector, retrievalBs, ref)
} }
func (a *API) outputCAR(ctx context.Context, root cid.Cid, sel datamodel.Node, bs bstore.Blockstore, ref api.FileRef) error { func (a *API) outputCAR(ctx context.Context, root cid.Cid, sel datamodel.Node, bs bstore.Blockstore, ref api.FileRef) error {
@ -977,12 +977,24 @@ func (a *API) outputCAR(ctx context.Context, root cid.Cid, sel datamodel.Node, b
return f.Close() return f.Close()
} }
func (a *API) outputUnixFS(ctx context.Context, root cid.Cid, findSubroot bool, sel datamodel.Node, bs bstore.Blockstore, ref api.FileRef) error { func (a *API) outputUnixFS(ctx context.Context, root cid.Cid, sels *textselector.Expression, bs bstore.Blockstore, ref api.FileRef) error {
ds := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs))) ds := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
// if we used a selector - need to find the sub-root the user actually wanted to retrieve // if we used a selector - need to find the sub-root the user actually wanted to retrieve
if findSubroot { if sels != nil {
var subRootFound bool var subRootFound bool
sel := selectorparse.CommonSelector_ExploreAllRecursively
if strings.HasPrefix(string(*sels), "{") {
var err error
sel, err = selectorparse.ParseJSONSelector(string(*sels))
if err != nil {
return xerrors.Errorf("failed to parse json-selector '%s': %w", *sels, err)
}
} else {
selspec, _ := textselector.SelectorSpecFromPath(*sels, nil) //nolint:errcheck
sel = selspec.Node()
}
if err := utils.TraverseDag( if err := utils.TraverseDag(
ctx, ctx,