From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 18 Nov 2014 20:32:51 +0000 (-0600)
Subject: Improve client status write-out
X-Git-Tag: v1.0.0~1514
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=c63d36c1b62151114f5687a96831906b0f671aa9;p=btrtrc.git

Improve client status write-out
---

diff --git a/client.go b/client.go
index dcc44e42..0c9ff2e5 100644
--- a/client.go
+++ b/client.go
@@ -165,13 +165,15 @@ func (cl *Client) WriteStatus(w io.Writer) {
 	cl.downloadStrategy.WriteStatus(w)
 	fmt.Fprintln(w)
 	for _, t := range cl.torrents {
-		fmt.Fprintf(w, "%s: %f%%\n", t.Name(), func() float32 {
-			if !t.haveInfo() {
-				return 0
-			} else {
-				return 100 * (1 - float32(t.BytesLeft())/float32(t.Length()))
-			}
-		}())
+		if t.Name() == "" {
+			fmt.Fprint(w, "<unknown name>")
+		} else {
+			fmt.Fprint(w, t.Name())
+		}
+		if t.haveInfo() {
+			fmt.Fprintf(w, ": %f%% of %d bytes", 100*(1-float32(t.BytesLeft())/float32(t.Length())), t.Length())
+		}
+		fmt.Fprint(w, "\n")
 		fmt.Fprint(w, "Blocked reads:")
 		for _, dw := range cl.dataWaits[t] {
 			fmt.Fprintf(w, " %d", dw.offset)