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

Accommodate for empty RD accounts

Browse Source
This commit is contained in:
Ben Sarmiento
2024-01-08 13:01:21 +01:00
parent b1116dfcca
commit 122eea2374
4 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
internal/torrent/latestState.go
View File

@@ -1,38 +1,33 @@
package torrent
import (
"time"
"github.com/debridmediamanager/zurg/pkg/realdebrid"
)
type LibraryState struct {
TotalCount int
ActiveCount int
FirstTorrent realdebrid.Torrent
FirstActiveTorrent realdebrid.Torrent
FirstTorrent *realdebrid.Torrent
FirstActiveTorrent *realdebrid.Torrent
}
func (ls LibraryState) equal(a LibraryState) bool {
return a.TotalCount == ls.TotalCount &&
a.ActiveCount == ls.ActiveCount &&
a.FirstTorrent.ID == ls.FirstTorrent.ID &&
a.FirstTorrent.Status == ls.FirstTorrent.Status &&
a.FirstActiveTorrent.ID == ls.FirstActiveTorrent.ID &&
a.FirstActiveTorrent.Status == ls.FirstActiveTorrent.Status
}
func EmptyState() LibraryState {
empty := realdebrid.Torrent{
ID: "",
Added: (time.Time{}).Format(time.RFC3339),
if a.TotalCount != ls.TotalCount || a.ActiveCount != ls.ActiveCount {
return false
}
return LibraryState{
TotalCount: 0,
ActiveCount: 0,
FirstTorrent: empty,
FirstActiveTorrent: empty,
if (ls.FirstTorrent == nil) != (a.FirstTorrent == nil) {
return false
}
if ls.FirstTorrent != nil && (ls.FirstTorrent.ID != a.FirstTorrent.ID || ls.FirstTorrent.Status != a.FirstTorrent.Status) {
return false
}
if (ls.FirstActiveTorrent == nil) != (a.FirstActiveTorrent == nil) {
return false
}
if ls.FirstActiveTorrent != nil && (ls.FirstActiveTorrent.ID != a.FirstActiveTorrent.ID || ls.FirstActiveTorrent.Status != a.FirstActiveTorrent.Status) {
return false
}
return true
}
func (t *TorrentManager) SetNewLatestState(checksum LibraryState) {
@@ -52,7 +47,7 @@ func (t *TorrentManager) getCurrentState() LibraryState {
torrentChan := make(chan torrentsResp, 1)
activeChan := make(chan torrentsResp, 1)
countChan := make(chan int, 1)
errChan := make(chan error, 3) // accommodate errors from both goroutines
errChan := make(chan error, 3) // accommodate errors from all goroutines
defer close(torrentChan)
defer close(activeChan)
defer close(countChan)
@@ -85,22 +80,24 @@ func (t *TorrentManager) getCurrentState() LibraryState {
countChan <- count.DownloadingCount
})
// Existing goroutines for GetTorrents and GetActiveTorrentCount
var first realdebrid.Torrent
var active realdebrid.Torrent
var first, active *realdebrid.Torrent
var totalCount, count int
for i := 0; i < 3; i++ {
select {
case firstResp := <-torrentChan:
first = firstResp.torrents[0]
if len(firstResp.torrents) > 0 {
first = &firstResp.torrents[0]
}
totalCount = firstResp.totalCount
case activeResp := <-activeChan:
active = activeResp.torrents[0]
if len(activeResp.torrents) > 0 {
active = &activeResp.torrents[0]
}
case count = <-countChan:
case err := <-errChan:
t.log.Warnf("Checksum API Error: %v", err)
return EmptyState()
return LibraryState{}
}
}