.gitignore

@@ -1,3 +1,2 @@
 config.json
-housekeeper
+housekeeper
-.vscode

cmd/main.go

@@ -3,9 +3,6 @@ package main
 import (
 	"flag"
 	"log"
-	"sort"
-	"strconv"
-	"strings"
 
 	"git.linuxrocker.com/mattburchett/Housekeeper/pkg/communicator"
 	"git.linuxrocker.com/mattburchett/Housekeeper/pkg/config"
@@ -16,16 +13,14 @@ import (
 func main() {
 	var c string
 	var days int
-	var sectionID string
+	var sectionID int
 	var check bool
-	var text bool
 	var delete bool
 
 	flag.StringVar(&c, "config", "", "Configuration to load")
 	flag.IntVar(&days, "days", 0, "How many days of inactivity to look for on Plex.")
-	flag.StringVar(&sectionID, "sectionid", "", "Plex Section ID. Multiples can be specified (separated by a comma). Ex: 1,2")
+	flag.IntVar(&sectionID, "sectionid", 0, "Plex Section ID")
 	flag.BoolVar(&check, "check", true, "Perform only a check. This will send the message out to Telegram with what can be removed. Does not delete.")
-	flag.BoolVar(&text, "text", false, "This will override the communication to Telegram and print to stdout.")
 	flag.BoolVar(&delete, "delete", false, "Perform the delete task.")
 	flag.Parse()
 
@@ -33,7 +28,7 @@ func main() {
 	if c == "" {
 		log.Fatal("You need to specify a configuration file.")
 	}
-	if sectionID == "" {
+	if sectionID == 0 {
 		log.Fatal("You need to specify a section ID for Plex.")
 	}
 
@@ -42,47 +37,21 @@ func main() {
 		log.Fatal(err)
 	}
 
-	sectionIds := strings.Split(sectionID, ",")
+	ids, titles := locator.GetTitles(cfg, sectionID, days)
-	titlesFullList := make([]string, 0)
-
-	for _, section := range sectionIds {
-		sectionIDConv, _ := strconv.Atoi(section)
-		libraryType := locator.GetLibraryType(cfg, sectionIDConv)
-
-		ids, titles := locator.GetTitles(cfg, sectionIDConv, days)
-
-		for _, title := range titles {
-			titlesFullList = append(titlesFullList, title)
-		}
-
-		if delete {
-			if libraryType == "movie" {
-				files := eraser.LookupMovieFileLocation(cfg, ids)
-				err = eraser.DeleteFiles(delete, files)
-				if err != nil {
-					log.Println(err)
-				}
-			} else if libraryType == "show" {
-				// files := eraser.LookupTVFileLocation(cfg, ids)
-				sonarrIDs := locator.GetSonarrIDs(cfg, titles)
-				eraser.DeleteSeriesFromSonarr(cfg, sonarrIDs)
-				// err = eraser.DeleteFiles(delete, files)
-				// if err != nil {
-				// 	log.Println(err)
-				// }
-			}
-		}
-	}
 
 	if check {
-		sort.Strings(titlesFullList)
+		err = communicator.TelegramPost(cfg, titles)
-		if text {
+		if err != nil {
-			communicator.StdoutPost(titlesFullList)
+			log.Fatal(err)
-		} else {
-			err = communicator.TelegramPost(cfg, titlesFullList)
-			if err != nil {
-				log.Fatal(err)
-			}
 		}
 	}
+
+	if delete {
+		files := eraser.LookupFileLocation(cfg, ids)
+		err = eraser.DeleteMedia(delete, files)
+		if err != nil {
+			log.Println(err)
+		}
+	}
+
 }

config_example.json

@@ -1,13 +1,11 @@
 {
-    "plexPyURL": "http://dvr.example.com/plexpy",
+    "baseURL": "http://dvr.example.com",
+    "plexPyContext": "/plexpy",
     "plexPyAPIKey": "abc1234",
     "plexToken": "ABC1234ABC1234",
     "plexHost": "http://192.168.1.1",
     "plexPort": 32400,
     "telegramToken": "123456789:ABCDEFG",
     "telegramChatID": "12345678",
-    "serverName": "Plex",
+    "serverName": "Plex"
-    "sonarrURL": "http://dvr.example.com/tv",
-    "sonarrAPIKey": "abc1234",
-    "excludeList": "A,bravo,char"
 }

go.mod

@@ -1,3 +0,0 @@
-module git.linuxrocker.com/mattburchett/Housekeeper
-
-go 1.15

pkg/communicator/communicator.go

@@ -11,49 +11,28 @@ import (
 	"git.linuxrocker.com/mattburchett/Housekeeper/pkg/config"
 )
 
-type error interface {
-	Error() string
-}
-
 // TelegramPost will send a message to a specific ChatID in Telegram containing the list of items to be cleaned with this cleaner.
 func TelegramPost(config config.Config, titles []string) error {
-	var err error
+	url := "https://api.telegram.org/bot" + config.TelegramToken + "/sendMessage"
-	if len(titles) != 0 {
-		url := "https://api.telegram.org/bot" + config.TelegramToken + "/sendMessage"
 
-		values := map[string]string{"chat_id": config.TelegramChatID, "text": "The following items are to be removed from " + config.ServerName + " in 24 hours. Please go to Plex and start the title to keep it on " + config.ServerName + ". You do not need to keep watching, just hit play and load a few seconds.\n\n" + fmt.Sprintf("%v", strings.Join(titles, "\n")), "disable_notifications": "true"}
+	values := map[string]string{"chat_id": config.TelegramChatID, "text": "The following items are to be removed from " + config.ServerName + " in 24 hours. Please go to Plex and start the title to keep it on " + config.ServerName + ". You do not need to keep watching, just hit play and load a few seconds.\n\n" + fmt.Sprintf("%v", strings.Join(titles, "\n")), "disable_notifications": "true"}
 
-		jsonValue, _ := json.Marshal(values)
+	jsonValue, _ := json.Marshal(values)
-		req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonValue))
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonValue))
-		req.Header.Set("X-Custom-Header", "Housekeeper")
+	req.Header.Set("X-Custom-Header", "Housekeeper")
-		req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Content-Type", "application/json")
 
-		client := &http.Client{}
+	client := &http.Client{}
-		resp, err := client.Do(req)
+	resp, err := client.Do(req)
-		if err != nil {
+	if err != nil {
-			panic(err)
+		panic(err)
-		}
-		defer resp.Body.Close()
-
-		fmt.Println("response Status:", resp.Status)
-		fmt.Println("response Headers:", resp.Header)
-		body, _ := ioutil.ReadAll(resp.Body)
-		fmt.Println("response Body:", string(body))
-
-	} else {
-		fmt.Println("There are no titles, therefore no message to send!")
 	}
+	defer resp.Body.Close()
+
+	fmt.Println("response Status:", resp.Status)
+	fmt.Println("response Headers:", resp.Header)
+	body, _ := ioutil.ReadAll(resp.Body)
+	fmt.Println("response Body:", string(body))
 
 	return err
 }
-
-// StdoutPost will relay the titles out to stdout.
-func StdoutPost(titles []string) {
-	if len(titles) != 0 {
-		for _, title := range titles {
-			fmt.Println(title)
-		}
-	} else {
-		fmt.Println("There are no titles. Nothing to display.")
-	}
-}

pkg/config/config.go

@@ -9,7 +9,8 @@ import (
 
 // Config - This struct will hold configuration components.
 type Config struct {
-	PlexPyURL      string `json:"plexPyURL"`
+	BaseURL        string `json:"baseURL"`
+	PlexPyContext  string `json:"plexPyContext"`
 	PlexPyAPIKey   string `json:"plexPyAPIKey"`
 	PlexToken      string `json:"plexToken"`
 	PlexHost       string `json:"plexHost"`
@@ -17,9 +18,6 @@ type Config struct {
 	TelegramToken  string `json:"telegramToken"`
 	TelegramChatID string `json:"telegramChatID"`
 	ServerName     string `json:"serverName"`
-	SonarrURL      string `json:"sonarrURL"`
-	SonarrAPIKey   string `json:"sonarrAPIKey"`
-	ExcludeList    string `json:"excludeList"` // ExcludeList will be checked against any section.
 }
 
 //GetConfig gets the configuration values for the api using the file in the supplied configPath.

pkg/eraser/eraser.go

@@ -1,7 +1,6 @@
 package eraser
 
 import (
-	"encoding/json"
 	"encoding/xml"
 	"fmt"
 	"io/ioutil"
@@ -14,14 +13,17 @@ import (
 	"git.linuxrocker.com/mattburchett/Housekeeper/pkg/model"
 )
 
-// LookupMovieFileLocation will gather a list of Information based on IDs returned by locator.GetTitles
+// LookupFileLocation will gather a list of Information based on IDs returned by locator.GetTitles
-func LookupMovieFileLocation(config config.Config, ids []int) []string {
+func LookupFileLocation(config config.Config, ids []int) []string {
 	fileList := make([]string, 0)
 
 	for _, i := range ids {
 		plexURL := fmt.Sprintf("%s:%d%s%d%s%s", config.PlexHost, config.PlexPort, "/library/metadata/", i, "/?X-Plex-Token=", config.PlexToken)
 
 		req, err := http.NewRequest(http.MethodGet, plexURL, nil)
+		if err != nil {
+			log.Fatal(err)
+		}
 
 		httpClient := http.Client{}
 		req.Header.Set("User-Agent", "Housekeeper")
@@ -39,102 +41,22 @@ func LookupMovieFileLocation(config config.Config, ids []int) []string {
 		if err != nil {
 			log.Fatal(err)
 		}
-		plexModel := model.XMLPlexMovieAPI{}
+		plexModel := model.XMLPlexAPI{}
 		xml.Unmarshal(body, &plexModel)
 		fileList = append(fileList, filepath.Dir(plexModel.Video.Media.Part.File))
 	}
 	return fileList
 }
 
-// LookupTVFileLocation will gather a list of Information based on IDs returned by locator.GetTitles
+// DeleteMedia will actually perform the deletion.
-func LookupTVFileLocation(config config.Config, ids []int) []string {
+func DeleteMedia(delete bool, files []string) error {
-	fileList := make([]string, 0)
-	m := make(map[string]bool)
-	results := make([]string, 0)
-
-	for _, i := range ids {
-		plexURL := fmt.Sprintf("%s:%d%s%d%s%s", config.PlexHost, config.PlexPort, "/library/metadata/", i, "/allLeaves/?X-Plex-Token=", config.PlexToken)
-
-		req, err := http.NewRequest(http.MethodGet, plexURL, nil)
-
-		httpClient := http.Client{}
-		req.Header.Set("User-Agent", "Housekeeper")
-
-		res, getErr := httpClient.Do(req)
-		if getErr != nil {
-			log.Fatal(getErr)
-		}
-
-		body, readErr := ioutil.ReadAll(res.Body)
-		if readErr != nil {
-			log.Fatal(readErr)
-		}
-
-		if err != nil {
-			log.Fatal(err)
-		}
-		plexModel := model.XMLPlexTVAPI{}
-		xml.Unmarshal(body, &plexModel)
-
-		plexTV := plexModel.Video
-
-		for _, i := range plexTV {
-			fileList = append(fileList, filepath.Dir(i.Media.Part.File))
-		}
-
-		for _, r := range fileList {
-			if _, ok := m[r]; !ok {
-				m[r] = true
-				results = append(results, r)
-			}
-		}
-
-	}
-	return results
-}
-
-func DeleteSeriesFromSonarr(config config.Config, ids []int) {
-	for _, i := range ids {
-		sonarrURL := fmt.Sprintf("%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)
-		}
-
-		httpClient := http.Client{}
-		req.Header.Set("User-Agent", "Housekeeper")
-
-		res, getErr := httpClient.Do(req)
-		if getErr != nil {
-			log.Fatal(getErr)
-		}
-
-		body, readErr := ioutil.ReadAll(res.Body)
-		if readErr != nil {
-			log.Fatal(readErr)
-		}
-
-		deleteModel := model.SonarrResponse{}
-		jsonErr := json.Unmarshal(body, &deleteModel)
-		if jsonErr != nil {
-			log.Fatal(jsonErr)
-		}
-
-		// if strings.Contains("does not exist", deleteModel.Message) {
-		// 	log.Printf("The following ID does not exist: %v", i)
-		// }
-	}
-}
-
-// DeleteFiles will actually perform the deletion.
-func DeleteFiles(delete bool, files []string) error {
 	var err error
 	if delete {
 		for _, i := range files {
 			fmt.Printf("Removing %v\n", i)
 			err = os.RemoveAll(i)
 			if err != nil {
-				log.Println(err)
+				log.Fatal(err)
 			}
 		}
 	}

pkg/locator/locator.go

@@ -2,61 +2,21 @@ package locator
 
 import (
 	"encoding/json"
-	"encoding/xml"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"sort"
 	"strconv"
-	"strings"
 
 	"git.linuxrocker.com/mattburchett/Housekeeper/pkg/config"
 	"git.linuxrocker.com/mattburchett/Housekeeper/pkg/model"
 	"git.linuxrocker.com/mattburchett/Housekeeper/pkg/util"
 )
 
-// GetLibraryType checks to see what type the library is.
-func GetLibraryType(config config.Config, sectionID int) string {
-	typeURL := fmt.Sprintf("%s:%d%s%d%s%s", config.PlexHost, config.PlexPort, "/library/sections/", sectionID, "/?X-Plex-Token=", config.PlexToken)
-
-	req, err := http.NewRequest(http.MethodGet, typeURL, nil)
-	httpClient := http.Client{}
-	req.Header.Set("User-Agent", "Housekeeper")
-
-	res, getErr := httpClient.Do(req)
-	if getErr != nil {
-		log.Fatal(getErr)
-	}
-
-	body, readErr := ioutil.ReadAll(res.Body)
-	if readErr != nil {
-		log.Fatal(readErr)
-	}
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	typeModel := model.XMLPlexLibraryType{}
-	xml.Unmarshal(body, &typeModel)
-
-	var libraryType string
-
-	if typeModel.Thumb == "/:/resources/movie.png" {
-		libraryType = "movie"
-	} else if typeModel.Thumb == "/:/resources/show.png" {
-		libraryType = "show"
-	} else {
-		log.Fatal("Unsupported library type found. This app only supports movies and shows.")
-	}
-
-	return libraryType
-}
-
 // 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%d", config.PlexPyURL, "/api/v2?apikey=", config.PlexPyAPIKey, "&cmd=get_library&section_id=", sectionID)
+	countURL := fmt.Sprintf("%s%s%s%s%s%d", config.BaseURL, config.PlexPyContext, "/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 +50,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%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)
+	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)
 
 	req, err := http.NewRequest(http.MethodGet, titlesURL, nil)
 	if err != nil {
@@ -122,20 +82,7 @@ func GetTitles(config config.Config, sectionID int, days int) ([]int, []string)
 
 	epoch := util.SubtractedEpoch(days)
 
-	exclude := strings.Split(config.ExcludeList, ",")
-
-	var breakOut bool
-
 	for _, i := range data {
-		for _, ex := range exclude {
-			if strings.Contains(i.Title, ex) {
-				breakOut = true
-			}
-		}
-		if breakOut {
-			breakOut = false
-			continue
-		}
 		if int64(i.LastPlayed) <= epoch && int64(i.LastPlayed) != 0 {
 			titles = append(titles, i.Title)
 			strirk, err := strconv.Atoi(i.RatingKey)
@@ -158,42 +105,3 @@ func GetTitles(config config.Config, sectionID int, days int) ([]int, []string)
 	sort.Strings(titles)
 	return ids, titles
 }
-
-// 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", config.SonarrURL, "/api/series?apikey=", config.SonarrAPIKey)
-	req, err := http.NewRequest(http.MethodGet, sonarrURL, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	httpClient := http.Client{}
-	req.Header.Set("User-Agent", "Housekeeper")
-
-	res, getErr := httpClient.Do(req)
-	if getErr != nil {
-		log.Fatal(getErr)
-	}
-
-	body, readErr := ioutil.ReadAll(res.Body)
-	if readErr != nil {
-		log.Fatal(readErr)
-	}
-
-	sonarrModel := model.SonarrSeries{}
-	jsonErr := json.Unmarshal(body, &sonarrModel)
-	if jsonErr != nil {
-		log.Fatal(jsonErr)
-	}
-
-	for _, r := range sonarrModel {
-		for _, s := range titles {
-			if r.Title == s {
-				ids = append(ids, r.ID)
-			}
-		}
-	}
-
-	return ids
-}

pkg/model/eraser_model.go

@@ -1,237 +0,0 @@
-package model
-
-import "encoding/xml"
-
-// XMLPlexMovieAPI - This is the XML version of the Library.
-type XMLPlexMovieAPI struct {
-	XMLName             xml.Name `xml:"MediaContainer"`
-	Text                string   `xml:",chardata"`
-	Size                string   `xml:"size,attr"`
-	AllowSync           string   `xml:"allowSync,attr"`
-	Identifier          string   `xml:"identifier,attr"`
-	LibrarySectionID    string   `xml:"librarySectionID,attr"`
-	LibrarySectionTitle string   `xml:"librarySectionTitle,attr"`
-	LibrarySectionUUID  string   `xml:"librarySectionUUID,attr"`
-	MediaTagPrefix      string   `xml:"mediaTagPrefix,attr"`
-	MediaTagVersion     string   `xml:"mediaTagVersion,attr"`
-	Video               struct {
-		Text                  string `xml:",chardata"`
-		RatingKey             string `xml:"ratingKey,attr"`
-		Key                   string `xml:"key,attr"`
-		GUID                  string `xml:"guid,attr"`
-		LibrarySectionTitle   string `xml:"librarySectionTitle,attr"`
-		LibrarySectionID      string `xml:"librarySectionID,attr"`
-		LibrarySectionKey     string `xml:"librarySectionKey,attr"`
-		Studio                string `xml:"studio,attr"`
-		Type                  string `xml:"type,attr"`
-		Title                 string `xml:"title,attr"`
-		ContentRating         string `xml:"contentRating,attr"`
-		Summary               string `xml:"summary,attr"`
-		Rating                string `xml:"rating,attr"`
-		AudienceRating        string `xml:"audienceRating,attr"`
-		Year                  string `xml:"year,attr"`
-		Tagline               string `xml:"tagline,attr"`
-		Thumb                 string `xml:"thumb,attr"`
-		Art                   string `xml:"art,attr"`
-		Duration              string `xml:"duration,attr"`
-		OriginallyAvailableAt string `xml:"originallyAvailableAt,attr"`
-		AddedAt               string `xml:"addedAt,attr"`
-		UpdatedAt             string `xml:"updatedAt,attr"`
-		AudienceRatingImage   string `xml:"audienceRatingImage,attr"`
-		ChapterSource         string `xml:"chapterSource,attr"`
-		PrimaryExtraKey       string `xml:"primaryExtraKey,attr"`
-		RatingImage           string `xml:"ratingImage,attr"`
-		Media                 struct {
-			Text            string `xml:",chardata"`
-			VideoResolution string `xml:"videoResolution,attr"`
-			ID              string `xml:"id,attr"`
-			Duration        string `xml:"duration,attr"`
-			Bitrate         string `xml:"bitrate,attr"`
-			Width           string `xml:"width,attr"`
-			Height          string `xml:"height,attr"`
-			AspectRatio     string `xml:"aspectRatio,attr"`
-			AudioChannels   string `xml:"audioChannels,attr"`
-			AudioCodec      string `xml:"audioCodec,attr"`
-			VideoCodec      string `xml:"videoCodec,attr"`
-			Container       string `xml:"container,attr"`
-			VideoFrameRate  string `xml:"videoFrameRate,attr"`
-			AudioProfile    string `xml:"audioProfile,attr"`
-			VideoProfile    string `xml:"videoProfile,attr"`
-			Part            struct {
-				Text         string `xml:",chardata"`
-				ID           string `xml:"id,attr"`
-				Key          string `xml:"key,attr"`
-				Duration     string `xml:"duration,attr"`
-				File         string `xml:"file,attr"`
-				Size         string `xml:"size,attr"`
-				AudioProfile string `xml:"audioProfile,attr"`
-				Container    string `xml:"container,attr"`
-				VideoProfile string `xml:"videoProfile,attr"`
-				Stream       []struct {
-					Text               string `xml:",chardata"`
-					ID                 string `xml:"id,attr"`
-					StreamType         string `xml:"streamType,attr"`
-					Default            string `xml:"default,attr"`
-					Codec              string `xml:"codec,attr"`
-					Index              string `xml:"index,attr"`
-					Bitrate            string `xml:"bitrate,attr"`
-					Language           string `xml:"language,attr"`
-					LanguageCode       string `xml:"languageCode,attr"`
-					BitDepth           string `xml:"bitDepth,attr"`
-					ChromaLocation     string `xml:"chromaLocation,attr"`
-					ChromaSubsampling  string `xml:"chromaSubsampling,attr"`
-					FrameRate          string `xml:"frameRate,attr"`
-					HasScalingMatrix   string `xml:"hasScalingMatrix,attr"`
-					Height             string `xml:"height,attr"`
-					Level              string `xml:"level,attr"`
-					Profile            string `xml:"profile,attr"`
-					RefFrames          string `xml:"refFrames,attr"`
-					ScanType           string `xml:"scanType,attr"`
-					Title              string `xml:"title,attr"`
-					Width              string `xml:"width,attr"`
-					DisplayTitle       string `xml:"displayTitle,attr"`
-					Selected           string `xml:"selected,attr"`
-					Channels           string `xml:"channels,attr"`
-					AudioChannelLayout string `xml:"audioChannelLayout,attr"`
-					SamplingRate       string `xml:"samplingRate,attr"`
-					Key                string `xml:"key,attr"`
-				} `xml:"Stream"`
-			} `xml:"Part"`
-		} `xml:"Media"`
-		Genre []struct {
-			Text   string `xml:",chardata"`
-			ID     string `xml:"id,attr"`
-			Filter string `xml:"filter,attr"`
-			Tag    string `xml:"tag,attr"`
-		} `xml:"Genre"`
-		Director struct {
-			Text   string `xml:",chardata"`
-			ID     string `xml:"id,attr"`
-			Filter string `xml:"filter,attr"`
-			Tag    string `xml:"tag,attr"`
-		} `xml:"Director"`
-		Writer []struct {
-			Text   string `xml:",chardata"`
-			ID     string `xml:"id,attr"`
-			Filter string `xml:"filter,attr"`
-			Tag    string `xml:"tag,attr"`
-		} `xml:"Writer"`
-		Producer []struct {
-			Text   string `xml:",chardata"`
-			ID     string `xml:"id,attr"`
-			Filter string `xml:"filter,attr"`
-			Tag    string `xml:"tag,attr"`
-		} `xml:"Producer"`
-		Country struct {
-			Text   string `xml:",chardata"`
-			ID     string `xml:"id,attr"`
-			Filter string `xml:"filter,attr"`
-			Tag    string `xml:"tag,attr"`
-		} `xml:"Country"`
-		Role []struct {
-			Text   string `xml:",chardata"`
-			ID     string `xml:"id,attr"`
-			Filter string `xml:"filter,attr"`
-			Tag    string `xml:"tag,attr"`
-			Role   string `xml:"role,attr"`
-			Thumb  string `xml:"thumb,attr"`
-		} `xml:"Role"`
-	} `xml:"Video"`
-}
-
-// XMLPlexTVAPI - This is the XML version of the Library.
-type XMLPlexTVAPI struct {
-	XMLName             xml.Name `xml:"MediaContainer"`
-	Text                string   `xml:",chardata"`
-	Size                string   `xml:"size,attr"`
-	AllowSync           string   `xml:"allowSync,attr"`
-	Art                 string   `xml:"art,attr"`
-	Banner              string   `xml:"banner,attr"`
-	Identifier          string   `xml:"identifier,attr"`
-	Key                 string   `xml:"key,attr"`
-	LibrarySectionID    string   `xml:"librarySectionID,attr"`
-	LibrarySectionTitle string   `xml:"librarySectionTitle,attr"`
-	LibrarySectionUUID  string   `xml:"librarySectionUUID,attr"`
-	MediaTagPrefix      string   `xml:"mediaTagPrefix,attr"`
-	MediaTagVersion     string   `xml:"mediaTagVersion,attr"`
-	MixedParents        string   `xml:"mixedParents,attr"`
-	Nocache             string   `xml:"nocache,attr"`
-	ParentIndex         string   `xml:"parentIndex,attr"`
-	ParentTitle         string   `xml:"parentTitle,attr"`
-	ParentYear          string   `xml:"parentYear,attr"`
-	Theme               string   `xml:"theme,attr"`
-	Title1              string   `xml:"title1,attr"`
-	Title2              string   `xml:"title2,attr"`
-	ViewGroup           string   `xml:"viewGroup,attr"`
-	ViewMode            string   `xml:"viewMode,attr"`
-	Video               []struct {
-		Text                  string `xml:",chardata"`
-		RatingKey             string `xml:"ratingKey,attr"`
-		Key                   string `xml:"key,attr"`
-		ParentRatingKey       string `xml:"parentRatingKey,attr"`
-		GrandparentRatingKey  string `xml:"grandparentRatingKey,attr"`
-		Studio                string `xml:"studio,attr"`
-		Type                  string `xml:"type,attr"`
-		Title                 string `xml:"title,attr"`
-		GrandparentKey        string `xml:"grandparentKey,attr"`
-		ParentKey             string `xml:"parentKey,attr"`
-		GrandparentTitle      string `xml:"grandparentTitle,attr"`
-		ParentTitle           string `xml:"parentTitle,attr"`
-		ContentRating         string `xml:"contentRating,attr"`
-		Summary               string `xml:"summary,attr"`
-		Index                 string `xml:"index,attr"`
-		ParentIndex           string `xml:"parentIndex,attr"`
-		Rating                string `xml:"rating,attr"`
-		Year                  string `xml:"year,attr"`
-		Thumb                 string `xml:"thumb,attr"`
-		Art                   string `xml:"art,attr"`
-		ParentThumb           string `xml:"parentThumb,attr"`
-		GrandparentThumb      string `xml:"grandparentThumb,attr"`
-		GrandparentArt        string `xml:"grandparentArt,attr"`
-		GrandparentTheme      string `xml:"grandparentTheme,attr"`
-		Duration              string `xml:"duration,attr"`
-		OriginallyAvailableAt string `xml:"originallyAvailableAt,attr"`
-		AddedAt               string `xml:"addedAt,attr"`
-		UpdatedAt             string `xml:"updatedAt,attr"`
-		TitleSort             string `xml:"titleSort,attr"`
-		Media                 struct {
-			Text            string `xml:",chardata"`
-			VideoResolution string `xml:"videoResolution,attr"`
-			ID              string `xml:"id,attr"`
-			Duration        string `xml:"duration,attr"`
-			Bitrate         string `xml:"bitrate,attr"`
-			Width           string `xml:"width,attr"`
-			Height          string `xml:"height,attr"`
-			AspectRatio     string `xml:"aspectRatio,attr"`
-			AudioChannels   string `xml:"audioChannels,attr"`
-			AudioCodec      string `xml:"audioCodec,attr"`
-			VideoCodec      string `xml:"videoCodec,attr"`
-			Container       string `xml:"container,attr"`
-			VideoFrameRate  string `xml:"videoFrameRate,attr"`
-			VideoProfile    string `xml:"videoProfile,attr"`
-			Part            struct {
-				Text         string `xml:",chardata"`
-				ID           string `xml:"id,attr"`
-				Key          string `xml:"key,attr"`
-				Duration     string `xml:"duration,attr"`
-				File         string `xml:"file,attr"`
-				Size         string `xml:"size,attr"`
-				Container    string `xml:"container,attr"`
-				VideoProfile string `xml:"videoProfile,attr"`
-			} `xml:"Part"`
-		} `xml:"Media"`
-		Director struct {
-			Text string `xml:",chardata"`
-			Tag  string `xml:"tag,attr"`
-		} `xml:"Director"`
-		Writer []struct {
-			Text string `xml:",chardata"`
-			Tag  string `xml:"tag,attr"`
-		} `xml:"Writer"`
-	} `xml:"Video"`
-}
-
-type SonarrResponse struct {
-	Message     string `json:"message"`
-	Description string `json:"description"`
-}

pkg/model/locator_model.go

@@ -1,9 +1,6 @@
 package model
 
-import (
+import "encoding/xml"
-	"encoding/xml"
-	"time"
-)
 
 // PlexPyLibraryInfo will gather all the library related info. We really just need the count from this...
 type PlexPyLibraryInfo struct {
@@ -66,91 +63,139 @@ type PlexPyMediaInfo struct {
 	} `json:"response"`
 }
 
-type XMLPlexLibraryType struct {
+// XMLPlexAPI - This is the XML version of the struct below it.
-	XMLName          xml.Name `xml:"MediaContainer"`
+type XMLPlexAPI struct {
-	Text             string   `xml:",chardata"`
+	XMLName             xml.Name `xml:"MediaContainer"`
-	Size             string   `xml:"size,attr"`
+	Text                string   `xml:",chardata"`
-	AllowSync        string   `xml:"allowSync,attr"`
+	Size                string   `xml:"size,attr"`
-	Art              string   `xml:"art,attr"`
+	AllowSync           string   `xml:"allowSync,attr"`
-	Content          string   `xml:"content,attr"`
+	Identifier          string   `xml:"identifier,attr"`
-	Identifier       string   `xml:"identifier,attr"`
+	LibrarySectionID    string   `xml:"librarySectionID,attr"`
-	LibrarySectionID string   `xml:"librarySectionID,attr"`
+	LibrarySectionTitle string   `xml:"librarySectionTitle,attr"`
-	MediaTagPrefix   string   `xml:"mediaTagPrefix,attr"`
+	LibrarySectionUUID  string   `xml:"librarySectionUUID,attr"`
-	MediaTagVersion  string   `xml:"mediaTagVersion,attr"`
+	MediaTagPrefix      string   `xml:"mediaTagPrefix,attr"`
-	Nocache          string   `xml:"nocache,attr"`
+	MediaTagVersion     string   `xml:"mediaTagVersion,attr"`
-	Thumb            string   `xml:"thumb,attr"`
+	Video               struct {
-	Title1           string   `xml:"title1,attr"`
+		Text                  string `xml:",chardata"`
-	ViewGroup        string   `xml:"viewGroup,attr"`
+		RatingKey             string `xml:"ratingKey,attr"`
-	ViewMode         string   `xml:"viewMode,attr"`
+		Key                   string `xml:"key,attr"`
-	Directory        []struct {
+		GUID                  string `xml:"guid,attr"`
-		Text      string `xml:",chardata"`
+		LibrarySectionTitle   string `xml:"librarySectionTitle,attr"`
-		Key       string `xml:"key,attr"`
+		LibrarySectionID      string `xml:"librarySectionID,attr"`
-		Title     string `xml:"title,attr"`
+		LibrarySectionKey     string `xml:"librarySectionKey,attr"`
-		Secondary string `xml:"secondary,attr"`
+		Studio                string `xml:"studio,attr"`
-		Prompt    string `xml:"prompt,attr"`
+		Type                  string `xml:"type,attr"`
-		Search    string `xml:"search,attr"`
+		Title                 string `xml:"title,attr"`
-	} `xml:"Directory"`
+		ContentRating         string `xml:"contentRating,attr"`
-}
+		Summary               string `xml:"summary,attr"`
-
+		Rating                string `xml:"rating,attr"`
-// SonarrSeries type takes all the data from Sonarr and places it in a struct
+		AudienceRating        string `xml:"audienceRating,attr"`
-type SonarrSeries []struct {
+		Year                  string `xml:"year,attr"`
-	Title           string `json:"title"`
+		Tagline               string `xml:"tagline,attr"`
-	AlternateTitles []struct {
+		Thumb                 string `xml:"thumb,attr"`
-		Title        string `json:"title"`
+		Art                   string `xml:"art,attr"`
-		SeasonNumber int    `json:"seasonNumber"`
+		Duration              string `xml:"duration,attr"`
-	} `json:"alternateTitles"`
+		OriginallyAvailableAt string `xml:"originallyAvailableAt,attr"`
-	SortTitle         string    `json:"sortTitle"`
+		AddedAt               string `xml:"addedAt,attr"`
-	SeasonCount       int       `json:"seasonCount"`
+		UpdatedAt             string `xml:"updatedAt,attr"`
-	TotalEpisodeCount int       `json:"totalEpisodeCount"`
+		AudienceRatingImage   string `xml:"audienceRatingImage,attr"`
-	EpisodeCount      int       `json:"episodeCount"`
+		ChapterSource         string `xml:"chapterSource,attr"`
-	EpisodeFileCount  int       `json:"episodeFileCount"`
+		PrimaryExtraKey       string `xml:"primaryExtraKey,attr"`
-	SizeOnDisk        int64     `json:"sizeOnDisk"`
+		RatingImage           string `xml:"ratingImage,attr"`
-	Status            string    `json:"status"`
+		Media                 struct {
-	Overview          string    `json:"overview"`
+			Text            string `xml:",chardata"`
-	PreviousAiring    time.Time `json:"previousAiring"`
+			VideoResolution string `xml:"videoResolution,attr"`
-	Network           string    `json:"network"`
+			ID              string `xml:"id,attr"`
-	AirTime           string    `json:"airTime,omitempty"`
+			Duration        string `xml:"duration,attr"`
-	Images            []struct {
+			Bitrate         string `xml:"bitrate,attr"`
-		CoverType string `json:"coverType"`
+			Width           string `xml:"width,attr"`
-		URL       string `json:"url"`
+			Height          string `xml:"height,attr"`
-	} `json:"images"`
+			AspectRatio     string `xml:"aspectRatio,attr"`
-	Seasons []struct {
+			AudioChannels   string `xml:"audioChannels,attr"`
-		SeasonNumber int  `json:"seasonNumber"`
+			AudioCodec      string `xml:"audioCodec,attr"`
-		Monitored    bool `json:"monitored"`
+			VideoCodec      string `xml:"videoCodec,attr"`
-		Statistics   struct {
+			Container       string `xml:"container,attr"`
-			PreviousAiring    time.Time `json:"previousAiring"`
+			VideoFrameRate  string `xml:"videoFrameRate,attr"`
-			EpisodeFileCount  int       `json:"episodeFileCount"`
+			AudioProfile    string `xml:"audioProfile,attr"`
-			EpisodeCount      int       `json:"episodeCount"`
+			VideoProfile    string `xml:"videoProfile,attr"`
-			TotalEpisodeCount int       `json:"totalEpisodeCount"`
+			Part            struct {
-			SizeOnDisk        int64     `json:"sizeOnDisk"`
+				Text         string `xml:",chardata"`
-			PercentOfEpisodes float64   `json:"percentOfEpisodes"`
+				ID           string `xml:"id,attr"`
-		} `json:"statistics"`
+				Key          string `xml:"key,attr"`
-	} `json:"seasons"`
+				Duration     string `xml:"duration,attr"`
-	Year              int           `json:"year"`
+				File         string `xml:"file,attr"`
-	Path              string        `json:"path"`
+				Size         string `xml:"size,attr"`
-	ProfileID         int           `json:"profileId"`
+				AudioProfile string `xml:"audioProfile,attr"`
-	SeasonFolder      bool          `json:"seasonFolder"`
+				Container    string `xml:"container,attr"`
-	Monitored         bool          `json:"monitored"`
+				VideoProfile string `xml:"videoProfile,attr"`
-	UseSceneNumbering bool          `json:"useSceneNumbering"`
+				Stream       []struct {
-	Runtime           int           `json:"runtime"`
+					Text               string `xml:",chardata"`
-	TvdbID            int           `json:"tvdbId"`
+					ID                 string `xml:"id,attr"`
-	TvRageID          int           `json:"tvRageId"`
+					StreamType         string `xml:"streamType,attr"`
-	TvMazeID          int           `json:"tvMazeId"`
+					Default            string `xml:"default,attr"`
-	FirstAired        time.Time     `json:"firstAired"`
+					Codec              string `xml:"codec,attr"`
-	LastInfoSync      time.Time     `json:"lastInfoSync"`
+					Index              string `xml:"index,attr"`
-	SeriesType        string        `json:"seriesType"`
+					Bitrate            string `xml:"bitrate,attr"`
-	CleanTitle        string        `json:"cleanTitle"`
+					Language           string `xml:"language,attr"`
-	ImdbID            string        `json:"imdbId,omitempty"`
+					LanguageCode       string `xml:"languageCode,attr"`
-	TitleSlug         string        `json:"titleSlug"`
+					BitDepth           string `xml:"bitDepth,attr"`
-	Certification     string        `json:"certification,omitempty"`
+					ChromaLocation     string `xml:"chromaLocation,attr"`
-	Genres            []string      `json:"genres"`
+					ChromaSubsampling  string `xml:"chromaSubsampling,attr"`
-	Tags              []interface{} `json:"tags"`
+					FrameRate          string `xml:"frameRate,attr"`
-	Added             time.Time     `json:"added"`
+					HasScalingMatrix   string `xml:"hasScalingMatrix,attr"`
-	Ratings           struct {
+					Height             string `xml:"height,attr"`
-		Votes int     `json:"votes"`
+					Level              string `xml:"level,attr"`
-		Value float64 `json:"value"`
+					Profile            string `xml:"profile,attr"`
-	} `json:"ratings"`
+					RefFrames          string `xml:"refFrames,attr"`
-	QualityProfileID int       `json:"qualityProfileId"`
+					ScanType           string `xml:"scanType,attr"`
-	ID               int       `json:"id"`
+					Title              string `xml:"title,attr"`
-	NextAiring       time.Time `json:"nextAiring,omitempty"`
+					Width              string `xml:"width,attr"`
+					DisplayTitle       string `xml:"displayTitle,attr"`
+					Selected           string `xml:"selected,attr"`
+					Channels           string `xml:"channels,attr"`
+					AudioChannelLayout string `xml:"audioChannelLayout,attr"`
+					SamplingRate       string `xml:"samplingRate,attr"`
+					Key                string `xml:"key,attr"`
+				} `xml:"Stream"`
+			} `xml:"Part"`
+		} `xml:"Media"`
+		Genre []struct {
+			Text   string `xml:",chardata"`
+			ID     string `xml:"id,attr"`
+			Filter string `xml:"filter,attr"`
+			Tag    string `xml:"tag,attr"`
+		} `xml:"Genre"`
+		Director struct {
+			Text   string `xml:",chardata"`
+			ID     string `xml:"id,attr"`
+			Filter string `xml:"filter,attr"`
+			Tag    string `xml:"tag,attr"`
+		} `xml:"Director"`
+		Writer []struct {
+			Text   string `xml:",chardata"`
+			ID     string `xml:"id,attr"`
+			Filter string `xml:"filter,attr"`
+			Tag    string `xml:"tag,attr"`
+		} `xml:"Writer"`
+		Producer []struct {
+			Text   string `xml:",chardata"`
+			ID     string `xml:"id,attr"`
+			Filter string `xml:"filter,attr"`
+			Tag    string `xml:"tag,attr"`
+		} `xml:"Producer"`
+		Country struct {
+			Text   string `xml:",chardata"`
+			ID     string `xml:"id,attr"`
+			Filter string `xml:"filter,attr"`
+			Tag    string `xml:"tag,attr"`
+		} `xml:"Country"`
+		Role []struct {
+			Text   string `xml:",chardata"`
+			ID     string `xml:"id,attr"`
+			Filter string `xml:"filter,attr"`
+			Tag    string `xml:"tag,attr"`
+			Role   string `xml:"role,attr"`
+			Thumb  string `xml:"thumb,attr"`
+		} `xml:"Role"`
+	} `xml:"Video"`
 }