From 21903e24fc16deda6a3986496e78e5142b47040a Mon Sep 17 00:00:00 2001 From: Dyson Parkes Date: Wed, 17 Aug 2022 17:08:11 +1200 Subject: [PATCH] Change to using both string and list for guids (guid/guids) to prevent conflict #4720 --- src/Ombi.Api.Plex/Models/Metadata.cs | 2 +- src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Ombi.Api.Plex/Models/Metadata.cs b/src/Ombi.Api.Plex/Models/Metadata.cs index d0bb227ad9..bcf0b8a831 100644 --- a/src/Ombi.Api.Plex/Models/Metadata.cs +++ b/src/Ombi.Api.Plex/Models/Metadata.cs @@ -46,7 +46,7 @@ public class Metadata public string grandparentTheme { get; set; } public string chapterSource { get; set; } public Medium[] Media { get; set; } - public List Guid { get; set; } = new List(); + public List Guids { get; set; } = new List(); // public Director[] Director { get; set; } // public Writer[] Writer { get; set; } } diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs index 3289c5a244..312dae8cb1 100644 --- a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs +++ b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs @@ -318,16 +318,16 @@ public async Task MovieLoop(PlexServers servers, Mediacontainer content, HashSet Logger.LogDebug("Adding movie {0}", movie.title); var guids = new List(); - if (!movie.Guid.Any()) + if (!movie.Guids.Any()) { var metaData = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri, movie.ratingKey); var meta = metaData.MediaContainer.Metadata.FirstOrDefault(); guids.Add(meta.guid); - if (meta.Guid != null) + if (meta.Guids != null) { - foreach (var g in meta.Guid) + foreach (var g in meta.Guids) { guids.Add(g.Id); } @@ -336,7 +336,7 @@ public async Task MovieLoop(PlexServers servers, Mediacontainer content, HashSet else { // Currently a Plex Pass feature only - foreach (var g in movie.Guid) + foreach (var g in movie.Guids) { guids.Add(g.Id); } @@ -607,9 +607,9 @@ private async Task GetProviderIds(PlexMetadata showMetadata, PlexServerContent e { metadata.guid }; - if (metadata.Guid != null) + if (metadata.Guids != null) { - foreach (var g in metadata.Guid) + foreach (var g in metadata.Guids) { guids.Add(g.Id); }