From 8d3e86e3c0e18c9cba7d5ecec4d8269eaaaf95fb Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Mon, 3 Apr 2023 15:10:54 +1000 Subject: [PATCH] Expose StringAddr --- client.go | 9 +-------- string-addr.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 string-addr.go diff --git a/client.go b/client.go index c66a65a0..4d6761a8 100644 --- a/client.go +++ b/client.go @@ -1313,13 +1313,6 @@ func (cl *Client) AddTorrentSpec(spec *TorrentSpec) (t *Torrent, new bool, err e return } -type stringAddr string - -var _ net.Addr = stringAddr("") - -func (stringAddr) Network() string { return "" } -func (me stringAddr) String() string { return string(me) } - // The trackers will be merged with the existing ones. If the Info isn't yet known, it will be set. // spec.DisallowDataDownload/Upload will be read and applied // The display name is replaced if the new spec provides one. Note that any `Storage` is ignored. @@ -1344,7 +1337,7 @@ func (t *Torrent) MergeSpec(spec *TorrentSpec) error { } for _, peerAddr := range spec.PeerAddrs { t.addPeer(PeerInfo{ - Addr: stringAddr(peerAddr), + Addr: StringAddr(peerAddr), Source: PeerSourceDirect, Trusted: true, }) diff --git a/string-addr.go b/string-addr.go new file mode 100644 index 00000000..c1245418 --- /dev/null +++ b/string-addr.go @@ -0,0 +1,11 @@ +package torrent + +import "net" + +// This adds a net.Addr interface to a string address that has no presumed Network. +type StringAddr string + +var _ net.Addr = StringAddr("") + +func (StringAddr) Network() string { return "" } +func (me StringAddr) String() string { return string(me) } -- 2.44.0