opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-10-12 09:15:03 +08:00
Code Issues Projects Releases Wiki Activity

Address concerns from PR

Browse Source
This commit is contained in:
Jeromy
2014-09-16 03:44:53 +00:00
committed by Juan Batiz-Benet
parent d1f011244f
commit 1a3886597d
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
namesys/proquint.go
View File

@ -6,8 +6,6 @@ import (
proquint "github.com/bren2010/proquint"
)
var _ = proquint.Encode
type ProquintResolver struct{}
func (r *ProquintResolver) Matches(name string) bool {
@ -16,10 +14,7 @@ func (r *ProquintResolver) Matches(name string) bool {
}
func (r *ProquintResolver) Resolve(name string) (string, error) {
ok, err := proquint.IsProquint(name)
if err != nil {
return "", err
}
ok := r.Matches(name)
if !ok {
return "", errors.New("not a valid proquint string")
}

10
namesys/resolver.go
View File

@ -9,12 +9,12 @@ import (
var ErrCouldntResolve = errors.New("could not resolve name.")
type MasterResolver struct {
type masterResolver struct {
res []Resolver
}
func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResolver {
mr := new(MasterResolver)
func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) Resolver {
mr := new(masterResolver)
mr.res = []Resolver{
new(DNSResolver),
new(ProquintResolver),
@ -23,7 +23,7 @@ func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResol
return mr
}
func (mr *MasterResolver) Resolve(name string) (string, error) {
func (mr *masterResolver) Resolve(name string) (string, error) {
for _, r := range mr.res {
if r.Matches(name) {
return r.Resolve(name)
@ -32,7 +32,7 @@ func (mr *MasterResolver) Resolve(name string) (string, error) {
return "", ErrCouldntResolve
}
func (mr *MasterResolver) Matches(name string) bool {
func (mr *masterResolver) Matches(name string) bool {
for _, r := range mr.res {
if r.Matches(name) {
return true