Changelog 0.5.0

internal/config/config.go

@@ -52,11 +52,11 @@ type Arr struct {
 }
 
 type Repair struct {
-	Enabled      bool   `json:"enabled"`
-	Interval     string `json:"interval"`
-	RunOnStart   bool   `json:"run_on_start"`
-	ZurgURL      string `json:"zurg_url"`
-	SkipDeletion bool   `json:"skip_deletion"`
+	Enabled     bool   `json:"enabled"`
+	Interval    string `json:"interval"`
+	RunOnStart  bool   `json:"run_on_start"`
+	ZurgURL     string `json:"zurg_url"`
+	AutoProcess bool   `json:"auto_process"`
 }
 
 type Auth struct {
@@ -65,20 +65,21 @@ type Auth struct {
 }
 
 type Config struct {
-	LogLevel     string      `json:"log_level"`
-	Debrid       Debrid      `json:"debrid"`
-	Debrids      []Debrid    `json:"debrids"`
-	Proxy        Proxy       `json:"proxy"`
-	MaxCacheSize int         `json:"max_cache_size"`
-	QBitTorrent  QBitTorrent `json:"qbittorrent"`
-	Arrs         []Arr       `json:"arrs"`
-	Repair       Repair      `json:"repair"`
-	AllowedExt   []string    `json:"allowed_file_types"`
-	MinFileSize  string      `json:"min_file_size"` // Minimum file size to download, 10MB, 1GB, etc
-	MaxFileSize  string      `json:"max_file_size"` // Maximum file size to download (0 means no limit)
-	Path         string      `json:"-"`             // Path to save the config file
-	UseAuth      bool        `json:"use_auth"`
-	Auth         *Auth       `json:"-"`
+	LogLevel       string      `json:"log_level"`
+	Debrid         Debrid      `json:"debrid"`
+	Debrids        []Debrid    `json:"debrids"`
+	Proxy          Proxy       `json:"proxy"`
+	MaxCacheSize   int         `json:"max_cache_size"`
+	QBitTorrent    QBitTorrent `json:"qbittorrent"`
+	Arrs           []Arr       `json:"arrs"`
+	Repair         Repair      `json:"repair"`
+	AllowedExt     []string    `json:"allowed_file_types"`
+	MinFileSize    string      `json:"min_file_size"` // Minimum file size to download, 10MB, 1GB, etc
+	MaxFileSize    string      `json:"max_file_size"` // Maximum file size to download (0 means no limit)
+	Path           string      `json:"-"`             // Path to save the config file
+	UseAuth        bool        `json:"use_auth"`
+	Auth           *Auth       `json:"-"`
+	DiscordWebhook string      `json:"discord_webhook_url"`
 }
 
 func (c *Config) JsonFile() string {
@@ -207,10 +208,7 @@ func GetConfig() *Config {
 	once.Do(func() {
 		instance = &Config{} // Initialize instance first
 		if err := instance.loadConfig(); err != nil {
-			_, err := fmt.Fprintf(os.Stderr, "configuration Error: %v\n", err)
-			if err != nil {
-				return
-			}
+			fmt.Fprintf(os.Stderr, "configuration Error: %v\n", err)
 			os.Exit(1)
 		}
 	})

internal/logger/logger.go

@@ -85,9 +85,10 @@ func NewLogger(prefix string, level string, output *os.File) zerolog.Logger {
 	return logger
 }
 
-func GetLogger(level string) zerolog.Logger {
+func GetDefaultLogger() zerolog.Logger {
 	once.Do(func() {
-		logger = NewLogger("decypharr", level, os.Stdout)
+		cfg := config.GetConfig()
+		logger = NewLogger("decypharr", cfg.LogLevel, os.Stdout)
 	})
 	return logger
 }

internal/request/discord.go

@@ -0,0 +1,100 @@
+package request
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"github.com/sirrobot01/debrid-blackhole/internal/config"
+	"io"
+	"net/http"
+	"strings"
+)
+
+type DiscordEmbed struct {
+	Title       string `json:"title"`
+	Description string `json:"description"`
+	Color       int    `json:"color"`
+}
+
+type DiscordWebhook struct {
+	Embeds []DiscordEmbed `json:"embeds"`
+}
+
+func getDiscordColor(status string) int {
+	switch status {
+	case "success":
+		return 3066993
+	case "error":
+		return 15158332
+	case "warning":
+		return 15844367
+	case "pending":
+		return 3447003
+	default:
+		return 0
+	}
+}
+
+func getDiscordHeader(event string) string {
+	switch event {
+	case "download_complete":
+		return "[Decypharr] Download Completed"
+	case "download_failed":
+		return "[Decypharr] Download Failed"
+	case "repair_pending":
+		return "[Decypharr] Repair Completed, Awaiting action"
+	case "repair_complete":
+		return "[Decypharr] Repair Complete"
+	default:
+		// split the event string and capitalize the first letter of each word
+		evs := strings.Split(event, "_")
+		for i, ev := range evs {
+			evs[i] = strings.ToTitle(ev)
+		}
+		return "[Decypharr] %s" + strings.Join(evs, " ")
+	}
+}
+
+func SendDiscordMessage(event string, status string, message string) error {
+	cfg := config.GetConfig()
+	webhookURL := cfg.DiscordWebhook
+	if webhookURL == "" {
+		return nil
+	}
+
+	// Create the proper Discord webhook structure
+
+	webhook := DiscordWebhook{
+		Embeds: []DiscordEmbed{
+			{
+				Title:       getDiscordHeader(event),
+				Description: message,
+				Color:       getDiscordColor(status),
+			},
+		},
+	}
+
+	payload, err := json.Marshal(webhook)
+	if err != nil {
+		return fmt.Errorf("failed to marshal discord payload: %v", err)
+	}
+
+	req, err := http.NewRequest(http.MethodPost, webhookURL, bytes.NewReader(payload))
+	if err != nil {
+		return fmt.Errorf("failed to create discord request: %v", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to send discord message: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		bodyBytes, _ := io.ReadAll(resp.Body)
+		return fmt.Errorf("discord returned error status code: %s, body: %s", resp.Status, string(bodyBytes))
+	}
+
+	return nil
+}

internal/request/request.go

@@ -119,14 +119,17 @@ func (c *RLHTTPClient) MakeRequest(req *http.Request) ([]byte, error) {
 func NewRLHTTPClient(rl *rate.Limiter, headers map[string]string) *RLHTTPClient {
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		Proxy:           http.ProxyFromEnvironment,
 	}
 	c := &RLHTTPClient{
 		client: &http.Client{
 			Transport: tr,
 		},
-		Ratelimiter: rl,
-		Headers:     headers,
+	}
+	if rl != nil {
+		c.Ratelimiter = rl
+	}
+	if headers != nil {
+		c.Headers = headers
 	}
 	return c
 }