Switch NZB handling from JSON to XML parsing

Replaced JSON with XML for NZB search requests and response parsing to align with updated data format. Removed redundant JSON-specific query parameters and added debug logging for deletion actions.
amaumene · Jan 16, 2025 · baf8872 · baf8872
1 parent ed50775
commit baf8872
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/clean_watched.go b/src/clean_watched.go
@@ -61,5 +61,6 @@ func (app App) removeMedia(IMDB string) error {
 	if err != nil {
 		return fmt.Errorf("deleting database entry for %s: %v", IMDB, err)
 	}
+	fmt.Printf("Deleted %s\n", media.File)
 	return nil
 }
diff --git a/src/newsnab/newsnab.go b/src/newsnab/newsnab.go
@@ -8,7 +8,7 @@ import (
 
 func SearchTVShow(TVDB int64, showSeason int64, showEpisode int64, newsNabHost string, newsNabApiKey string) (string, error) {
 	// Construct the URL with the provided arguments
-	url := fmt.Sprintf("https://%s/api?apikey=%s&t=tvsearch&tvdbid=%d&season=%d&ep=%d&o=json", newsNabHost, newsNabApiKey, TVDB, showSeason, showEpisode)
+	url := fmt.Sprintf("https://%s/api?apikey=%s&t=tvsearch&tvdbid=%d&season=%d&ep=%d", newsNabHost, newsNabApiKey, TVDB, showSeason, showEpisode)
 	// Make the HTTP GET request
 	resp, err := http.Get(url)
 	if err != nil {
@@ -37,7 +37,8 @@ func SearchMovie(IMDB string, newsNabHost string, newsNabApiKey string) (string,
 		return "", fmt.Errorf("invalid IMDB ID")
 	}
 	// Construct the URL with the provided arguments
-	url := fmt.Sprintf("https://%s/api?apikey=%s&t=movie&imdbid=%s&o=json", newsNabHost, newsNabApiKey, IMDB)
+	url := fmt.Sprintf("https://%s/api?apikey=%s&t=movie&imdbid=%s", newsNabHost, newsNabApiKey, IMDB)
+	fmt.Println(url)
 	// Make the HTTP GET request
 	resp, err := http.Get(url)
 	if err != nil {

diff --git a/src/nzb.go b/src/nzb.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"encoding/xml"
 	"fmt"
 	"github.com/amaumene/momenarr/bolthold"
 	"github.com/amaumene/momenarr/newsnab"
@@ -47,22 +47,22 @@ func (app App) getNzbFromDB(IMDB string) (NZB, error) {
 func (app App) searchNZB(media Media) (newsnab.Feed, error) {
 	var feed newsnab.Feed
 	if media.Number > 0 && media.Season > 0 {
-		jsonResponse, err := newsnab.SearchTVShow(media.TVDB, media.Season, media.Number, app.Config.NewsNabHost, app.Config.NewsNabApiKey)
+		xmlResponse, err := newsnab.SearchTVShow(media.TVDB, media.Season, media.Number, app.Config.NewsNabHost, app.Config.NewsNabApiKey)
 		if err != nil {
 			return feed, fmt.Errorf("searching NZB for episode: %v", err)
 		}
-		err = json.Unmarshal([]byte(jsonResponse), &feed)
+		err = xml.Unmarshal([]byte(xmlResponse), &feed)
 		if err != nil {
-			return feed, fmt.Errorf("unmarshalling JSON NZB episode: %v", err)
+			return feed, fmt.Errorf("unmarshalling XML NZB episode: %v", err)
 		}
 	} else {
-		jsonResponse, err := newsnab.SearchMovie(media.IMDB, app.Config.NewsNabHost, app.Config.NewsNabApiKey)
+		xmlResponse, err := newsnab.SearchMovie(media.IMDB, app.Config.NewsNabHost, app.Config.NewsNabApiKey)
 		if err != nil {
 			return feed, fmt.Errorf("searching NZB for movie: %v", err)
 		}
-		err = json.Unmarshal([]byte(jsonResponse), &feed)
+		err = xml.Unmarshal([]byte(xmlResponse), &feed)
 		if err != nil {
-			return feed, fmt.Errorf("unmarshalling JSON NZB movie: %v", err)
+			return feed, fmt.Errorf("unmarshalling XML NZB movie: %v", err)
 		}
 	}
 	return feed, nil