sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

revert to _9 and add save info bytes

Browse Source
This commit is contained in:
YouROK
2020-04-18 15:19:39 +03:00
parent 0bc5ea3084
commit 45b2bfdd05
12 changed files with 93 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/server/web/helpers/Magnet.go
View File

@@ -9,33 +9,42 @@ import (
"strings"
"time"
"server/settings"
"github.com/anacrolix/torrent/metainfo"
)
func GetMagnet(link string) (*metainfo.Magnet, error) {
func GetMagnet(link string) (*metainfo.Magnet, []byte, error) {
url, err := url.Parse(link)
if err != nil {
return nil, err
return nil, nil, err
}
var mag *metainfo.Magnet
var infoBytes []byte
switch strings.ToLower(url.Scheme) {
case "magnet":
mag, err = getMag(url.String())
if err == nil {
torDb, err := settings.LoadTorrentDB(mag.InfoHash.HexString())
if err == nil && torDb != nil {
infoBytes = torDb.InfoBytes
}
}
case "http", "https":
mag, err = getMagFromHttp(url.String())
mag, infoBytes, err = getMagFromHttp(url.String())
case "":
mag, err = getMag("magnet:?xt=urn:btih:" + url.Path)
case "file":
mag, err = getMagFromFile(url.Path)
mag, infoBytes, err = getMagFromFile(url.Path)
default:
err = fmt.Errorf("unknown scheme:", url, url.Scheme)
}
if err != nil {
return nil, err
return nil, nil, err
}
return mag, nil
return mag, infoBytes, nil
}
func getMag(link string) (*metainfo.Magnet, error) {
@@ -43,10 +52,10 @@ func getMag(link string) (*metainfo.Magnet, error) {
return &mag, err
}
func getMagFromHttp(url string) (*metainfo.Magnet, error) {
func getMagFromHttp(url string) (*metainfo.Magnet, []byte, error) {
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err
return nil, nil, err
}
client := new(http.Client)
@@ -55,38 +64,38 @@ func getMagFromHttp(url string) (*metainfo.Magnet, error) {
resp, err := client.Do(req)
if err != nil {
return nil, err
return nil, nil, err
}
defer resp.Body.Close()
if resp.StatusCode != 200 {
return nil, errors.New(resp.Status)
return nil, nil, errors.New(resp.Status)
}
minfo, err := metainfo.Load(resp.Body)
if err != nil {
return nil, err
return nil, nil, err
}
info, err := minfo.UnmarshalInfo()
if err != nil {
return nil, err
return nil, nil, err
}
mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
return &mag, nil
return &mag, minfo.InfoBytes, nil
}
func getMagFromFile(path string) (*metainfo.Magnet, error) {
func getMagFromFile(path string) (*metainfo.Magnet, []byte, error) {
if runtime.GOOS == "windows" && strings.HasPrefix(path, "/") {
path = strings.TrimPrefix(path, "/")
}
minfo, err := metainfo.LoadFromFile(path)
if err != nil {
return nil, err
return nil, nil, err
}
info, err := minfo.UnmarshalInfo()
if err != nil {
return nil, err
return nil, nil, err
}
mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
return &mag, nil
return &mag, minfo.InfoBytes, nil
}

5
src/server/web/helpers/Torrent.go
View File

@@ -13,9 +13,9 @@ import (
"github.com/anacrolix/torrent/metainfo"
)
func Add(bts *torr.BTServer, magnet metainfo.Magnet, save bool) error {
func Add(bts *torr.BTServer, magnet metainfo.Magnet, infobytes []byte, save bool) error {
fmt.Println("Adding torrent", magnet.String())
_, err := bts.AddTorrent(magnet, func(torr *torr.Torrent) {
_, err := bts.AddTorrent(magnet, infobytes, func(torr *torr.Torrent) {
if torr, _ := settings.LoadTorrentDB(magnet.InfoHash.HexString()); torr != nil {
return
}
@@ -24,6 +24,7 @@ func Add(bts *torr.BTServer, magnet metainfo.Magnet, save bool) error {
torDb.Hash = torr.Hash().HexString()
torDb.Size = torr.Length()
torDb.Magnet = magnet.String()
torDb.InfoBytes = infobytes
torDb.Timestamp = time.Now().Unix()
files := torr.Stats().FileStats
sort.Slice(files, func(i, j int) bool {