From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 17 Mar 2022 22:15:50 +0000 (+1100)
Subject: Use Info.BestName in a few more places
X-Git-Tag: v1.42.0~6
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=dd1ca6f51475529b432dba669bd84444f97043be;p=btrtrc.git

Use Info.BestName in a few more places
---

diff --git a/metainfo/metainfo.go b/metainfo/metainfo.go
index 583cf51e..0aca2375 100644
--- a/metainfo/metainfo.go
+++ b/metainfo/metainfo.go
@@ -72,7 +72,7 @@ func (mi *MetaInfo) SetDefaults() {
 func (mi *MetaInfo) Magnet(infoHash *Hash, info *Info) (m Magnet) {
 	m.Trackers = append(m.Trackers, mi.UpvertedAnnounceList().DistinctValues()...)
 	if info != nil {
-		m.DisplayName = info.Name
+		m.DisplayName = info.BestName()
 	}
 	if infoHash != nil {
 		m.InfoHash = *infoHash
diff --git a/torrent.go b/torrent.go
index f6be6978..7e6ec24c 100644
--- a/torrent.go
+++ b/torrent.go
@@ -543,7 +543,7 @@ func (t *Torrent) name() string {
 	t.nameMu.RLock()
 	defer t.nameMu.RUnlock()
 	if t.haveInfo() {
-		return t.info.Name
+		return t.info.BestName()
 	}
 	if t.displayName != "" {
 		return t.displayName