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 mutex on api

Browse Source
This commit is contained in:
nikk gitanes
2021-08-27 19:06:38 +03:00
parent 465ef7b0c6
commit f5aed24d7f
2 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
server/torr/apihelper.go
View File

@@ -6,7 +6,6 @@ import (
"os"
"path/filepath"
"sort"
"sync"
"time"
"github.com/anacrolix/torrent"
@@ -17,8 +16,7 @@ import (
)
var (
bts *BTServer
lockApi sync.Mutex
bts *BTServer
)
func InitApiHelper(bt *BTServer) {
@@ -26,8 +24,6 @@ func InitApiHelper(bt *BTServer) {
}
func LoadTorrent(tor *Torrent) *Torrent {
lockApi.Lock()
defer lockApi.Unlock()
if tor.TorrentSpec == nil {
return nil
}
@@ -45,8 +41,6 @@ func LoadTorrent(tor *Torrent) *Torrent {
}
func AddTorrent(spec *torrent.TorrentSpec, title, poster string, data string) (*Torrent, error) {
lockApi.Lock()
defer lockApi.Unlock()
torr, err := NewTorrent(spec, bts)
if err != nil {
log.TLogln("error add torrent:", err)
@@ -86,8 +80,6 @@ func SaveTorrentToDB(torr *Torrent) {
}
func GetTorrent(hashHex string) *Torrent {
lockApi.Lock()
defer lockApi.Unlock()
hash := metainfo.NewHashFromHex(hashHex)
tor := bts.GetTorrent(hash)
if tor != nil {
@@ -99,8 +91,6 @@ func GetTorrent(hashHex string) *Torrent {
if tr != nil {
tor = tr
go func() {
lockApi.Lock()
defer lockApi.Unlock()
log.TLogln("New torrent", tor.Hash())
tr, _ := NewTorrent(tor.TorrentSpec, bts)
if tr != nil {
@@ -117,9 +107,6 @@ func GetTorrent(hashHex string) *Torrent {
}
func SetTorrent(hashHex, title, poster, data string) *Torrent {
lockApi.Lock()
defer lockApi.Unlock()
hash := metainfo.NewHashFromHex(hashHex)
torr := bts.GetTorrent(hash)
torrDb := GetTorrentDB(hash)
@@ -155,8 +142,6 @@ func SetTorrent(hashHex, title, poster, data string) *Torrent {
}
func RemTorrent(hashHex string) {
lockApi.Lock()
defer lockApi.Unlock()
hash := metainfo.NewHashFromHex(hashHex)
if sets.BTsets.UseDisk && hashHex != "" && hashHex != "/" {
name := filepath.Join(sets.BTsets.TorrentsSavePath, hashHex)
@@ -174,8 +159,6 @@ func RemTorrent(hashHex string) {
}
func ListTorrent() []*Torrent {
lockApi.Lock()
defer lockApi.Unlock()
btlist := bts.ListTorrents()
dblist := ListTorrentsDB()
@@ -202,8 +185,6 @@ func ListTorrent() []*Torrent {
}
func DropTorrent(hashHex string) {
lockApi.Lock()
defer lockApi.Unlock()
hash := metainfo.NewHashFromHex(hashHex)
bts.RemoveTorrent(hash)
}
@@ -212,12 +193,6 @@ func SetSettings(set *sets.BTSets) {
if sets.ReadOnly {
return
}
lockApi.Lock()
defer lockApi.Unlock()
log.TLogln("drop all torrents")
dropAllTorrent()
time.Sleep(time.Second * 2)
log.TLogln("disconect")
bts.Disconnect()
sets.SetBTSets(set)
log.TLogln("connect")
@@ -230,12 +205,6 @@ func SetDefSettings() {
if sets.ReadOnly {
return
}
lockApi.Lock()
defer lockApi.Unlock()
log.TLogln("drop all torrents")
dropAllTorrent()
time.Sleep(time.Second * 2)
log.TLogln("disconect")
bts.Disconnect()
sets.SetDefault()
log.TLogln("connect")
@@ -252,8 +221,6 @@ func dropAllTorrent() {
}
func Shutdown() {
lockApi.Lock()
defer lockApi.Unlock()
bts.Disconnect()
sets.CloseDB()
log.TLogln("Received shutdown. Quit")
@@ -265,8 +232,6 @@ func WriteStatus(w io.Writer) {
}
func Preload(torr *Torrent, index int) {
lockApi.Lock()
lockApi.Unlock()
cache := float32(sets.BTsets.CacheSize)
preload := float32(sets.BTsets.PreloadCache)
size := int64((cache / 100.0) * preload)