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

retrieval: Fix traversal in ls

Browse Source
This commit is contained in:
Łukasz Magiera 2021-11-29 21:08:53 +01:00
parent 9538fc9723
commit 58a084049d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/client_retr.go
View File

@ -434,8 +434,8 @@ var clientRetrieveCatCmd = &cli.Command{
}, },
} }
func pathToSel(psel string, sub builder.SelectorSpec) (lapi.Selector, error) { func pathToSel(psel string, matchTraversal bool, sub builder.SelectorSpec) (lapi.Selector, error) {
rs, err := textselector.SelectorSpecFromPath(textselector.Expression(psel), true, sub) rs, err := textselector.SelectorSpecFromPath(textselector.Expression(psel), matchTraversal, sub)
if err != nil { if err != nil {
return "", xerrors.Errorf("failed to parse path-selector: %w", err) return "", xerrors.Errorf("failed to parse path-selector: %w", err)
} }
@ -489,7 +489,7 @@ var clientRetrieveLsCmd = &cli.Command{
if cctx.IsSet("data-selector") { if cctx.IsSet("data-selector") {
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any) ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
dataSelector, err = pathToSel(cctx.String("data-selector"), dataSelector, err = pathToSel(cctx.String("data-selector"), cctx.Bool("ipld"),
ssb.ExploreUnion( ssb.ExploreUnion(
ssb.Matcher(), ssb.Matcher(),
ssb.ExploreAll( ssb.ExploreAll(
@ -554,7 +554,7 @@ var clientRetrieveLsCmd = &cli.Command{
if cctx.IsSet("data-selector") { if cctx.IsSet("data-selector") {
ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any) ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype.Any)
jsel, err = pathToSel(cctx.String("data-selector"), jsel, err = pathToSel(cctx.String("data-selector"), false,
ssb.ExploreRecursive(selector.RecursionLimitDepth(int64(cctx.Int("depth"))), ssb.ExploreAll(ssb.ExploreUnion(ssb.Matcher(), ssb.ExploreRecursiveEdge()))), ssb.ExploreRecursive(selector.RecursionLimitDepth(int64(cctx.Int("depth"))), ssb.ExploreAll(ssb.ExploreUnion(ssb.Matcher(), ssb.ExploreRecursiveEdge()))),
) )
} }