From 8d23c1e65162ae342b02dc2ed3cdc355c8111fcb Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Tue, 14 Nov 2023 11:41:02 +0300 Subject: [PATCH] use backported metainfo package --- server/cmd/main.go | 9 +++++---- server/dlna/list.go | 1 - server/go.mod | 2 +- server/go.sum | 4 ++-- server/server.go | 1 - server/web/api/shutdown.go | 3 ++- server/web/api/utils/link.go | 12 ++++++------ server/web/pages/route.go | 4 ++-- server/web/server.go | 11 +++++------ server/web/sslcerts/sslcerts.go | 3 ++- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/server/cmd/main.go b/server/cmd/main.go index d2dc7bb..de434cf 100644 --- a/server/cmd/main.go +++ b/server/cmd/main.go @@ -3,8 +3,6 @@ package main import ( "context" "fmt" - "github.com/anacrolix/torrent" - "github.com/anacrolix/torrent/metainfo" "net" "os" "path/filepath" @@ -12,6 +10,9 @@ import ( "strings" "time" + "github.com/anacrolix/torrent" + "github.com/anacrolix/torrent/metainfo" + "github.com/alexflint/go-arg" "github.com/pkg/browser" @@ -183,8 +184,8 @@ func openFile(path string) (*torrent.TorrentSpec, error) { return nil, err } - mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) - // mag := minfo.Magnet(nil, &info) + // mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) + mag := minfo.Magnet(nil, &info) return &torrent.TorrentSpec{ InfoBytes: minfo.InfoBytes, Trackers: [][]string{mag.Trackers}, diff --git a/server/dlna/list.go b/server/dlna/list.go index c6bd317..5f65bc8 100644 --- a/server/dlna/list.go +++ b/server/dlna/list.go @@ -241,7 +241,6 @@ func getLink(host, path string) string { // } else { host = "http://" + host // } - } pos := strings.LastIndex(host, ":") if pos > 7 { diff --git a/server/go.mod b/server/go.mod index a88c870..5f40be3 100644 --- a/server/go.mod +++ b/server/go.mod @@ -2,7 +2,7 @@ module server go 1.20 -replace github.com/anacrolix/torrent v1.53.1 => github.com/tsynik/torrent v1.2.10 +replace github.com/anacrolix/torrent v1.53.1 => github.com/tsynik/torrent v1.2.11 require ( github.com/agnivade/levenshtein v1.1.1 diff --git a/server/go.sum b/server/go.sum index e0ee68b..2173d83 100644 --- a/server/go.sum +++ b/server/go.sum @@ -355,8 +355,8 @@ github.com/swaggo/swag v1.16.2/go.mod h1:6YzXnDcpr0767iOejs318CwYkCQqyGer6BizOg0 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tsynik/torrent v1.2.10 h1:ZUFd9FymJg4EReoQbG3Q/zRDaWruOGqL41feAIKfces= -github.com/tsynik/torrent v1.2.10/go.mod h1:AjuETm1Xae+Vk31UrvrSrb29bBunwMKGZLXK6T+AgPo= +github.com/tsynik/torrent v1.2.11 h1:viD8HWicqyCCEyHVTM10UILmbvG1v+eZroPqFaLEbbY= +github.com/tsynik/torrent v1.2.11/go.mod h1:AjuETm1Xae+Vk31UrvrSrb29bBunwMKGZLXK6T+AgPo= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= diff --git a/server/server.go b/server/server.go index 7bc1d1b..4fbaf26 100644 --- a/server/server.go +++ b/server/server.go @@ -68,7 +68,6 @@ func Start(port, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA b settings.Port = port settings.SslPort = sslport web.Start() - } func cleanCache() { diff --git a/server/web/api/shutdown.go b/server/web/api/shutdown.go index 8eff9b0..6c3837f 100644 --- a/server/web/api/shutdown.go +++ b/server/web/api/shutdown.go @@ -2,9 +2,10 @@ package api import ( "net/http" + "time" + sets "server/settings" "server/torr" - "time" "github.com/gin-gonic/gin" ) diff --git a/server/web/api/utils/link.go b/server/web/api/utils/link.go index fc38598..119afa2 100644 --- a/server/web/api/utils/link.go +++ b/server/web/api/utils/link.go @@ -24,8 +24,8 @@ func ParseFile(file multipart.File) (*torrent.TorrentSpec, error) { return nil, err } - mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) - // mag := minfo.Magnet(nil, &info) + // mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) + mag := minfo.Magnet(nil, &info) return &torrent.TorrentSpec{ InfoBytes: minfo.InfoBytes, Trackers: [][]string{mag.Trackers}, @@ -106,8 +106,8 @@ func fromHttp(link string) (*torrent.TorrentSpec, error) { if err != nil { return nil, err } - mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) - // mag := minfo.Magnet(nil, &info) + // mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) + mag := minfo.Magnet(nil, &info) return &torrent.TorrentSpec{ InfoBytes: minfo.InfoBytes, @@ -130,8 +130,8 @@ func fromFile(path string) (*torrent.TorrentSpec, error) { return nil, err } - mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) - // mag := minfo.Magnet(nil, &info) + // mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) + mag := minfo.Magnet(nil, &info) return &torrent.TorrentSpec{ InfoBytes: minfo.InfoBytes, Trackers: [][]string{mag.Trackers}, diff --git a/server/web/pages/route.go b/server/web/pages/route.go index 6fe755e..90a5090 100644 --- a/server/web/pages/route.go +++ b/server/web/pages/route.go @@ -48,8 +48,8 @@ func getTorrents(c *gin.Context) { mi := metainfo.MetaInfo{ AnnounceList: ts.Trackers, } - mag := mi.Magnet(ts.DisplayName, ts.InfoHash) - // mag := mi.Magnet(&ts.InfoHash, &metainfo.Info{Name: ts.DisplayName}) + // mag := mi.Magnet(ts.DisplayName, ts.InfoHash) + mag := mi.Magnet(&ts.InfoHash, &metainfo.Info{Name: ts.DisplayName}) http += "

magnet:?xt=urn:btih:" + mag.InfoHash.HexString() + "

" } http += "" diff --git a/server/web/server.go b/server/web/server.go index 27efccd..69aa3f9 100644 --- a/server/web/server.go +++ b/server/web/server.go @@ -87,20 +87,20 @@ func Start() { if settings.BTsets.EnableDLNA { dlna.Start() } - + route.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) - //check if https enabled + // check if https enabled if settings.Ssl { - //if no cert and key files set in db/settings, generate new self-signed cert and key files + // if no cert and key files set in db/settings, generate new self-signed cert and key files if settings.BTsets.SslCert == "" || settings.BTsets.SslKey == "" { settings.BTsets.SslCert, settings.BTsets.SslKey = sslcerts.MakeCertKeyFiles(ips) log.TLogln("Saving path to ssl cert and key in db", settings.BTsets.SslCert, settings.BTsets.SslKey) settings.SetBTSets(settings.BTsets) } - //verify if cert and key files are valid + // verify if cert and key files are valid err = sslcerts.VerifyCertKeyFiles(settings.BTsets.SslCert, settings.BTsets.SslKey, settings.SslPort) - //if not valid, generate new self-signed cert and key files + // if not valid, generate new self-signed cert and key files if err != nil { log.TLogln("Error checking certificate and private key files:", err) settings.BTsets.SslCert, settings.BTsets.SslKey = sslcerts.MakeCertKeyFiles(ips) @@ -117,7 +117,6 @@ func Start() { log.TLogln("Start http server at port", settings.Port) waitChan <- route.Run(":" + settings.Port) }() - } func Wait() error { diff --git a/server/web/sslcerts/sslcerts.go b/server/web/sslcerts/sslcerts.go index b24721b..28a0ffc 100644 --- a/server/web/sslcerts/sslcerts.go +++ b/server/web/sslcerts/sslcerts.go @@ -13,9 +13,10 @@ import ( "net" "os" "path/filepath" + "time" + "server/log" "server/settings" - "time" ) func generateSelfSignedCert(ips []string) ([]byte, []byte, error) {