1
0
mirror of https://github.com/ipfs/kubo.git synced 2025-09-10 09:52:20 +08:00

refactored ipns records to point to paths

Also changed the ipns dns resolution to use the "dnslink" format
This commit is contained in:
Jeromy
2015-04-17 21:14:25 -07:00
parent fcb559eb9d
commit 3d80b9d27d
22 changed files with 222 additions and 108 deletions

View File

@ -1,11 +1,19 @@
package path
import (
u "github.com/ipfs/go-ipfs/util"
"errors"
"path"
"strings"
u "github.com/ipfs/go-ipfs/util"
b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
)
// ErrBadPath is returned when a given path is incorrectly formatted
var ErrBadPath = errors.New("invalid ipfs ref path")
// TODO: debate making this a private struct wrapped in a public interface
// would allow us to control creation, and cache segments.
type Path string
@ -17,7 +25,7 @@ func FromString(s string) Path {
// FromKey safely converts a Key type to a Path type
func FromKey(k u.Key) Path {
return Path(k.String())
return Path("/ipfs/" + k.String())
}
func (p Path) Segments() []string {
@ -39,3 +47,42 @@ func (p Path) String() string {
func FromSegments(seg ...string) Path {
return Path(strings.Join(seg, "/"))
}
func ParsePath(txt string) (Path, error) {
kp, err := ParseKeyToPath(txt)
if err == nil {
return kp, nil
}
parts := strings.Split(txt, "/")
if len(parts) < 3 {
return "", ErrBadPath
}
if parts[0] != "" {
return "", ErrBadPath
}
if parts[1] != "ipfs" && parts[1] != "ipns" {
return "", ErrBadPath
}
_, err = ParseKeyToPath(parts[2])
if err != nil {
return "", err
}
return Path(txt), nil
}
func ParseKeyToPath(txt string) (Path, error) {
chk := b58.Decode(txt)
if len(chk) == 0 {
return "", errors.New("not a key")
}
_, err := mh.Cast(chk)
if err != nil {
return "", err
}
return FromKey(u.Key(chk)), nil
}