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

path: simplify ResolveToLastNode

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-07-23 17:37:33 +02:00
parent 492a4fc46b
commit de6a6e3e44
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
path/resolver/resolver.go
View File

@ -70,7 +70,10 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (ipld
for len(p) > 0 {
lnk, rest, err := r.ResolveOnce(ctx, r.DAG, nd, p)
if lnk != nil {
if lnk == nil {
break
}
if err != nil {
return nil, nil, err
}
@ -81,22 +84,27 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (ipld
}
nd = next
p = rest
continue
}
if len(p) == 0 {
return nd, nil, nil
}
// Confirm the path exists within the object
val, rest, err := nd.Resolve(p)
if err != nil {
return nil, nil, err
}
if len(rest) > 0 {
return nil, nil, errors.New("path failed to resolve fully")
}
switch val.(type) {
case *ipld.Link:
return nil, nil, errors.New("inconsistent ResolveOnce / nd.Resolve")
default:
return nd, p, nil
}
}
return nd, nil, nil
}
// ResolvePath fetches the node for given path. It returns the last item