Merge pull request #7 from Migz93/develop

Develop
Migz93 · Jan 28, 2024 · cea1055 · cea1055
2 parents 8fa5ff6 + 2debd4a
commit cea1055
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/pvr/radarrv4.go b/pvr/radarrv4.go
@@ -296,7 +296,18 @@ func (p *RadarrV4) GetWantedCutoff() ([]MediaItem, error) {
 			continue
 		}
 
+		//lets find the highest date.
 		airDate := movie.AirDateUtc
+
+		// Compare and update if necessary
+		if !movie.PhysicalUtc.IsZero() && movie.PhysicalUtc.After(airDate) {
+			airDate = movie.PhysicalUtc
+		}
+
+		if !movie.DigitalUtc.IsZero() && movie.DigitalUtc.After(airDate) {
+			airDate = movie.DigitalUtc
+		}
+
 		wantedCutoff = append(wantedCutoff, MediaItem{
 			ItemId:     movie.Id,
 			AirDateUtc: airDate,

diff --git a/pvr/radarrv5.go b/pvr/radarrv5.go
@@ -296,7 +296,18 @@ func (p *RadarrV5) GetWantedCutoff() ([]MediaItem, error) {
 			continue
 		}
 
+		//lets find the highest date.
 		airDate := movie.AirDateUtc
+
+		// Compare and update if necessary
+		if !movie.PhysicalUtc.IsZero() && movie.PhysicalUtc.After(airDate) {
+			airDate = movie.PhysicalUtc
+		}
+
+		if !movie.DigitalUtc.IsZero() && movie.DigitalUtc.After(airDate) {
+			airDate = movie.DigitalUtc
+		}
+
 		wantedCutoff = append(wantedCutoff, MediaItem{
 			ItemId:     movie.Id,
 			AirDateUtc: airDate,

diff --git a/pvr/whisparrv2.go b/pvr/whisparrv2.go
@@ -29,7 +29,7 @@ type WhisparrV2Queue struct {
 
 type WhisparrV2Episode struct {
 	Id         int
-	AirDateUtc time.Time
+	AirDateUtc string `json:"releaseDate"`
 	Monitored  bool
 }
 
@@ -235,7 +235,11 @@ func (p *WhisparrV2) GetWantedMissing() ([]MediaItem, error) {
 		for _, episode := range m.Records {
 
 			// store this episode
-			airDate := episode.AirDateUtc
+			//extraDate := "T00:00:00Z"
+			//airDate := episode.AirDateUtc
+
+			airDate, _ := time.Parse("2006-01-02", episode.AirDateUtc)
+			//airDateNew := airDate+extraDate
 			wantedMissing = append(wantedMissing, MediaItem{
 				ItemId:     episode.Id,
 				AirDateUtc: airDate,
@@ -308,7 +312,7 @@ func (p *WhisparrV2) GetWantedCutoff() ([]MediaItem, error) {
 		lastPageSize = len(m.Records)
 		for _, episode := range m.Records {
 			// store this episode
-			airDate := episode.AirDateUtc
+			airDate, _ := time.Parse("2006-01-02", episode.AirDateUtc)
 			wantedCutoff = append(wantedCutoff, MediaItem{
 				ItemId:     episode.Id,
 				AirDateUtc: airDate,