From: Matt Joiner Date: Tue, 15 Oct 2019 03:59:23 +0000 (+1100) Subject: In the torrent status, sort trackers by the scheme last X-Git-Tag: v1.9.0~9 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=5af5e10640499eec9079c38db19b822d0f3a68c6;p=btrtrc.git In the torrent status, sort trackers by the scheme last --- diff --git a/torrent.go b/torrent.go index 11ef619a..838011c4 100644 --- a/torrent.go +++ b/torrent.go @@ -576,7 +576,15 @@ func (t *Torrent) writeStatus(w io.Writer) { tw := tabwriter.NewWriter(w, 0, 0, 2, ' ', 0) fmt.Fprintf(tw, " URL\tNext announce\tLast announce\n") for _, ta := range slices.Sort(slices.FromMapElems(t.trackerAnnouncers), func(l, r *trackerScraper) bool { - return l.u.String() < r.u.String() + lu := l.u + ru := r.u + var luns, runs url.URL = lu, ru + luns.Scheme = "" + runs.Scheme = "" + var ml missinggo.MultiLess + ml.StrictNext(luns.String() == runs.String(), luns.String() < runs.String()) + ml.StrictNext(lu.String() == ru.String(), lu.String() < ru.String()) + return ml.Less() }).([]*trackerScraper) { fmt.Fprintf(tw, " %s\n", ta.statusLine()) }