status-im/torrent
2
0
Fork 0
mirror of synced 2025-02-23 22:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the tracker.New interface, just take a string

Browse Source
This commit is contained in:
Matt Joiner 2013-12-16 18:47:23 +11:00
parent 99d2ced31c
commit e68d5fec1f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tracker/tracker.go
View File

@ -57,12 +57,17 @@ func RegisterClientScheme(scheme string, newFunc func(*url.URL) Client) {
schemes[scheme] = newFunc
}
func New(url *url.URL) (cl Client, err error) {
newFunc, ok := schemes[url.Scheme]
// Returns ErrBadScheme if the tracker scheme isn't recognised.
func New(rawurl string) (cl Client, err error) {
url_s, err := url.Parse(rawurl)
if err != nil {
return
}
newFunc, ok := schemes[url_s.Scheme]
if !ok {
err = ErrBadScheme
return
}
cl = newFunc(url)
cl = newFunc(url_s)
return
}

9
tracker/udp/udp_tracker_test.go
View File

@ -8,7 +8,6 @@ import (
"encoding/hex"
"io"
"net"
"net/url"
"syscall"
"testing"
)
@ -84,13 +83,7 @@ func TestConvertInt16ToInt(t *testing.T) {
}
func TestUDPTracker(t *testing.T) {
tr, err := tracker.New(func() *url.URL {
u, err := url.Parse("udp://tracker.openbittorrent.com:80/announce")
if err != nil {
t.Fatal(err)
}
return u
}())
tr, err := tracker.New("udp://tracker.openbittorrent.com:80/announce")
if err != nil {
t.Fatal(err)
}