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

address comments from CR

This commit is contained in:
Jeromy
2015-04-19 11:17:06 -07:00
parent 3d80b9d27d
commit e3255f46e1
3 changed files with 21 additions and 8 deletions

View File

@ -49,11 +49,13 @@ func FromSegments(seg ...string) Path {
}
func ParsePath(txt string) (Path, error) {
kp, err := ParseKeyToPath(txt)
if err == nil {
return kp, nil
}
parts := strings.Split(txt, "/")
if len(parts) == 1 {
kp, err := ParseKeyToPath(txt)
if err == nil {
return kp, nil
}
}
if len(parts) < 3 {
return "", ErrBadPath
}
@ -66,7 +68,7 @@ func ParsePath(txt string) (Path, error) {
return "", ErrBadPath
}
_, err = ParseKeyToPath(parts[2])
_, err := ParseKeyToPath(parts[2])
if err != nil {
return "", err
}
@ -86,3 +88,8 @@ func ParseKeyToPath(txt string) (Path, error) {
}
return FromKey(u.Key(chk)), nil
}
func (p *Path) IsValid() error {
_, err := ParsePath(p.String())
return err
}