Merge pull request #55 from sgerner/codex/abb-download-flow

resolve ABB downloads end to end

Author: JeremiahM37

internal/api/download.go

@@ -1,12 +1,16 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
+	neturl "net/url"
 	"strings"
+	"time"
 
 	"github.com/JeremiahM37/librarr/internal/models"
+	"github.com/JeremiahM37/librarr/internal/search"
 )
 
 func (s *Server) handleDownload(w http.ResponseWriter, r *http.Request) {
@@ -27,6 +31,21 @@ func (s *Server) handleDownload(w http.ResponseWriter, r *http.Request) {
 	s.db.LogActivity(username, "download_start", req.Title, fmt.Sprintf("Download started from %s", req.Source))
 
 	source := s.searchMgr.GetSource(req.Source)
+	if req.MediaType == "" {
+		if source != nil {
+			switch source.SearchTab() {
+			case "audiobook", "manga":
+				req.MediaType = source.SearchTab()
+			}
+		} else {
+			switch req.Source {
+			case "audiobook":
+				req.MediaType = "audiobook"
+			case "prowlarr_manga":
+				req.MediaType = "manga"
+			}
+		}
+	}
 
 	// Determine download type.
 	downloadType := "direct"
@@ -44,13 +63,13 @@ func (s *Server) handleDownload(w http.ResponseWriter, r *http.Request) {
 
 	switch downloadType {
 	case "torrent":
-		s.handleTorrentDownload(w, req)
+		s.handleTorrentDownload(w, r, req)
 	default:
 		s.handleDirectDownloadReq(w, req)
 	}
 }
 
-func (s *Server) handleTorrentDownload(w http.ResponseWriter, req models.DownloadRequest) {
+func (s *Server) handleTorrentDownload(w http.ResponseWriter, r *http.Request, req models.DownloadRequest) {
 	if !s.cfg.HasQBittorrent() {
 		writeJSON(w, http.StatusBadRequest, map[string]interface{}{
 			"success": false,
@@ -59,7 +78,14 @@ func (s *Server) handleTorrentDownload(w http.ResponseWriter, req models.Downloa
 		return
 	}
 
-	url := resolveTorrentURL(req)
+	url, err := s.resolveTorrentURL(r.Context(), req, models.SearchResult{})
+	if err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]interface{}{
+			"success": false,
+			"error":   fmt.Sprintf("Failed to resolve AudioBookBay download: %v", err),
+		})
+		return
+	}
 	if url == "" {
 		writeJSON(w, http.StatusBadRequest, map[string]interface{}{
 			"success": false,
@@ -90,7 +116,7 @@ func (s *Server) handleTorrentDownload(w http.ResponseWriter, req models.Downloa
 		category = s.cfg.QBMangaCategory
 	}
 
-	err := s.downloadMgr.StartTorrentDownload(url, req.Title, savePath, category)
+	err = s.downloadMgr.StartTorrentDownload(url, req.Title, savePath, category)
 	writeJSON(w, http.StatusOK, map[string]interface{}{
 		"success": err == nil,
 		"title":   req.Title,
@@ -173,7 +199,7 @@ func (s *Server) handleDownloadTorrent(w http.ResponseWriter, r *http.Request) {
 		req.Title = "Unknown"
 	}
 	req.MediaType = "ebook"
-	s.handleTorrentDownload(w, req)
+	s.handleTorrentDownload(w, r, req)
 }
 
 func (s *Server) handleDownloadAnnas(w http.ResponseWriter, r *http.Request) {
@@ -202,7 +228,7 @@ func (s *Server) handleDownloadAudiobook(w http.ResponseWriter, r *http.Request)
 		req.Title = "Unknown"
 	}
 	req.MediaType = "audiobook"
-	s.handleTorrentDownload(w, req)
+	s.handleTorrentDownload(w, r, req)
 }
 
 func (s *Server) handleGetDownloads(w http.ResponseWriter, _ *http.Request) {
@@ -256,22 +282,6 @@ func (s *Server) handleCheckDuplicate(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
-func resolveTorrentURL(req models.DownloadRequest) string {
-	if req.DownloadURL != "" {
-		return req.DownloadURL
-	}
-	if strings.HasPrefix(req.GUID, "magnet:") {
-		return req.GUID
-	}
-	if req.MagnetURL != "" {
-		return req.MagnetURL
-	}
-	if req.InfoHash != "" {
-		return fmt.Sprintf("magnet:?xt=urn:btih:%s", req.InfoHash)
-	}
-	return ""
-}
-
 func extractSourceID(req models.DownloadRequest) string {
 	if req.MD5 != "" {
 		return req.MD5
@@ -288,6 +298,92 @@ func extractSourceID(req models.DownloadRequest) string {
 	return ""
 }
 
+var resolveABBMagnetFn = search.ResolveABBMagnet
+
+func (s *Server) resolveTorrentURL(ctx context.Context, req models.DownloadRequest, chosen models.SearchResult) (string, error) {
+	if req.DownloadURL != "" {
+		return req.DownloadURL, nil
+	}
+	if strings.HasPrefix(req.GUID, "magnet:") {
+		return req.GUID, nil
+	}
+	if req.MagnetURL != "" {
+		return req.MagnetURL, nil
+	}
+	if chosen.MagnetURL != "" {
+		return chosen.MagnetURL, nil
+	}
+	if chosen.DownloadURL != "" {
+		return chosen.DownloadURL, nil
+	}
+	if req.InfoHash != "" {
+		return fmt.Sprintf("magnet:?xt=urn:btih:%s", req.InfoHash), nil
+	}
+
+	abbPath := req.AbbURL
+	if abbPath == "" {
+		abbPath = chosen.AbbURL
+	}
+	if abbPath == "" {
+		return "", nil
+	}
+
+	resolved, err := s.resolveABBMagnet(ctx, abbPath)
+	if err != nil {
+		return "", err
+	}
+	return resolved, nil
+}
+
+func (s *Server) resolveABBMagnet(ctx context.Context, abbURL string) (string, error) {
+	if s.cfg == nil || s.cfg.Sources == nil {
+		return "", fmt.Errorf("AudioBookBay sources not configured")
+	}
+
+	abbPath := normalizeABBPath(abbURL)
+	if abbPath == "" {
+		return "", fmt.Errorf("invalid AudioBookBay URL")
+	}
+
+	client := &http.Client{Timeout: 15 * time.Second}
+	return resolveABBMagnetFn(ctx, client, s.cfg.UserAgent, abbPath, s.cfg.Sources.AudioBookBay.Mirrors, s.cfg.Sources.AudioBookBay.Trackers)
+}
+
+func normalizeABBPath(raw string) string {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return ""
+	}
+	if strings.HasPrefix(raw, "/") {
+		return raw
+	}
+
+	u, err := neturl.Parse(raw)
+	if err != nil {
+		if strings.HasPrefix(raw, "http://") || strings.HasPrefix(raw, "https://") {
+			return ""
+		}
+		return "/" + strings.TrimLeft(raw, "/")
+	}
+	if u.Scheme == "" && u.Host == "" {
+		if strings.HasPrefix(u.Path, "/") {
+			if u.RawQuery != "" {
+				return u.Path + "?" + u.RawQuery
+			}
+			return u.Path
+		}
+		return "/" + strings.TrimLeft(u.Path, "/")
+	}
+	path := u.EscapedPath()
+	if path == "" {
+		path = "/"
+	}
+	if u.RawQuery != "" {
+		path += "?" + u.RawQuery
+	}
+	return path
+}
+
 func errString(err error) string {
 	if err == nil {
 		return ""

internal/api/regressions_test.go

@@ -1,8 +1,14 @@
 package api
 
 import (
+	"context"
+	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/JeremiahM37/librarr/internal/config"
+	"github.com/JeremiahM37/librarr/internal/models"
+	"github.com/JeremiahM37/librarr/internal/sources/sourcestest"
 )
 
 // queryBoundedInt rejects out-of-range and unparseable values, returning fallback.
@@ -33,3 +39,79 @@ func TestQueryBoundedInt(t *testing.T) {
 		})
 	}
 }
+
+func TestResolveTorrentURLUsesABBURL(t *testing.T) {
+	reg, err := sourcestest.Registry()
+	if err != nil {
+		t.Fatalf("load registry: %v", err)
+	}
+	cfg := &config.Config{
+		UserAgent: "test-agent",
+		Sources:   reg,
+	}
+	cfg.Sources.AudioBookBay.Mirrors = []string{"audiobookbay.lu"}
+	cfg.Sources.AudioBookBay.Trackers = []string{"udp://tracker.example:1337/announce"}
+
+	s := &Server{cfg: cfg}
+
+	oldResolve := resolveABBMagnetFn
+	defer func() { resolveABBMagnetFn = oldResolve }()
+
+	called := false
+	resolveABBMagnetFn = func(ctx context.Context, client *http.Client, userAgent, abbPath string, mirrors, fallbackTrackers []string) (string, error) {
+		called = true
+		if userAgent != "test-agent" {
+			t.Fatalf("userAgent = %q, want test-agent", userAgent)
+		}
+		if abbPath != "/abss/the-martian-andy-weir/" {
+			t.Fatalf("abbPath = %q, want /abss/the-martian-andy-weir/", abbPath)
+		}
+		if len(mirrors) != 1 || mirrors[0] != "audiobookbay.lu" {
+			t.Fatalf("mirrors = %#v, want audiobookbay.lu", mirrors)
+		}
+		if len(fallbackTrackers) != 1 || fallbackTrackers[0] != "udp://tracker.example:1337/announce" {
+			t.Fatalf("fallbackTrackers = %#v, want configured tracker", fallbackTrackers)
+		}
+		return "magnet:?xt=urn:btih:0123456789ABCDEF0123456789ABCDEF01234567", nil
+	}
+
+	got, err := s.resolveTorrentURL(context.Background(), models.DownloadRequest{
+		AbbURL: "/abss/the-martian-andy-weir/",
+	}, models.SearchResult{})
+	if err != nil {
+		t.Fatalf("resolveTorrentURL returned error: %v", err)
+	}
+	if !called {
+		t.Fatal("expected ABB resolver to be called")
+	}
+	want := "magnet:?xt=urn:btih:0123456789ABCDEF0123456789ABCDEF01234567"
+	if got != want {
+		t.Fatalf("resolveTorrentURL = %q, want %q", got, want)
+	}
+}
+
+func TestResolveTorrentURLPrefersDirectURL(t *testing.T) {
+	reg, err := sourcestest.Registry()
+	if err != nil {
+		t.Fatalf("load registry: %v", err)
+	}
+	s := &Server{cfg: &config.Config{Sources: reg}}
+
+	oldResolve := resolveABBMagnetFn
+	defer func() { resolveABBMagnetFn = oldResolve }()
+	resolveABBMagnetFn = func(context.Context, *http.Client, string, string, []string, []string) (string, error) {
+		t.Fatal("ABB resolver should not be called when download_url is present")
+		return "", nil
+	}
+
+	got, err := s.resolveTorrentURL(context.Background(), models.DownloadRequest{
+		DownloadURL: "https://example.com/book.torrent",
+		AbbURL:      "/abss/the-martian-andy-weir/",
+	}, models.SearchResult{})
+	if err != nil {
+		t.Fatalf("resolveTorrentURL returned error: %v", err)
+	}
+	if got != "https://example.com/book.torrent" {
+		t.Fatalf("resolveTorrentURL = %q, want direct download URL", got)
+	}
+}

internal/api/requests.go

@@ -506,7 +506,11 @@ func (s *Server) processApprovedRequest(req *models.Request) {
 
 	switch downloadType {
 	case "torrent":
-		url := resolveTorrentURLForRequest(dlReq, chosen)
+		url, err := s.resolveTorrentURL(ctx, dlReq, chosen)
+		if err != nil {
+			s.failRequest(req, fmt.Sprintf("Torrent download failed: %v", err))
+			return
+		}
 		if url == "" {
 			s.failRequest(req, "No torrent download URL available")
 			return
@@ -676,26 +680,6 @@ func scoreResult(r models.SearchResult, bookType string) int {
 	return score
 }
 
-// resolveTorrentURLForRequest resolves the torrent URL from a download request and chosen result.
-func resolveTorrentURLForRequest(dlReq models.DownloadRequest, chosen models.SearchResult) string {
-	if dlReq.DownloadURL != "" {
-		return dlReq.DownloadURL
-	}
-	if dlReq.MagnetURL != "" {
-		return dlReq.MagnetURL
-	}
-	if chosen.MagnetURL != "" {
-		return chosen.MagnetURL
-	}
-	if chosen.DownloadURL != "" {
-		return chosen.DownloadURL
-	}
-	if dlReq.InfoHash != "" {
-		return "magnet:?xt=urn:btih:" + dlReq.InfoHash
-	}
-	return ""
-}
-
 // resolveSavePathAndCategory returns the qBittorrent save path and category for a book type.
 func (s *Server) resolveSavePathAndCategory(bookType string) (string, string) {
 	switch bookType {

web/index.html

@@ -1836,6 +1836,7 @@ <h3 class="text-sm font-semibold text-white line-clamp-2 mb-1" title="${escapeHt
     const body = {
       title: result.title,
       download_url: result.download_url || result.url || '',
+      abb_url: result.abb_url || '',
       source: result.source,
       md5: result.md5 || '',
       author: result.author || '',
@@ -2956,4 +2957,3 @@ <h4 class="text-sm font-medium text-white truncate">${escapeHtml(item.title || '
 </script>
 </body>
 </html>
-