opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 18:13:54 +08:00
Code Issues Projects Releases Wiki Activity

fix up core.Resolve a bit

Browse Source
This commit is contained in:
Jeromy
2015-04-22 23:20:22 -07:00
parent e3255f46e1
commit c1560befcd
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/commands/publish.go
View File

@ -8,7 +8,6 @@ import (
cmds "github.com/ipfs/go-ipfs/commands"
core "github.com/ipfs/go-ipfs/core"
nsys "github.com/ipfs/go-ipfs/namesys"
crypto "github.com/ipfs/go-ipfs/p2p/crypto"
path "github.com/ipfs/go-ipfs/path"
u "github.com/ipfs/go-ipfs/util"
@ -77,6 +76,7 @@ Publish an <ipfs-path> to another public key (not implemented):
// name = args[0]
pstr = args[1]
res.SetError(errors.New("keychains not yet implemented"), cmds.ErrNormal)
return
case 1:
// name = n.Identity.ID.String()
pstr = args[0]
@ -108,14 +108,12 @@ Publish an <ipfs-path> to another public key (not implemented):
func publish(n *core.IpfsNode, k crypto.PrivKey, ref path.Path) (*IpnsEntry, error) {
// First, verify the path exists
_, err := n.Resolver.ResolvePath(ref)
_, err := core.Resolve(n, ref)
if err != nil {
return nil, err
}
pub := nsys.NewRoutingPublisher(n.Routing)
err = pub.Publish(n.Context(), k, ref)
err = n.Namesys.Publish(n.Context(), k, ref)
if err != nil {
return nil, err
}

6
path/path.go
View File

@ -45,7 +45,11 @@ func (p Path) String() string {
}
func FromSegments(seg ...string) Path {
return Path(strings.Join(seg, "/"))
var pref string
if seg[0] == "ipfs" || seg[0] == "ipns" {
pref = "/"
}
return Path(pref + strings.Join(seg, "/"))
}
func ParsePath(txt string) (Path, error) {