idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-23 16:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: download clients rule checking (#137)

Browse source 
* fix: download client rules exit

* feat: improve re-announce
This commit is contained in:
Ludvig Lundgren 2022-02-13 18:24:41 +01:00 • committed by GitHub
parent b60e5f61c6
commit c3687b8fa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 74 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

51
internal/action/qbittorrent.go
View file

@ -10,7 +10,7 @@ import (
"github.com/rs/zerolog/log"
)
const ReannounceMaxAttempts = 30
const ReannounceMaxAttempts = 50
const ReannounceInterval = 7000
func (s *service) qbittorrent(qbt *qbittorrent.Client, action domain.Action, hash string, torrentFile string) error {
@ -92,7 +92,7 @@ func (s *service) qbittorrentCheckRulesCanDownload(action domain.Action) (bool,
// check for active downloads and other rules
if client.Settings.Rules.Enabled && !action.IgnoreRules {
activeDownloads, err := qbt.GetTorrentsFilter(qbittorrent.TorrentFilterDownloading)
activeDownloads, err := qbt.GetTorrentsActiveDownloads()
if err != nil {
log.Error().Stack().Err(err).Msg("could not fetch downloading torrents")
return false, nil, err
@ -119,6 +119,9 @@ func (s *service) qbittorrentCheckRulesCanDownload(action domain.Action) (bool,
}
log.Debug().Msg("active downloads are slower than set limit, lets add it")
} else {
log.Debug().Msg("max active downloads reached, skipping")
return false, nil, nil
}
}
}
@ -132,10 +135,12 @@ func checkTrackerStatus(qb qbittorrent.Client, hash string) error {
attempts := 0
// initial sleep to give tracker a head start
time.Sleep(2 * time.Second)
time.Sleep(4 * time.Second)
for attempts < ReannounceMaxAttempts {
log.Debug().Msgf("qBittorrent - run re-announce %v attempt: %v", hash, attempts)
if attempts > 0 {
log.Debug().Msgf("qBittorrent - run re-announce %v attempt: %v", hash, attempts)
}
trackers, err := qb.GetTorrentTrackers(hash)
if err != nil {
@ -145,30 +150,34 @@ func checkTrackerStatus(qb qbittorrent.Client, hash string) error {
// check if status not working or something else
working := findTrackerStatus(trackers, qbittorrent.TrackerStatusOK)
if !working {
log.Trace().Msgf("qBittorrent - not working yet, lets re-announce %v attempt: %v", hash, attempts)
err = qb.ReAnnounceTorrents([]string{hash})
if err != nil {
log.Error().Err(err).Msgf("qBittorrent - could not get re-announce torrent: %v", hash)
return err
if working {
if attempts > 0 {
log.Debug().Msgf("qBittorrent - re-announce for %v OK", hash)
}
attempts++
// add delay for next run
time.Sleep(ReannounceInterval * time.Millisecond)
continue
} else {
log.Debug().Msgf("qBittorrent - re-announce for %v OK", hash)
announceOK = true
break
// if working lets return
return nil
}
log.Trace().Msgf("qBittorrent - not working yet, lets re-announce %v attempt: %v", hash, attempts)
err = qb.ReAnnounceTorrents([]string{hash})
if err != nil {
log.Error().Err(err).Msgf("qBittorrent - could not get re-announce torrent: %v", hash)
return err
}
attempts++
// add delay for next run
time.Sleep(ReannounceInterval * time.Millisecond)
continue
}
// add extra delay before delete
// TODO add setting: delete on failure to reannounce
time.Sleep(30 * time.Second)
if !announceOK {

6
internal/action/run.go
View file

@ -92,7 +92,8 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
return err
}
if !canDownload {
rejections = []string{"deluge busy"}
rejections = []string{"max active downloads reached, skipping"}
break
}
if release.TorrentTmpFile == "" {
@ -120,7 +121,8 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
return err
}
if !canDownload {
rejections = []string{"qBittorrent busy"}
rejections = []string{"max active downloads reached, skipping"}
break
}
if release.TorrentTmpFile == "" {