From 60370d60d425a85d7dce7a7e173085b957e46020 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 25 Apr 2023 22:30:45 +1000
Subject: [PATCH] Order peer conn status by peer priority and show webseeds
separately
---
client.go | 2 +-
pexconn.go | 1 -
torrent.go | 41 ++++++++++++++++++++++++++++-------------
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/client.go b/client.go
index 9306624b..1ba37871 100644
--- a/client.go
+++ b/client.go
@@ -23,8 +23,8 @@ import (
"github.com/anacrolix/chansync/events"
"github.com/anacrolix/dht/v2"
"github.com/anacrolix/dht/v2/krpc"
- g "github.com/anacrolix/generics"
. "github.com/anacrolix/generics"
+ g "github.com/anacrolix/generics"
"github.com/anacrolix/log"
"github.com/anacrolix/missinggo/perf"
"github.com/anacrolix/missinggo/v2"
diff --git a/pexconn.go b/pexconn.go
index b01edbb4..cc6c3fc6 100644
--- a/pexconn.go
+++ b/pexconn.go
@@ -6,7 +6,6 @@ import (
"time"
g "github.com/anacrolix/generics"
-
"github.com/anacrolix/log"
pp "github.com/anacrolix/torrent/peer_protocol"
diff --git a/torrent.go b/torrent.go
index 2f6832e9..b0820e5b 100644
--- a/torrent.go
+++ b/torrent.go
@@ -22,6 +22,7 @@ import (
"github.com/anacrolix/chansync/events"
"github.com/anacrolix/dht/v2"
. "github.com/anacrolix/generics"
+ g "github.com/anacrolix/generics"
"github.com/anacrolix/log"
"github.com/anacrolix/missinggo/perf"
"github.com/anacrolix/missinggo/slices"
@@ -32,6 +33,7 @@ import (
"github.com/anacrolix/sync"
"github.com/davecgh/go-spew/spew"
"github.com/pion/datachannel"
+ "golang.org/x/exp/maps"
"github.com/anacrolix/torrent/bencode"
"github.com/anacrolix/torrent/common"
@@ -759,24 +761,37 @@ func (t *Torrent) writeStatus(w io.Writer) {
spew.NewDefaultConfig()
spew.Fdump(w, t.statsLocked())
- peers := t.peersAsSlice()
- sort.Slice(peers, func(_i, _j int) bool {
- i := peers[_i]
- j := peers[_j]
- if less, ok := multiless.New().EagerSameLess(
- i.downloadRate() == j.downloadRate(), i.downloadRate() < j.downloadRate(),
- ).LessOk(); ok {
- return less
- }
- return worseConn(i, j)
+ fmt.Fprintf(w, "webseeds:\n")
+ t.writePeerStatuses(w, maps.Values(t.webSeeds))
+
+ peerConns := maps.Keys(t.conns)
+ // Peers without priorities first, then those with. I'm undecided about how to order peers
+ // without priorities.
+ sort.Slice(peerConns, func(li, ri int) bool {
+ l := peerConns[li]
+ r := peerConns[ri]
+ ml := multiless.New()
+ lpp := g.ResultFromTuple(l.peerPriority()).ToOption()
+ rpp := g.ResultFromTuple(r.peerPriority()).ToOption()
+ ml = ml.Bool(lpp.Ok, rpp.Ok)
+ ml = ml.Uint32(rpp.Value, lpp.Value)
+ return ml.Less()
})
+
+ fmt.Fprintf(w, "peer conns:\n")
+ t.writePeerStatuses(w, g.SliceMap(peerConns, func(pc *PeerConn) *Peer {
+ return &pc.Peer
+ }))
+}
+
+func (t *Torrent) writePeerStatuses(w io.Writer, peers []*Peer) {
var buf bytes.Buffer
- for i, c := range peers {
- fmt.Fprintf(w, "%2d. ", i+1)
+ for _, c := range peers {
+ fmt.Fprintf(w, "- ")
buf.Reset()
c.writeStatus(&buf)
w.Write(bytes.TrimRight(
- bytes.ReplaceAll(buf.Bytes(), []byte("\n"), []byte("\n ")),
+ bytes.ReplaceAll(buf.Bytes(), []byte("\n"), []byte("\n ")),
" "))
}
}
--
2.51.0