opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-01 16:05:47 +08:00
Code Issues Projects Releases Wiki Activity

Resolve '/ipfs/root/some/path' paths in 'ipfs resolve' command

Browse Source 
License: MIT
Signed-off-by: Matt Bell <mappum@gmail.com>
This commit is contained in:
Matt Bell
2015-09-06 12:49:25 -07:00
committed by rht
parent bea47c9b0a
commit eddd64119e
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/commands/resolve.go
View File

@ -5,6 +5,7 @@ import (
"strings"
cmds "github.com/ipfs/go-ipfs/commands"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
namesys "github.com/ipfs/go-ipfs/namesys"
path "github.com/ipfs/go-ipfs/path"
u "github.com/ipfs/go-ipfs/util"
@ -78,6 +79,16 @@ Resolve the value of another name recursively:
depth = namesys.DefaultDepthLimit
}
if strings.HasPrefix(name, "/ipfs/") || !strings.HasPrefix(name, "/") {
resolved, err := resolveIpfsPath(req.Context(), n.Resolver, name)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
res.SetOutput(&ResolvedPath{resolved})
return
}
output, err := n.Namesys.ResolveN(req.Context(), name, depth)
if err != nil {
res.SetError(err, cmds.ErrNormal)
@ -97,3 +108,22 @@ Resolve the value of another name recursively:
},
Type: ResolvedPath{},
}
func resolveIpfsPath (ctx context.Context, r *path.Resolver, name string) (path.Path, error) {
p, err := path.ParsePath(name)
if err != nil {
return "", err
}
node, err := r.ResolvePath(ctx, p)
if err != nil {
return "", err
}
key, err := node.Key()
if err != nil {
return "", err
}
return path.FromKey(key), nil
}