fix(actions): deluge v2 download file and check rules (#369)

This commit is contained in:
ze0s 2022-07-23 14:11:24 +02:00 committed by GitHub
parent 497140a6c4
commit 16dd8c5419
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -117,8 +117,7 @@ func (s *service) delugeV1(client *domain.DownloadClient, action domain.Action,
} }
if release.TorrentTmpFile == "" { if release.TorrentTmpFile == "" {
err = release.DownloadTorrentFile() if err = release.DownloadTorrentFile(); err != nil {
if err != nil {
s.log.Error().Err(err).Msgf("could not download torrent file for release: %v", release.TorrentName) s.log.Error().Err(err).Msgf("could not download torrent file for release: %v", release.TorrentName)
return nil, err return nil, err
} }
@ -196,6 +195,23 @@ func (s *service) delugeV2(client *domain.DownloadClient, action domain.Action,
defer deluge.Close() defer deluge.Close()
// perform connection to Deluge server
rejections, err := s.delugeCheckRulesCanDownload(deluge, client, action)
if err != nil {
s.log.Error().Err(err).Msgf("error checking client rules: %v", action.Name)
return nil, err
}
if rejections != nil {
return rejections, nil
}
if release.TorrentTmpFile == "" {
if err = release.DownloadTorrentFile(); err != nil {
s.log.Error().Err(err).Msgf("could not download torrent file for release: %v", release.TorrentName)
return nil, err
}
}
t, err := ioutil.ReadFile(release.TorrentTmpFile) t, err := ioutil.ReadFile(release.TorrentTmpFile)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "could not read torrent file: %v", release.TorrentTmpFile) return nil, errors.Wrap(err, "could not read torrent file: %v", release.TorrentTmpFile)