From: Matt Joiner <anacrolix@gmail.com>
Date: Sat, 27 Jan 2018 01:02:05 +0000 (+1100)
Subject: Include torrent stats in status
X-Git-Tag: v1.0.0~258
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=1725fc9a36038f78348f6829cbb2b2eb8fd02a62;p=btrtrc.git

Include torrent stats in status
---

diff --git a/torrent.go b/torrent.go
index cec8a045..18176156 100644
--- a/torrent.go
+++ b/torrent.go
@@ -16,6 +16,8 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"github.com/davecgh/go-spew/spew"
+
 	"github.com/anacrolix/dht"
 	"github.com/anacrolix/missinggo"
 	"github.com/anacrolix/missinggo/bitmap"
@@ -578,9 +580,9 @@ func (t *Torrent) writeStatus(w io.Writer) {
 
 	fmt.Fprintf(w, "DHT Announces: %d\n", t.numDHTAnnounces)
 
-	fmt.Fprintf(w, "Pending peers: %d\n", len(t.peers))
-	fmt.Fprintf(w, "Half open: %d\n", len(t.halfOpen))
-	fmt.Fprintf(w, "Active peers: %d\n", len(t.conns))
+	spew.NewDefaultConfig()
+	spew.Fdump(w, t.statsLocked())
+
 	conns := t.connsAsSlice()
 	slices.Sort(conns, worseConn)
 	for i, c := range conns {
@@ -1339,12 +1341,14 @@ func (t *Torrent) addPeers(peers []Peer) {
 func (t *Torrent) Stats() TorrentStats {
 	t.cl.mu.Lock()
 	defer t.cl.mu.Unlock()
+	return t.statsLocked()
+}
 
+func (t *Torrent) statsLocked() TorrentStats {
 	t.stats.ActivePeers = len(t.conns)
 	t.stats.HalfOpenPeers = len(t.halfOpen)
 	t.stats.PendingPeers = len(t.peers)
 	t.stats.TotalPeers = t.numTotalPeers()
-
 	return t.stats
 }