Fixes on merge behavior; remove downloads cap

2024-06-04 23:58:56 +02:00
parent b0d05d27d4
commit f977abc052
5 changed files with 15 additions and 35 deletions
--- a/internal/torrent/refresh.go
+++ b/internal/torrent/refresh.go
@@ -296,9 +296,7 @@ func (t *TorrentManager) mergeTorrents(existing, toMerge *Torrent) *Torrent {
 	// selected files
 	mergedTorrent.SelectedFiles = cmap.New[*File]()
 	newer.SelectedFiles.IterCb(func(key string, file *File) {
-		if f, ok := mergedTorrent.SelectedFiles.Get(key); !ok || !f.State.Is("ok_file") {
-			mergedTorrent.SelectedFiles.Set(key, file)
-		}
+		mergedTorrent.SelectedFiles.SetIfAbsent(key, file)
 	})
 	older.SelectedFiles.IterCb(func(key string, file *File) {
 		mediaInfo := file.MediaInfo