diff --git a/server/go.mod b/server/go.mod index dac1800..fabcfe6 100644 --- a/server/go.mod +++ b/server/go.mod @@ -18,3 +18,44 @@ require ( github.com/pkg/errors v0.8.1 go.etcd.io/bbolt v1.3.5 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 +) + +require ( + github.com/RoaringBitmap/roaring v0.4.17 // indirect + github.com/alexflint/go-scalar v1.0.0 // indirect + github.com/anacrolix/dht v1.0.1 // indirect + github.com/anacrolix/log v0.2.0 // indirect + github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778 // indirect + github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572 // indirect + github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/edsrzf/mmap-go v1.0.0 // indirect + github.com/elgatito/upnp v0.0.0-20180711183757-2f244d205f9a // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect + github.com/go-playground/locales v0.13.0 // indirect + github.com/go-playground/universal-translator v0.17.0 // indirect + github.com/go-playground/validator/v10 v10.2.0 // indirect + github.com/golang/protobuf v1.3.3 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect + github.com/huandu/xstrings v1.2.0 // indirect + github.com/json-iterator/go v1.1.9 // indirect + github.com/leodido/go-urn v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect + github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect + github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect + github.com/philhofer/fwd v1.0.0 // indirect + github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/tinylib/msgp v1.1.0 // indirect + github.com/ugorji/go/codec v1.1.7 // indirect + github.com/willf/bitset v1.1.10 // indirect + github.com/willf/bloom v2.0.3+incompatible // indirect + golang.org/x/net v0.0.0-20190318221613-d196dffd7c2b // indirect + golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect +) diff --git a/server/torr/btserver.go b/server/torr/btserver.go index e205901..21cca2d 100644 --- a/server/torr/btserver.go +++ b/server/torr/btserver.go @@ -61,7 +61,7 @@ func (bt *BTServer) configure() { userAgent := "qBittorrent/4.3.2" peerID := "-qB4320-" - upnpID := "TorrServer" +// upnpID := "TorrServer" cliVers := userAgent //"uTorrent/2210(25302)" bt.config.Debug = settings.BTsets.EnableDebug @@ -75,7 +75,7 @@ func (bt *BTServer) configure() { bt.config.IPBlocklist = blocklist bt.config.Bep20 = peerID bt.config.PeerID = utils.PeerIDRandom(peerID) - bt.config.UpnpID = upnpID +// bt.config.UpnpID = upnpID bt.config.HTTPUserAgent = userAgent bt.config.ExtendedHandshakeClientVersion = cliVers bt.config.EstablishedConnsPerTorrent = settings.BTsets.ConnectionsLimit diff --git a/server/torr/storage/torrstor/piece.go b/server/torr/storage/torrstor/piece.go index 494d546..dc8c643 100644 --- a/server/torr/storage/torrstor/piece.go +++ b/server/torr/storage/torrstor/piece.go @@ -73,10 +73,9 @@ func (p *Piece) Release() { } else { p.dPiece.Release() } - // TODO: check this merge - if !p.cache.isClosed { - p.cache.torrent.Piece(p.Id).SetPriority(torrent.PiecePriorityNone) - // fix remove pieces hash - p.cache.torrent.Piece(p.Id).UpdateCompletion() - } +// if !p.cache.isClosed { +// p.cache.torrent.Piece(p.Id).SetPriority(torrent.PiecePriorityNone) +// // fix remove pieces hash +// p.cache.torrent.Piece(p.Id).UpdateCompletion() +// } } diff --git a/server/web/pages/template/html.go b/server/web/pages/template/html.go index c349514..2b532d3 100644 --- a/server/web/pages/template/html.go +++ b/server/web/pages/template/html.go @@ -49,24 +49,24 @@ var Mstile150x150png []byte var Sitewebmanifest []byte -//go:embed pages/static/js/2.16253270.chunk.js -var Staticjs216253270chunkjs []byte +//go:embed pages/static/js/2.97916048.chunk.js +var Staticjs297916048chunkjs []byte -//go:embed pages/static/js/2.16253270.chunk.js.LICENSE.txt -var Staticjs216253270chunkjsLICENSEtxt []byte +//go:embed pages/static/js/2.97916048.chunk.js.LICENSE.txt +var Staticjs297916048chunkjsLICENSEtxt []byte -//go:embed pages/static/js/2.16253270.chunk.js.map -var Staticjs216253270chunkjsmap []byte +//go:embed pages/static/js/2.97916048.chunk.js.map +var Staticjs297916048chunkjsmap []byte -//go:embed pages/static/js/main.b12e99af.chunk.js -var Staticjsmainb12e99afchunkjs []byte +//go:embed pages/static/js/main.d8f84fc6.chunk.js +var Staticjsmaind8f84fc6chunkjs []byte -//go:embed pages/static/js/main.b12e99af.chunk.js.map -var Staticjsmainb12e99afchunkjsmap []byte +//go:embed pages/static/js/main.d8f84fc6.chunk.js.map +var Staticjsmaind8f84fc6chunkjsmap []byte //go:embed pages/static/js/runtime-main.8bda5920.js diff --git a/server/web/pages/template/pages/asset-manifest.json b/server/web/pages/template/pages/asset-manifest.json index a96b5ed..1c3ee9c 100644 --- a/server/web/pages/template/pages/asset-manifest.json +++ b/server/web/pages/template/pages/asset-manifest.json @@ -1,17 +1,17 @@ { "files": { - "main.js": "/static/js/main.b12e99af.chunk.js", - "main.js.map": "/static/js/main.b12e99af.chunk.js.map", + "main.js": "/static/js/main.d8f84fc6.chunk.js", + "main.js.map": "/static/js/main.d8f84fc6.chunk.js.map", "runtime-main.js": "/static/js/runtime-main.8bda5920.js", "runtime-main.js.map": "/static/js/runtime-main.8bda5920.js.map", - "static/js/2.16253270.chunk.js": "/static/js/2.16253270.chunk.js", - "static/js/2.16253270.chunk.js.map": "/static/js/2.16253270.chunk.js.map", + "static/js/2.97916048.chunk.js": "/static/js/2.97916048.chunk.js", + "static/js/2.97916048.chunk.js.map": "/static/js/2.97916048.chunk.js.map", "index.html": "/index.html", - "static/js/2.16253270.chunk.js.LICENSE.txt": "/static/js/2.16253270.chunk.js.LICENSE.txt" + "static/js/2.97916048.chunk.js.LICENSE.txt": "/static/js/2.97916048.chunk.js.LICENSE.txt" }, "entrypoints": [ "static/js/runtime-main.8bda5920.js", - "static/js/2.16253270.chunk.js", - "static/js/main.b12e99af.chunk.js" + "static/js/2.97916048.chunk.js", + "static/js/main.d8f84fc6.chunk.js" ] } \ No newline at end of file diff --git a/server/web/pages/template/pages/index.html b/server/web/pages/template/pages/index.html index a7f1d8c..29724d9 100644 --- a/server/web/pages/template/pages/index.html +++ b/server/web/pages/template/pages/index.html @@ -1 +1 @@ -