repair fixes

This commit is contained in:
Ben Sarmiento
2023-11-11 03:30:10 +01:00
parent cd96c7bd38
commit 531624ee82
4 changed files with 21 additions and 20 deletions

View File

@@ -18,8 +18,8 @@ import (
)
type TorrentManager struct {
TorrentMap *orderedmap.OrderedMap[string, *Torrent] // accessKey -> Torrent
repairMap *orderedmap.OrderedMap[string, bool] // accessKey -> bool
TorrentMap *orderedmap.OrderedMap[string, *Torrent] // accessKey -> Torrent
repairMap *orderedmap.OrderedMap[string, time.Time] // accessKey -> time last repaired
requiredVersion string
rd *realdebrid.RealDebrid
checksum string
@@ -35,7 +35,7 @@ type TorrentManager struct {
func NewTorrentManager(config config.ConfigInterface, rd *realdebrid.RealDebrid) *TorrentManager {
t := &TorrentManager{
TorrentMap: orderedmap.NewOrderedMap[string, *Torrent](),
repairMap: orderedmap.NewOrderedMap[string, bool](),
repairMap: orderedmap.NewOrderedMap[string, time.Time](),
requiredVersion: "10.11.2023",
rd: rd,
config: config,
@@ -514,7 +514,7 @@ func (t *TorrentManager) repairAll() {
// when getting info, we mark it for repair if it's missing some links
if torrent.ForRepair {
t.log.Infof("There were less links than was expected on %s; fixing...", torrent.AccessKey)
t.log.Infof("Found torrent for repair %s", torrent.AccessKey)
t.Repair(torrent.AccessKey)
break // only repair the first one for repair and then move on
}
@@ -522,10 +522,12 @@ func (t *TorrentManager) repairAll() {
}
func (t *TorrentManager) Repair(accessKey string) {
if _, exists := t.repairMap.Get(accessKey); exists {
return
if lastRepair, ok := t.repairMap.Get(accessKey); ok {
if time.Since(lastRepair) < time.Duration(24*time.Hour) { // magic number: 24 hrs
return
}
}
t.repairMap.Set(accessKey, true)
t.repairMap.Set(accessKey, time.Now())
if !t.config.EnableRepair() {
t.log.Warn("Repair is disabled; if you do not have other zurg instances running, you should enable repair")
@@ -564,7 +566,7 @@ func (t *TorrentManager) Repair(accessKey string) {
// first solution: add the same selection, maybe it can be fixed by reinsertion?
if t.reinsertTorrent(torrent, "") {
t.log.Infof("Redownloaded torrent %s to repair it", torrent.AccessKey)
t.log.Infof("Successfully downloaded torrent %s to repair it", torrent.AccessKey)
return
}
// if all the selected files are missing but there are other streamable files
@@ -633,7 +635,7 @@ func (t *TorrentManager) reinsertTorrent(torrent *Torrent, missingFiles string)
}
if info.Status == "magnet_error" || info.Status == "error" || info.Status == "virus" || info.Status == "dead" {
t.log.Warnf("Redownloaded torrent id=%s is in error state: %s", newTorrentID, info.Status)
t.log.Warnf("The redownloaded torrent id=%s is in error state: %s", newTorrentID, info.Status)
t.rd.DeleteTorrent(newTorrentID)
return false
}