From 16dd8c5419bfec5643bc1fb5a89b75ae6c59e51c Mon Sep 17 00:00:00 2001
From: ze0s <43699394+zze0s@users.noreply.github.com>
Date: Sat, 23 Jul 2022 14:11:24 +0200
Subject: [PATCH] fix(actions): deluge v2 download file and check rules (#369)

---
 internal/action/deluge.go | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/internal/action/deluge.go b/internal/action/deluge.go
index 3ef8bdb..d19e75a 100644
--- a/internal/action/deluge.go
+++ b/internal/action/deluge.go
@@ -117,8 +117,7 @@ func (s *service) delugeV1(client *domain.DownloadClient, action domain.Action,
 	}
 
 	if release.TorrentTmpFile == "" {
-		err = release.DownloadTorrentFile()
-		if err != nil {
+		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
 		}
@@ -196,6 +195,23 @@ func (s *service) delugeV2(client *domain.DownloadClient, action domain.Action,
 
 	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)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not read torrent file: %v", release.TorrentTmpFile)