Add lock for repairs
This commit is contained in:
@@ -168,6 +168,7 @@ func (t *TorrentManager) getMoreInfo(rdTorrent realdebrid.Torrent) *Torrent {
|
|||||||
OriginalName: info.OriginalName,
|
OriginalName: info.OriginalName,
|
||||||
Added: info.Added,
|
Added: info.Added,
|
||||||
Hash: info.Hash,
|
Hash: info.Hash,
|
||||||
|
Lock: &sync.Mutex{},
|
||||||
}
|
}
|
||||||
// SelectedFiles is a subset of Files with only the selected ones
|
// SelectedFiles is a subset of Files with only the selected ones
|
||||||
// it also has a Link field, which can be empty
|
// it also has a Link field, which can be empty
|
||||||
@@ -233,6 +234,7 @@ func (t *TorrentManager) mergeToMain(existing, toMerge *Torrent) Torrent {
|
|||||||
Unfixable: existing.Unfixable || toMerge.Unfixable,
|
Unfixable: existing.Unfixable || toMerge.Unfixable,
|
||||||
UnassignedLinks: existing.UnassignedLinks.Union(toMerge.UnassignedLinks),
|
UnassignedLinks: existing.UnassignedLinks.Union(toMerge.UnassignedLinks),
|
||||||
BrokenLinks: existing.BrokenLinks.Union(toMerge.BrokenLinks),
|
BrokenLinks: existing.BrokenLinks.Union(toMerge.BrokenLinks),
|
||||||
|
Lock: &sync.Mutex{},
|
||||||
}
|
}
|
||||||
|
|
||||||
// this function triggers only when we have a new DownloadedID
|
// this function triggers only when we have a new DownloadedID
|
||||||
|
|||||||
@@ -100,6 +100,10 @@ func (t *TorrentManager) repairAll() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t *TorrentManager) Repair(torrent *Torrent) {
|
func (t *TorrentManager) Repair(torrent *Torrent) {
|
||||||
|
if torrent.Unfixable {
|
||||||
|
t.log.Warnf("Torrent %s is unfixable, skipping repair", t.GetKey(torrent))
|
||||||
|
return
|
||||||
|
}
|
||||||
// save the broken files to the file cache
|
// save the broken files to the file cache
|
||||||
infoCache, _ := t.DirectoryMap.Get(INT_INFO_CACHE)
|
infoCache, _ := t.DirectoryMap.Get(INT_INFO_CACHE)
|
||||||
torrent.DownloadedIDs.Each(func(id string) bool {
|
torrent.DownloadedIDs.Each(func(id string) bool {
|
||||||
@@ -117,13 +121,17 @@ func (t *TorrentManager) Repair(torrent *Torrent) {
|
|||||||
})
|
})
|
||||||
_ = t.workerPool.Submit(func() {
|
_ = t.workerPool.Submit(func() {
|
||||||
t.log.Infof("Repairing torrent %s", t.GetKey(torrent))
|
t.log.Infof("Repairing torrent %s", t.GetKey(torrent))
|
||||||
|
torrent.Lock.Lock()
|
||||||
|
defer torrent.Lock.Unlock()
|
||||||
|
torrent.Repairing = true
|
||||||
t.repair(torrent)
|
t.repair(torrent)
|
||||||
|
torrent.Repairing = false
|
||||||
t.log.Infof("Finished repairing torrent %s", t.GetKey(torrent))
|
t.log.Infof("Finished repairing torrent %s", t.GetKey(torrent))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *TorrentManager) repair(torrent *Torrent) {
|
func (t *TorrentManager) repair(torrent *Torrent) {
|
||||||
if torrent.AnyInProgress() {
|
if torrent.AnyInProgress() || torrent.Repairing {
|
||||||
t.log.Infof("Torrent %s is in progress, skipping repair until download is done", t.GetKey(torrent))
|
t.log.Infof("Torrent %s is in progress, skipping repair until download is done", t.GetKey(torrent))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -379,10 +387,14 @@ func (t *TorrentManager) markAsUnplayable(torrent *Torrent) {
|
|||||||
|
|
||||||
func (t *TorrentManager) markAsUnfixable(torrent *Torrent) {
|
func (t *TorrentManager) markAsUnfixable(torrent *Torrent) {
|
||||||
t.log.Warnf("Marking torrent %s as unfixable", t.GetKey(torrent))
|
t.log.Warnf("Marking torrent %s as unfixable", t.GetKey(torrent))
|
||||||
|
torrent.Lock.Lock()
|
||||||
|
defer torrent.Lock.Unlock()
|
||||||
torrent.Unfixable = true
|
torrent.Unfixable = true
|
||||||
infoCache, _ := t.DirectoryMap.Get(INT_INFO_CACHE)
|
infoCache, _ := t.DirectoryMap.Get(INT_INFO_CACHE)
|
||||||
torrent.DownloadedIDs.Each(func(id string) bool {
|
torrent.DownloadedIDs.Each(func(id string) bool {
|
||||||
info, _ := infoCache.Get(id)
|
info, _ := infoCache.Get(id)
|
||||||
|
info.Lock.Lock()
|
||||||
|
defer info.Lock.Unlock()
|
||||||
info.Unfixable = true
|
info.Unfixable = true
|
||||||
t.writeTorrentToFile(id, info)
|
t.writeTorrentToFile(id, info)
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package torrent
|
|||||||
import (
|
import (
|
||||||
stdjson "encoding/json"
|
stdjson "encoding/json"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/debridmediamanager/zurg/pkg/realdebrid"
|
"github.com/debridmediamanager/zurg/pkg/realdebrid"
|
||||||
@@ -27,6 +28,8 @@ type Torrent struct {
|
|||||||
BrokenLinks mapset.Set[string] `json:"BrokenLinks"` // only relevant on repair
|
BrokenLinks mapset.Set[string] `json:"BrokenLinks"` // only relevant on repair
|
||||||
|
|
||||||
Version string `json:"Version"` // only used for files
|
Version string `json:"Version"` // only used for files
|
||||||
|
Repairing bool `json:"-"`
|
||||||
|
Lock *sync.Mutex `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *Torrent) MarshalJSON() ([]byte, error) {
|
func (t *Torrent) MarshalJSON() ([]byte, error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user