github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 04:49:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #2348

Browse source
This commit is contained in:
Jamie 2018-06-21 22:33:05 +01:00
commit 6adb0351ea
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs
View file

@ -104,13 +104,13 @@ namespace Ombi.Schedule.Jobs.Plex
BackgroundJob.Enqueue(() => EpisodeSync.Start()); BackgroundJob.Enqueue(() => EpisodeSync.Start());
} }
if (processedContent.HasProcessedContent && recentlyAddedSearch) if ((processedContent?.HasProcessedContent ?? false) && recentlyAddedSearch)
{ {
// Just check what we send it // Just check what we send it
BackgroundJob.Enqueue(() => Metadata.ProcessPlexServerContent(processedContent.Content)); BackgroundJob.Enqueue(() => Metadata.ProcessPlexServerContent(processedContent.Content));
} }
if (processedContent.HasProcessedEpisodes && recentlyAddedSearch) if ((processedContent?.HasProcessedEpisodes ?? false) && recentlyAddedSearch)
{ {
BackgroundJob.Enqueue(() => Checker.Start()); BackgroundJob.Enqueue(() => Checker.Start());
} }
@ -165,7 +165,7 @@ namespace Ombi.Schedule.Jobs.Plex
{ {
Logger.LogInformation("Found some episodes, this must be a recently added sync"); Logger.LogInformation("Found some episodes, this must be a recently added sync");
var count = 0; var count = 0;
foreach (var epInfo in content.Metadata) foreach (var epInfo in content.Metadata ?? new Metadata[]{})
{ {
count++; count++;
var grandParentKey = epInfo.grandparentRatingKey; var grandParentKey = epInfo.grandparentRatingKey;
@ -199,9 +199,11 @@ namespace Ombi.Schedule.Jobs.Plex
// Save just to make sure we don't leave anything hanging // Save just to make sure we don't leave anything hanging
await Repo.SaveChangesAsync(); await Repo.SaveChangesAsync();
if (content.Metadata != null)
var episodesAdded = await EpisodeSync.ProcessEpsiodes(content.Metadata, allEps); {
episodesProcessed.AddRange(episodesAdded.Select(x => x.Id)); var episodesAdded = await EpisodeSync.ProcessEpsiodes(content.Metadata, allEps);
episodesProcessed.AddRange(episodesAdded.Select(x => x.Id));
}
} }
if (content.viewGroup.Equals(PlexMediaType.Show.ToString(), StringComparison.CurrentCultureIgnoreCase)) if (content.viewGroup.Equals(PlexMediaType.Show.ToString(), StringComparison.CurrentCultureIgnoreCase))
{ {
@ -350,7 +352,7 @@ namespace Ombi.Schedule.Jobs.Plex
} }
// Do we already have this item? // Do we already have this item?
// Let's try and match // Let's try and match
var existingContent = await Repo.GetFirstContentByCustom(x => x.Title == show.title var existingContent = await Repo.GetFirstContentByCustom(x => x.Title == show.title
&& x.ReleaseYear == show.year.ToString() && x.ReleaseYear == show.year.ToString()
&& x.Type == PlexMediaTypeEntity.Show); && x.Type == PlexMediaTypeEntity.Show);
@ -371,6 +373,10 @@ namespace Ombi.Schedule.Jobs.Plex
await Repo.Delete(existingKey); await Repo.Delete(existingKey);
existingKey = null; existingKey = null;
} }
else if(existingContent == null)
{
existingContent = await Repo.GetFirstContentByCustom(x => x.Key == show.ratingKey);
}
} }
if (existingContent != null) if (existingContent != null)