From 85e805bc8b52914701c280a8f2671e9f692c2925 Mon Sep 17 00:00:00 2001
From: Matt Burchett <matt@mattburchett.com>
Date: Tue, 25 May 2021 06:34:08 -0500
Subject: [PATCH] RConverting context vars to be full FQDNs to provide
 compatibility to those not using contexts

---
 config_example.json    | 8 ++++----
 pkg/config/config.go   | 5 ++---
 pkg/eraser/eraser.go   | 2 +-
 pkg/locator/locator.go | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/config_example.json b/config_example.json
index df4eabf..48634a7 100644
--- a/config_example.json
+++ b/config_example.json
@@ -1,6 +1,5 @@
 {
-    "baseURL": "http://dvr.example.com",
-    "plexPyContext": "/plexpy",
+    "plexPyURL": "http://dvr.example.com/plexpy",
     "plexPyAPIKey": "abc1234",
     "plexToken": "ABC1234ABC1234",
     "plexHost": "http://192.168.1.1",
@@ -8,6 +7,7 @@
     "telegramToken": "123456789:ABCDEFG",
     "telegramChatID": "12345678",
     "serverName": "Plex",
-    "sonarrContext": "/tv",
-    "sonarrAPIKey": "abc1234"
+    "sonarrURL": "http://dvr.example.com/tv",
+    "sonarrAPIKey": "abc1234",
+    "excludeList": "A,bravo,char"
 }
\ No newline at end of file
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 500af5e..3fb02d0 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -9,8 +9,7 @@ import (
 
 // Config - This struct will hold configuration components.
 type Config struct {
-	BaseURL        string `json:"baseURL"`
-	PlexPyContext  string `json:"plexPyContext"`
+	PlexPyURL      string `json:"plexPyURL"`
 	PlexPyAPIKey   string `json:"plexPyAPIKey"`
 	PlexToken      string `json:"plexToken"`
 	PlexHost       string `json:"plexHost"`
@@ -18,7 +17,7 @@ type Config struct {
 	TelegramToken  string `json:"telegramToken"`
 	TelegramChatID string `json:"telegramChatID"`
 	ServerName     string `json:"serverName"`
-	SonarrContext  string `json:"sonarrContext"`
+	SonarrURL      string `json:"sonarrURL"`
 	SonarrAPIKey   string `json:"sonarrAPIKey"`
 	ExcludeList    string `json:"excludeList"` // ExcludeList will be checked against any section.
 }
diff --git a/pkg/eraser/eraser.go b/pkg/eraser/eraser.go
index 8841581..3203133 100644
--- a/pkg/eraser/eraser.go
+++ b/pkg/eraser/eraser.go
@@ -95,7 +95,7 @@ func LookupTVFileLocation(config config.Config, ids []int) []string {
 
 func DeleteSeriesFromSonarr(config config.Config, ids []int) {
 	for _, i := range ids {
-		sonarrURL := fmt.Sprintf("%s%s%s%d%s%s", config.BaseURL, config.SonarrContext, "/api/series/", i, "/?deleteFiles=true&apikey=", config.SonarrAPIKey)
+		sonarrURL := fmt.Sprintf("%s%s%s%d%s%s", config.SonarrURL, "/api/series/", i, "/?deleteFiles=true&apikey=", config.SonarrAPIKey)
 		req, err := http.NewRequest(http.MethodDelete, sonarrURL, nil)
 		if err != nil {
 			log.Fatal(err)
diff --git a/pkg/locator/locator.go b/pkg/locator/locator.go
index 45fe7dd..f29d8cd 100644
--- a/pkg/locator/locator.go
+++ b/pkg/locator/locator.go
@@ -56,7 +56,7 @@ func GetLibraryType(config config.Config, sectionID int) string {
 
 // GetCount will gather a count of media in a specific library, required for GetTitles.
 func GetCount(config config.Config, sectionID int) int {
-	countURL := fmt.Sprintf("%s%s%s%s%s%d", config.BaseURL, config.PlexPyContext, "/api/v2?apikey=", config.PlexPyAPIKey, "&cmd=get_library&section_id=", sectionID)
+	countURL := fmt.Sprintf("%s%s%s%s%s%d", config.PlexPyURL, "/api/v2?apikey=", config.PlexPyAPIKey, "&cmd=get_library&section_id=", sectionID)
 	req, err := http.NewRequest(http.MethodGet, countURL, nil)
 	if err != nil {
 		log.Fatal(err)
@@ -90,7 +90,7 @@ func GetCount(config config.Config, sectionID int) int {
 func GetTitles(config config.Config, sectionID int, days int) ([]int, []string) {
 	count := GetCount(config, sectionID)
 
-	titlesURL := fmt.Sprintf("%s%s%s%s%s%d%s%d", config.BaseURL, config.PlexPyContext, "/api/v2?apikey=", config.PlexPyAPIKey, "&cmd=get_library_media_info&section_id=", sectionID, "&order_column=last_played&refresh=true&order_dir=asc&length=", count)
+	titlesURL := fmt.Sprintf("%s%s%s%s%s%d%s%d", config.PlexPyURL, "/api/v2?apikey=", config.PlexPyAPIKey, "&cmd=get_library_media_info&section_id=", sectionID, "&order_column=last_played&refresh=true&order_dir=asc&length=", count)
 
 	req, err := http.NewRequest(http.MethodGet, titlesURL, nil)
 	if err != nil {
@@ -162,7 +162,7 @@ func GetTitles(config config.Config, sectionID int, days int) ([]int, []string)
 // GetSonarrIDs gets the IDs to delete from the title list in PlexPy.
 func GetSonarrIDs(config config.Config, titles []string) []int {
 	ids := make([]int, 0)
-	sonarrURL := fmt.Sprintf("%s%s%s%s", config.BaseURL, config.SonarrContext, "/api/series?apikey=", config.SonarrAPIKey)
+	sonarrURL := fmt.Sprintf("%s%s%s%s", config.SonarrURL, "/api/series?apikey=", config.SonarrAPIKey)
 	req, err := http.NewRequest(http.MethodGet, sonarrURL, nil)
 	if err != nil {
 		log.Fatal(err)