Implementing a streaming setup with Usenet

pkg/qbit/context.go

@@ -3,12 +3,11 @@ package qbit
 import (
 	"context"
 	"encoding/base64"
-	"fmt"
 	"github.com/go-chi/chi/v5"
+	"github.com/sirrobot01/decypharr/internal/utils"
 	"github.com/sirrobot01/decypharr/pkg/arr"
 	"github.com/sirrobot01/decypharr/pkg/store"
 	"net/http"
-	"net/url"
 	"strings"
 )
 
@@ -20,45 +19,6 @@ const (
 	arrKey      contextKey = "arr"
 )
 
-func validateServiceURL(urlStr string) error {
-	if urlStr == "" {
-		return fmt.Errorf("URL cannot be empty")
-	}
-
-	// Try parsing as full URL first
-	u, err := url.Parse(urlStr)
-	if err == nil && u.Scheme != "" && u.Host != "" {
-		// It's a full URL, validate scheme
-		if u.Scheme != "http" && u.Scheme != "https" {
-			return fmt.Errorf("URL scheme must be http or https")
-		}
-		return nil
-	}
-
-	// Check if it's a host:port format (no scheme)
-	if strings.Contains(urlStr, ":") && !strings.Contains(urlStr, "://") {
-		// Try parsing with http:// prefix
-		testURL := "http://" + urlStr
-		u, err := url.Parse(testURL)
-		if err != nil {
-			return fmt.Errorf("invalid host:port format: %w", err)
-		}
-
-		if u.Host == "" {
-			return fmt.Errorf("host is required in host:port format")
-		}
-
-		// Validate port number
-		if u.Port() == "" {
-			return fmt.Errorf("port is required in host:port format")
-		}
-
-		return nil
-	}
-
-	return fmt.Errorf("invalid URL format: %s", urlStr)
-}
-
 func getCategory(ctx context.Context) string {
 	if category, ok := ctx.Value(categoryKey).(string); ok {
 		return category
@@ -146,7 +106,7 @@ func (q *QBit) authContext(next http.Handler) http.Handler {
 			}
 		}
 		a.Source = "auto"
-		if err := validateServiceURL(a.Host); err != nil {
+		if err := utils.ValidateServiceURL(a.Host); err != nil {
 			// Return silently, no need to raise a problem. Just do not add the Arr to the context/config.json
 			next.ServeHTTP(w, r)
 			return

pkg/qbit/qbit.go

@@ -18,13 +18,16 @@ type QBit struct {
 }
 
 func New() *QBit {
-	_cfg := config.Get()
-	cfg := _cfg.QBitTorrent
+	cfg := config.Get()
+	qbitCfg := cfg.QBitTorrent
+	if qbitCfg == nil {
+		return nil
+	}
 	return &QBit{
-		Username:       cfg.Username,
-		Password:       cfg.Password,
-		DownloadFolder: cfg.DownloadFolder,
-		Categories:     cfg.Categories,
+		Username:       qbitCfg.Username,
+		Password:       qbitCfg.Password,
+		DownloadFolder: qbitCfg.DownloadFolder,
+		Categories:     qbitCfg.Categories,
 		storage:        store.Get().Torrents(),
 		logger:         logger.New("qbit"),
 	}