From 2681c2357dc74b5b50be1e61df69c1858849840a Mon Sep 17 00:00:00 2001 From: ze0s <43699394+zze0s@users.noreply.github.com> Date: Thu, 12 Sep 2024 18:42:35 +0200 Subject: [PATCH] fix(download-client): Deluge push error (#1719) fix(downloadclient): Deluge push error --- internal/action/deluge.go | 3 ++- internal/action/lidarr.go | 1 + internal/action/porla.go | 1 + internal/action/qbittorrent.go | 1 + internal/action/radarr.go | 1 + internal/action/readarr.go | 1 + internal/action/rtorrent.go | 1 + internal/action/run.go | 4 ---- internal/action/sabnzbd.go | 1 + internal/action/sonarr.go | 1 + internal/action/transmission.go | 1 + internal/action/whisparr.go | 1 + 12 files changed, 12 insertions(+), 5 deletions(-) diff --git a/internal/action/deluge.go b/internal/action/deluge.go index 77f8961..04c8ba6 100644 --- a/internal/action/deluge.go +++ b/internal/action/deluge.go @@ -23,6 +23,7 @@ func (s *service) deluge(ctx context.Context, action *domain.Action, release dom if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) @@ -30,7 +31,7 @@ func (s *service) deluge(ctx context.Context, action *domain.Action, release dom var rejections []string - switch action.Client.Type { + switch client.Type { case "DELUGE_V1": rejections, err = s.delugeV1(ctx, client, action, release) diff --git a/internal/action/lidarr.go b/internal/action/lidarr.go index 791d6aa..79e8cd2 100644 --- a/internal/action/lidarr.go +++ b/internal/action/lidarr.go @@ -21,6 +21,7 @@ func (s *service) lidarr(ctx context.Context, action *domain.Action, release dom if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/porla.go b/internal/action/porla.go index 6c05a5d..580a6fb 100644 --- a/internal/action/porla.go +++ b/internal/action/porla.go @@ -22,6 +22,7 @@ func (s *service) porla(ctx context.Context, action *domain.Action, release doma if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/qbittorrent.go b/internal/action/qbittorrent.go index 0a233b2..a9f6fe1 100644 --- a/internal/action/qbittorrent.go +++ b/internal/action/qbittorrent.go @@ -21,6 +21,7 @@ func (s *service) qbittorrent(ctx context.Context, action *domain.Action, releas if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/radarr.go b/internal/action/radarr.go index fb0e287..3855a02 100644 --- a/internal/action/radarr.go +++ b/internal/action/radarr.go @@ -21,6 +21,7 @@ func (s *service) radarr(ctx context.Context, action *domain.Action, release dom if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/readarr.go b/internal/action/readarr.go index 8a5c639..10512d9 100644 --- a/internal/action/readarr.go +++ b/internal/action/readarr.go @@ -21,6 +21,7 @@ func (s *service) readarr(ctx context.Context, action *domain.Action, release do if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/rtorrent.go b/internal/action/rtorrent.go index bbb9efc..a60bc79 100644 --- a/internal/action/rtorrent.go +++ b/internal/action/rtorrent.go @@ -20,6 +20,7 @@ func (s *service) rtorrent(ctx context.Context, action *domain.Action, release d if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/run.go b/internal/action/run.go index 9667cd8..51ac6ea 100644 --- a/internal/action/run.go +++ b/internal/action/run.go @@ -32,10 +32,6 @@ func (s *service) RunAction(ctx context.Context, action *domain.Action, release } }() - if action.ClientID > 0 && action.Client != nil && !action.Client.Enabled { - return nil, errors.New("action %s client %s %s not enabled, skipping", action.Name, action.Client.Type, action.Client.Name) - } - // Check preconditions: download torrent file if needed if err := s.CheckActionPreconditions(ctx, action, release); err != nil { return nil, err diff --git a/internal/action/sabnzbd.go b/internal/action/sabnzbd.go index 580722e..d78754a 100644 --- a/internal/action/sabnzbd.go +++ b/internal/action/sabnzbd.go @@ -22,6 +22,7 @@ func (s *service) sabnzbd(ctx context.Context, action *domain.Action, release do if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/sonarr.go b/internal/action/sonarr.go index 3fa77ba..ac62a23 100644 --- a/internal/action/sonarr.go +++ b/internal/action/sonarr.go @@ -21,6 +21,7 @@ func (s *service) sonarr(ctx context.Context, action *domain.Action, release dom if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/transmission.go b/internal/action/transmission.go index 4172232..1d4d8b0 100644 --- a/internal/action/transmission.go +++ b/internal/action/transmission.go @@ -29,6 +29,7 @@ func (s *service) transmission(ctx context.Context, action *domain.Action, relea if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name) diff --git a/internal/action/whisparr.go b/internal/action/whisparr.go index 5110c08..bdfe2cb 100644 --- a/internal/action/whisparr.go +++ b/internal/action/whisparr.go @@ -21,6 +21,7 @@ func (s *service) whisparr(ctx context.Context, action *domain.Action, release d if err != nil { return nil, errors.Wrap(err, "could not get client with id %d", action.ClientID) } + action.Client = client if !client.Enabled { return nil, errors.New("client %s %s not enabled", client.Type, client.Name)