mirror of
https://github.com/idanoo/autobrr
synced 2025-07-23 08:49:13 +00:00
feat(clients): add whisparr (#218)
* feat(clients): add whisparr * feat: add client connection test
This commit is contained in:
parent
2f358473f3
commit
9d0ab6ea52
11 changed files with 338 additions and 3 deletions
|
@ -167,6 +167,13 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case domain.ActionTypeWhisparr:
|
||||||
|
rejections, err = s.whisparr(release, action)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msg("error sending torrent to whisparr")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
log.Warn().Msgf("unsupported action: %v type: %v", action.Name, action.Type)
|
log.Warn().Msgf("unsupported action: %v type: %v", action.Name, action.Type)
|
||||||
return nil
|
return nil
|
||||||
|
|
70
internal/action/whisparr.go
Normal file
70
internal/action/whisparr.go
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
package action
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/autobrr/autobrr/internal/domain"
|
||||||
|
"github.com/autobrr/autobrr/pkg/whisparr"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (s *service) whisparr(release domain.Release, action domain.Action) ([]string, error) {
|
||||||
|
log.Trace().Msg("action WHISPARR")
|
||||||
|
|
||||||
|
// TODO validate data
|
||||||
|
|
||||||
|
// get client for action
|
||||||
|
client, err := s.clientSvc.FindByID(context.TODO(), action.ClientID)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msgf("whisparr: error finding client: %v", action.ClientID)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// return early if no client found
|
||||||
|
if client == nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// initial config
|
||||||
|
cfg := whisparr.Config{
|
||||||
|
Hostname: client.Host,
|
||||||
|
APIKey: client.Settings.APIKey,
|
||||||
|
}
|
||||||
|
|
||||||
|
// only set basic auth if enabled
|
||||||
|
if client.Settings.Basic.Auth {
|
||||||
|
cfg.BasicAuth = client.Settings.Basic.Auth
|
||||||
|
cfg.Username = client.Settings.Basic.Username
|
||||||
|
cfg.Password = client.Settings.Basic.Password
|
||||||
|
}
|
||||||
|
|
||||||
|
arr := whisparr.New(cfg)
|
||||||
|
|
||||||
|
r := whisparr.Release{
|
||||||
|
Title: release.TorrentName,
|
||||||
|
DownloadUrl: release.TorrentURL,
|
||||||
|
Size: int64(release.Size),
|
||||||
|
Indexer: release.Indexer,
|
||||||
|
DownloadProtocol: "torrent",
|
||||||
|
Protocol: "torrent",
|
||||||
|
PublishDate: time.Now().Format(time.RFC3339),
|
||||||
|
}
|
||||||
|
|
||||||
|
rejections, err := arr.Push(r)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msgf("whisparr: failed to push release: %v", r)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if rejections != nil {
|
||||||
|
log.Debug().Msgf("whisparr: release push rejected: %v, indexer %v to %v reasons: '%v'", r.Title, r.Indexer, client.Host, rejections)
|
||||||
|
|
||||||
|
return rejections, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Debug().Msgf("whisparr: successfully pushed release: %v, indexer %v to %v", r.Title, r.Indexer, client.Host)
|
||||||
|
|
||||||
|
return nil, nil
|
||||||
|
}
|
|
@ -50,4 +50,5 @@ const (
|
||||||
ActionTypeRadarr ActionType = "RADARR"
|
ActionTypeRadarr ActionType = "RADARR"
|
||||||
ActionTypeSonarr ActionType = "SONARR"
|
ActionTypeSonarr ActionType = "SONARR"
|
||||||
ActionTypeLidarr ActionType = "LIDARR"
|
ActionTypeLidarr ActionType = "LIDARR"
|
||||||
|
ActionTypeWhisparr ActionType = "WHISPARR"
|
||||||
)
|
)
|
||||||
|
|
|
@ -53,4 +53,5 @@ const (
|
||||||
DownloadClientTypeRadarr DownloadClientType = "RADARR"
|
DownloadClientTypeRadarr DownloadClientType = "RADARR"
|
||||||
DownloadClientTypeSonarr DownloadClientType = "SONARR"
|
DownloadClientTypeSonarr DownloadClientType = "SONARR"
|
||||||
DownloadClientTypeLidarr DownloadClientType = "LIDARR"
|
DownloadClientTypeLidarr DownloadClientType = "LIDARR"
|
||||||
|
DownloadClientTypeWhisparr DownloadClientType = "WHISPARR"
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
package download_client
|
package download_client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"github.com/autobrr/autobrr/pkg/whisparr"
|
||||||
|
"github.com/pkg/errors"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/autobrr/autobrr/internal/domain"
|
"github.com/autobrr/autobrr/internal/domain"
|
||||||
|
@ -29,9 +31,12 @@ func (s *service) testConnection(client domain.DownloadClient) error {
|
||||||
|
|
||||||
case domain.DownloadClientTypeLidarr:
|
case domain.DownloadClientTypeLidarr:
|
||||||
return s.testLidarrConnection(client)
|
return s.testLidarrConnection(client)
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
case domain.DownloadClientTypeWhisparr:
|
||||||
|
return s.testWhisparrConnection(client)
|
||||||
|
default:
|
||||||
|
return errors.New("unsupported client")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) testQbittorrentConnection(client domain.DownloadClient) error {
|
func (s *service) testQbittorrentConnection(client domain.DownloadClient) error {
|
||||||
|
@ -159,3 +164,23 @@ func (s *service) testLidarrConnection(client domain.DownloadClient) error {
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *service) testWhisparrConnection(client domain.DownloadClient) error {
|
||||||
|
r := whisparr.New(whisparr.Config{
|
||||||
|
Hostname: client.Host,
|
||||||
|
APIKey: client.Settings.APIKey,
|
||||||
|
BasicAuth: client.Settings.Basic.Auth,
|
||||||
|
Username: client.Settings.Basic.Username,
|
||||||
|
Password: client.Settings.Basic.Password,
|
||||||
|
})
|
||||||
|
|
||||||
|
_, err := r.Test()
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msgf("whisparr: connection test failed: %v", client.Host)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Debug().Msgf("test client connection for whisparr: success")
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
87
pkg/whisparr/client.go
Normal file
87
pkg/whisparr/client.go
Normal file
|
@ -0,0 +1,87 @@
|
||||||
|
package whisparr
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (c *client) get(endpoint string) (*http.Response, error) {
|
||||||
|
u, err := url.Parse(c.config.Hostname)
|
||||||
|
u.Path = path.Join(u.Path, "/api/v3/", endpoint)
|
||||||
|
reqUrl := u.String()
|
||||||
|
|
||||||
|
req, err := http.NewRequest(http.MethodGet, reqUrl, http.NoBody)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msgf("whisparr client request error : %v", reqUrl)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.config.BasicAuth {
|
||||||
|
req.SetBasicAuth(c.config.Username, c.config.Password)
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Header.Add("X-Api-Key", c.config.APIKey)
|
||||||
|
req.Header.Set("User-Agent", "autobrr")
|
||||||
|
|
||||||
|
res, err := c.http.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msgf("whisparr client request error : %v", reqUrl)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if res.StatusCode == http.StatusUnauthorized {
|
||||||
|
return nil, errors.New("unauthorized: bad credentials")
|
||||||
|
}
|
||||||
|
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *client) post(endpoint string, data interface{}) (*http.Response, error) {
|
||||||
|
u, err := url.Parse(c.config.Hostname)
|
||||||
|
u.Path = path.Join(u.Path, "/api/v3/", endpoint)
|
||||||
|
reqUrl := u.String()
|
||||||
|
|
||||||
|
jsonData, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msgf("whisparr client could not marshal data: %v", reqUrl)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequest(http.MethodPost, reqUrl, bytes.NewBuffer(jsonData))
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msgf("whisparr client request error: %v", reqUrl)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.config.BasicAuth {
|
||||||
|
req.SetBasicAuth(c.config.Username, c.config.Password)
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Header.Add("X-Api-Key", c.config.APIKey)
|
||||||
|
req.Header.Set("Content-Type", "application/json; charset=UTF-8")
|
||||||
|
req.Header.Set("User-Agent", "autobrr")
|
||||||
|
|
||||||
|
res, err := c.http.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msgf("whisparr client request error: %v", reqUrl)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// validate response
|
||||||
|
if res.StatusCode == http.StatusUnauthorized {
|
||||||
|
log.Error().Err(err).Msgf("whisparr client bad request: %v", reqUrl)
|
||||||
|
return nil, errors.New("unauthorized: bad credentials")
|
||||||
|
} else if res.StatusCode != http.StatusOK {
|
||||||
|
log.Error().Err(err).Msgf("whisparr client request error: %v", reqUrl)
|
||||||
|
return nil, errors.New("whisparr: bad request")
|
||||||
|
}
|
||||||
|
|
||||||
|
// return raw response and let the caller handle json unmarshal of body
|
||||||
|
return res, nil
|
||||||
|
}
|
133
pkg/whisparr/whisparr.go
Normal file
133
pkg/whisparr/whisparr.go
Normal file
|
@ -0,0 +1,133 @@
|
||||||
|
package whisparr
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
Hostname string
|
||||||
|
APIKey string
|
||||||
|
|
||||||
|
// basic auth username and password
|
||||||
|
BasicAuth bool
|
||||||
|
Username string
|
||||||
|
Password string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Client interface {
|
||||||
|
Test() (*SystemStatusResponse, error)
|
||||||
|
Push(release Release) ([]string, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type client struct {
|
||||||
|
config Config
|
||||||
|
http *http.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(config Config) Client {
|
||||||
|
|
||||||
|
httpClient := &http.Client{
|
||||||
|
Timeout: time.Second * 10,
|
||||||
|
}
|
||||||
|
|
||||||
|
c := &client{
|
||||||
|
config: config,
|
||||||
|
http: httpClient,
|
||||||
|
}
|
||||||
|
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
type Release struct {
|
||||||
|
Title string `json:"title"`
|
||||||
|
DownloadUrl string `json:"downloadUrl"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
Indexer string `json:"indexer"`
|
||||||
|
DownloadProtocol string `json:"downloadProtocol"`
|
||||||
|
Protocol string `json:"protocol"`
|
||||||
|
PublishDate string `json:"publishDate"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type PushResponse struct {
|
||||||
|
Approved bool `json:"approved"`
|
||||||
|
Rejected bool `json:"rejected"`
|
||||||
|
TempRejected bool `json:"temporarilyRejected"`
|
||||||
|
Rejections []string `json:"rejections"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SystemStatusResponse struct {
|
||||||
|
Version string `json:"version"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *client) Test() (*SystemStatusResponse, error) {
|
||||||
|
res, err := c.get("system/status")
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msg("whisparr client get error")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
defer res.Body.Close()
|
||||||
|
|
||||||
|
body, err := io.ReadAll(res.Body)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msg("whisparr client error reading body")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
response := SystemStatusResponse{}
|
||||||
|
err = json.Unmarshal(body, &response)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msg("whisparr client error json unmarshal")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Trace().Msgf("whisparr system/status response: %+v", response)
|
||||||
|
|
||||||
|
return &response, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *client) Push(release Release) ([]string, error) {
|
||||||
|
res, err := c.post("release/push", release)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msg("whisparr client post error")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if res == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
defer res.Body.Close()
|
||||||
|
|
||||||
|
body, err := io.ReadAll(res.Body)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msg("whisparr client error reading body")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
pushResponse := make([]PushResponse, 0)
|
||||||
|
err = json.Unmarshal(body, &pushResponse)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Stack().Err(err).Msg("whisparr client error json unmarshal")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Trace().Msgf("whisparr release/push response body: %+v", string(body))
|
||||||
|
|
||||||
|
// log and return if rejected
|
||||||
|
if pushResponse[0].Rejected {
|
||||||
|
rejections := strings.Join(pushResponse[0].Rejections, ", ")
|
||||||
|
|
||||||
|
log.Trace().Msgf("whisparr push rejected: %s - reasons: %q", release.Title, rejections)
|
||||||
|
return pushResponse[0].Rejections, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// success true
|
||||||
|
return nil, nil
|
||||||
|
}
|
|
@ -177,6 +177,11 @@ export const DownloadClientTypeOptions: RadioFieldsetOption[] = [
|
||||||
description: "Send to Lidarr and let it decide",
|
description: "Send to Lidarr and let it decide",
|
||||||
value: "LIDARR"
|
value: "LIDARR"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: "Whisparr",
|
||||||
|
description: "Send to Whisparr and let it decide",
|
||||||
|
value: "WHISPARR"
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
export const DownloadClientTypeNameMap: Record<DownloadClientType | string, string> = {
|
export const DownloadClientTypeNameMap: Record<DownloadClientType | string, string> = {
|
||||||
|
@ -186,6 +191,7 @@ export const DownloadClientTypeNameMap: Record<DownloadClientType | string, stri
|
||||||
"RADARR": "Radarr",
|
"RADARR": "Radarr",
|
||||||
"SONARR": "Sonarr",
|
"SONARR": "Sonarr",
|
||||||
"LIDARR": "Lidarr",
|
"LIDARR": "Lidarr",
|
||||||
|
"WHISPARR": "Whisparr",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const ActionTypeOptions: RadioFieldsetOption[] = [
|
export const ActionTypeOptions: RadioFieldsetOption[] = [
|
||||||
|
@ -199,6 +205,7 @@ export const ActionTypeOptions: RadioFieldsetOption[] = [
|
||||||
{label: "Radarr", description: "Send to Radarr and let it decide", value: "RADARR"},
|
{label: "Radarr", description: "Send to Radarr and let it decide", value: "RADARR"},
|
||||||
{label: "Sonarr", description: "Send to Sonarr and let it decide", value: "SONARR"},
|
{label: "Sonarr", description: "Send to Sonarr and let it decide", value: "SONARR"},
|
||||||
{label: "Lidarr", description: "Send to Lidarr and let it decide", value: "LIDARR"},
|
{label: "Lidarr", description: "Send to Lidarr and let it decide", value: "LIDARR"},
|
||||||
|
{label: "Whisparr", description: "Send to Whisparr and let it decide", value: "WHISPARR"},
|
||||||
];
|
];
|
||||||
|
|
||||||
export const ActionTypeNameMap = {
|
export const ActionTypeNameMap = {
|
||||||
|
@ -212,6 +219,7 @@ export const ActionTypeNameMap = {
|
||||||
"RADARR": "Radarr",
|
"RADARR": "Radarr",
|
||||||
"SONARR": "Sonarr",
|
"SONARR": "Sonarr",
|
||||||
"LIDARR": "Lidarr",
|
"LIDARR": "Lidarr",
|
||||||
|
"WHISPARR": "Whisparr",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const PushStatusOptions: any[] = [
|
export const PushStatusOptions: any[] = [
|
||||||
|
|
|
@ -103,6 +103,7 @@ export const componentMap: any = {
|
||||||
RADARR: <FormFieldsArr />,
|
RADARR: <FormFieldsArr />,
|
||||||
SONARR: <FormFieldsArr />,
|
SONARR: <FormFieldsArr />,
|
||||||
LIDARR: <FormFieldsArr />,
|
LIDARR: <FormFieldsArr />,
|
||||||
|
WHISPARR: <FormFieldsArr />,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -849,6 +849,7 @@ function FilterActionsItem({ action, clients, idx, remove }: FilterActionsItemPr
|
||||||
case "RADARR":
|
case "RADARR":
|
||||||
case "SONARR":
|
case "SONARR":
|
||||||
case "LIDARR":
|
case "LIDARR":
|
||||||
|
case "WHISPARR":
|
||||||
return (
|
return (
|
||||||
<div className="mt-6 grid grid-cols-12 gap-6">
|
<div className="mt-6 grid grid-cols-12 gap-6">
|
||||||
<DownloadClientSelect
|
<DownloadClientSelect
|
||||||
|
|
3
web/src/types/Download.d.ts
vendored
3
web/src/types/Download.d.ts
vendored
|
@ -4,7 +4,8 @@ type DownloadClientType =
|
||||||
'DELUGE_V2' |
|
'DELUGE_V2' |
|
||||||
'RADARR' |
|
'RADARR' |
|
||||||
'SONARR' |
|
'SONARR' |
|
||||||
'LIDARR';
|
'LIDARR' |
|
||||||
|
'WHISPARR';
|
||||||
|
|
||||||
interface DownloadClientRules {
|
interface DownloadClientRules {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue