hpz937/zurg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair optimizations

Browse Source
This commit is contained in:
Ben Sarmiento
2023-11-19 02:00:50 +01:00
parent 0b21b8d58c
commit 2923f3918d
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
internal/torrent/manager.go
View File

@@ -125,32 +125,39 @@ func NewTorrentManager(cfg config.ConfigInterface, api *realdebrid.RealDebrid, p
if t.cfg.EnableRepair() {
t.log.Info("Checking for torrents to repair")
t.repairAll()
t.log.Info("Finished checking for torrents to repair")
}
go t.startRefreshJob()
return t
}
func (t *TorrentManager) mergeToMain(t1, t2 *Torrent) *Torrent {
mainTorrent := t1
func (t *TorrentManager) mergeToMain(mainTorrent, torrentToMerge *Torrent) *Torrent {
// Merge SelectedFiles - itercb accesses a different copy of the selectedfiles map
t2.SelectedFiles.IterCb(func(key string, file *File) {
torrentToMerge.SelectedFiles.IterCb(func(filepath string, fileToMerge *File) {
// see if it already exists in the main torrent
if mainFile, ok := mainTorrent.SelectedFiles.Get(key); !ok {
mainTorrent.SelectedFiles.Set(key, file)
} else if file.Link != "" && mainFile.Link == "" {
// if it exists, but the link is empty, then we can update it
mainTorrent.SelectedFiles.Set(key, file)
if mainFile, ok := mainTorrent.SelectedFiles.Get(filepath); !ok {
// if it doesn't exist in the main torrent, add it
mainTorrent.SelectedFiles.Set(filepath, fileToMerge)
} else {
// if it exists, compare the LatestAdded property and the link
if mainTorrent.LatestAdded < torrentToMerge.LatestAdded && fileToMerge.Link != "" {
// if torrentToMerge is more recent and its file has a link, update the main torrent's file
mainTorrent.SelectedFiles.Set(filepath, fileToMerge)
} else if mainFile.Link == "" && fileToMerge.Link != "" {
// if the main torrent's file link is empty and t2's file has a link, even if it's older, update it
mainTorrent.SelectedFiles.Set(filepath, fileToMerge)
}
// else do nothing, the main torrent's file is more recent or has a valid link
}
})
// Merge Instances
mainTorrent.Instances = append(t1.Instances, t2.Instances...)
mainTorrent.Instances = append(mainTorrent.Instances, torrentToMerge.Instances...)
// LatestAdded
if t1.LatestAdded < t2.LatestAdded {
mainTorrent.LatestAdded = t2.LatestAdded
if mainTorrent.LatestAdded < torrentToMerge.LatestAdded {
mainTorrent.LatestAdded = torrentToMerge.LatestAdded
}
return mainTorrent
@@ -320,6 +327,7 @@ func (t *TorrentManager) startRefreshJob() {
if t.cfg.EnableRepair() {
t.log.Info("Checking for torrents to repair")
t.repairAll()
t.log.Info("Finished checking for torrents to repair")
}
go OnLibraryUpdateHook(t.cfg)
}
@@ -534,17 +542,19 @@ func (t *TorrentManager) repairAll() {
allTorrents, _ := t.DirectoryMap.Get(ALL_TORRENTS)
allTorrents.IterCb(func(_ string, torrent *Torrent) {
if torrent.InProgress() {
t.log.Debugf("Skipping %s for repairs because it is in progress", torrent.AccessKey)
return
}
forRepair := false
torrent.SelectedFiles.IterCb(func(_ string, file *File) {
if file.Link == "" {
if file.Link == "@" || file.ForRepair {
t.log.Debugf("Found a file to repair for torrent %s", torrent.AccessKey)
forRepair = true
}
})
if forRepair {
t.log.Infof("Repairing %s", torrent.AccessKey)
go t.Repair(torrent.AccessKey)
t.Repair(torrent.AccessKey)
}
})
}
@@ -717,7 +727,7 @@ func (t *TorrentManager) canCapacityHandle() bool {
}
if count.DownloadingCount < count.MaxNumberOfTorrents {
t.log.Infof("We can still add a new torrent, we have capacity for %d more", count.MaxNumberOfTorrents-count.DownloadingCount)
// t.log.Infof("We can still add a new torrent, we have capacity for %d more", count.MaxNumberOfTorrents-count.DownloadingCount)
return true
}

7
internal/torrent/types.go
View File

@@ -24,7 +24,8 @@ func (t *Torrent) InProgress() bool {
type File struct {
realdebrid.File
Added string
Link string
ZurgFS uint64
Added string
Link string
ZurgFS uint64
ForRepair bool
}