From 8c6a128200cf84403e1a087de0f8b22b25c4d603 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Sun, 12 Mar 2023 13:07:43 +0300 Subject: [PATCH 1/2] respect go.mod replace --- server/version/version.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/version/version.go b/server/version/version.go index c0cb886..0e3a9b8 100644 --- a/server/version/version.go +++ b/server/version/version.go @@ -17,7 +17,11 @@ func GetTorrentVersion() string { } for _, dep := range bi.Deps { if dep.Path == "github.com/anacrolix/torrent" { - return dep.Version + if dep.Replace != nil { + return dep.Replace.Version + } else { + return dep.Version + } } } return "" From 5614ce05be7f9f726b663458fdd13af7245a66c2 Mon Sep 17 00:00:00 2001 From: AlexGredn <55414996+AlexGredn@users.noreply.github.com> Date: Sun, 19 Mar 2023 13:03:06 +0300 Subject: [PATCH 2/2] Fix to work on Samsung TV (#228) * Fix to work on Samsung TV Samsung Q80 Series try to get meta data from dir in dlna and get nil. * Update list.go --- server/dlna/list.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/dlna/list.go b/server/dlna/list.go index fa216a4..d7ac247 100644 --- a/server/dlna/list.go +++ b/server/dlna/list.go @@ -112,19 +112,6 @@ func getTorrent(path, host string) (ret []interface{}) { } func getTorrentMeta(path, host string) (ret interface{}) { - // find torrent without load - torrs := torr.ListTorrent() - var torr *torr.Torrent - for _, t := range torrs { - if strings.Contains(path, t.TorrentSpec.InfoHash.HexString()) { - torr = t - break - } - } - if torr == nil { - return nil - } - // Meta object if path == "/" { // root object meta @@ -150,10 +137,23 @@ func getTorrentMeta(path, host string) (ret interface{}) { Date: upnpav.Timestamp{Time: time.Now()}, Class: "object.container.storageFolder", } + torrs := torr.ListTorrent() vol := len(torrs) meta := upnpav.Container{Object: trObj, ChildCount: vol} return meta } else if isHashPath(path) { + // find torrent without load + torrs := torr.ListTorrent() + var torr *torr.Torrent + for _, t := range torrs { + if strings.Contains(path, t.TorrentSpec.InfoHash.HexString()) { + torr = t + break + } + } + if torr == nil { + return nil + } // hash object meta obj := upnpav.Object{ ID: "%2F" + torr.TorrentSpec.InfoHash.HexString(),