Fixes:

- Add support for multiple api keys
- Fix minor bugs, removes goroutine mem leaks

pkg/arr/arr.go

@@ -2,13 +2,13 @@ package arr
 
 import (
 	"bytes"
-	"crypto/tls"
 	"fmt"
 	"github.com/goccy/go-json"
 	"github.com/sirrobot01/debrid-blackhole/internal/config"
 	"github.com/sirrobot01/debrid-blackhole/internal/request"
 	"io"
 	"net/http"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -32,7 +32,7 @@ type Arr struct {
 	Cleanup          bool   `json:"cleanup"`
 	SkipRepair       bool   `json:"skip_repair"`
 	DownloadUncached *bool  `json:"download_uncached"`
-	client           *http.Client
+	client           *request.Client
 }
 
 func New(name, host, token string, cleanup, skipRepair bool, downloadUncached *bool) *Arr {
@@ -44,12 +44,7 @@ func New(name, host, token string, cleanup, skipRepair bool, downloadUncached *b
 		Cleanup:          cleanup,
 		SkipRepair:       skipRepair,
 		DownloadUncached: downloadUncached,
-		client: &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-				Proxy:           http.ProxyFromEnvironment,
-			},
-		},
+		client:           request.New(),
 	}
 }
 
@@ -77,12 +72,7 @@ func (a *Arr) Request(method, endpoint string, payload interface{}) (*http.Respo
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-Api-Key", a.Token)
 	if a.client == nil {
-		a.client = &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-				Proxy:           http.ProxyFromEnvironment,
-			},
-		}
+		a.client = request.New()
 	}
 
 	var resp *http.Response
@@ -179,3 +169,21 @@ func (as *Storage) GetAll() []*Arr {
 	}
 	return arrs
 }
+
+func (a *Arr) Refresh() error {
+	payload := struct {
+		Name string `json:"name"`
+	}{
+		Name: "RefreshMonitoredDownloads",
+	}
+
+	resp, err := a.Request(http.MethodPost, "api/v3/command", payload)
+	if err == nil && resp != nil {
+		statusOk := strconv.Itoa(resp.StatusCode)[0] == '2'
+		if statusOk {
+			return nil
+		}
+	}
+
+	return fmt.Errorf("failed to refresh: %v", err)
+}

pkg/arr/content.go

@@ -61,28 +61,34 @@ func (a *Arr) GetMedia(mediaId string) ([]Content, error) {
 		if err != nil {
 			continue
 		}
-		defer resp.Body.Close()
+		var ct Content
 		var seriesFiles []seriesFile
-		if err = json.NewDecoder(resp.Body).Decode(&seriesFiles); err != nil {
-			continue
-		}
-		ct := Content{
-			Title: d.Title,
-			Id:    d.Id,
-		}
+		episodeFileIDMap := make(map[int]int)
+		func() {
+			defer resp.Body.Close()
+			if err = json.NewDecoder(resp.Body).Decode(&seriesFiles); err != nil {
+				return
+			}
+			ct = Content{
+				Title: d.Title,
+				Id:    d.Id,
+			}
+		}()
 		resp, err = a.Request(http.MethodGet, fmt.Sprintf("api/v3/episode?seriesId=%d", d.Id), nil)
 		if err != nil {
 			continue
 		}
-		defer resp.Body.Close()
-		var episodes []episode
-		if err = json.NewDecoder(resp.Body).Decode(&episodes); err != nil {
-			continue
-		}
-		episodeFileIDMap := make(map[int]int)
-		for _, e := range episodes {
-			episodeFileIDMap[e.EpisodeFileID] = e.Id
-		}
+		func() {
+			defer resp.Body.Close()
+			var episodes []episode
+			if err = json.NewDecoder(resp.Body).Decode(&episodes); err != nil {
+				return
+			}
+
+			for _, e := range episodes {
+				episodeFileIDMap[e.EpisodeFileID] = e.Id
+			}
+		}()
 		files := make([]ContentFile, 0)
 		for _, file := range seriesFiles {
 			eId, ok := episodeFileIDMap[file.Id]
@@ -128,15 +134,16 @@ func GetMovies(a *Arr, tvId string) ([]Content, error) {
 	}
 	contents := make([]Content, 0)
 	for _, movie := range movies {
+		if movie.MovieFile.Id == 0 || movie.MovieFile.Path == "" {
+			// Skip movies without files
+			continue
+		}
 		ct := Content{
 			Title: movie.Title,
 			Id:    movie.Id,
 		}
 		files := make([]ContentFile, 0)
-		if movie.MovieFile.Id == 0 || movie.MovieFile.Path == "" {
-			// Skip movies without files
-			continue
-		}
+
 		files = append(files, ContentFile{
 			FileId: movie.MovieFile.Id,
 			Id:     movie.Id,

pkg/arr/refresh.go

@@ -1,25 +0,0 @@
-package arr
-
-import (
-	"fmt"
-	"net/http"
-	"strconv"
-)
-
-func (a *Arr) Refresh() error {
-	payload := struct {
-		Name string `json:"name"`
-	}{
-		Name: "RefreshMonitoredDownloads",
-	}
-
-	resp, err := a.Request(http.MethodPost, "api/v3/command", payload)
-	if err == nil && resp != nil {
-		statusOk := strconv.Itoa(resp.StatusCode)[0] == '2'
-		if statusOk {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("failed to refresh: %v", err)
-}

pkg/arr/tmdb.go

@@ -1,31 +0,0 @@
-package arr
-
-import (
-	"github.com/goccy/go-json"
-	"net/http"
-	url2 "net/url"
-)
-
-type TMDBResponse struct {
-	Page    int `json:"page"`
-	Results []struct {
-		ID         int    `json:"id"`
-		Name       string `json:"name"`
-		MediaType  string `json:"media_type"`
-		PosterPath string `json:"poster_path"`
-	} `json:"results"`
-}
-
-func SearchTMDB(term string) (*TMDBResponse, error) {
-	resp, err := http.Get("https://api.themoviedb.org/3/search/multi?api_key=key&query=" + url2.QueryEscape(term))
-	if err != nil {
-		return nil, err
-	}
-
-	var data *TMDBResponse
-	if err = json.NewDecoder(resp.Body).Decode(&data); err != nil {
-		return nil, err
-	}
-
-	return data, nil
-}

pkg/arr/utils.go

@@ -1,5 +0,0 @@
-package arr
-
-func Readfile(path string) error {
-	return nil
-}