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

Fixed the issue with the Recently Added Sync sometimes not working as expected

Browse source
This commit is contained in:
Jamie 2018-06-06 21:10:42 +01:00
commit 02f941767e
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ namespace Ombi.Schedule.Jobs.Plex
private async Task<IEnumerable<int>> ProcessServer(PlexServers servers, bool recentlyAddedSearch)
{
var processedContent = new HashSet<int>();
var processedContent = new Dictionary<int,int>();
Logger.LogInformation("Getting all content from server {0}", servers.Name);
var allContent = await GetAllContent(servers, recentlyAddedSearch);
Logger.LogInformation("We found {0} items", allContent.Count);
@ -175,7 +175,7 @@ namespace Ombi.Schedule.Jobs.Plex
continue;
}
await ProcessTvShow(servers, show, contentToAdd, recentlyAddedSearch, processedContent);
await ProcessTvShow(servers, show, contentToAdd, processedContent);
if (contentToAdd.Any())
{
await Repo.AddRange(contentToAdd, false);
@ -183,7 +183,7 @@ namespace Ombi.Schedule.Jobs.Plex
{
foreach (var plexServerContent in contentToAdd)
{
processedContent.Add(plexServerContent.Id);
processedContent.Add(plexServerContent.Id, plexServerContent.Key);
}
}
contentToAdd.Clear();
@ -208,7 +208,7 @@ namespace Ombi.Schedule.Jobs.Plex
foreach (var show in content.Metadata ?? new Metadata[] { })
{
count++;
await ProcessTvShow(servers, show, contentToAdd, recentlyAddedSearch, processedContent);
await ProcessTvShow(servers, show, contentToAdd, processedContent);
if (contentToAdd.Any())
{
@ -217,7 +217,7 @@ namespace Ombi.Schedule.Jobs.Plex
{
foreach (var plexServerContent in contentToAdd)
{
processedContent.Add(plexServerContent.Id);
processedContent.Add(plexServerContent.Id, plexServerContent.Key);
}
}
contentToAdd.Clear();
@ -299,7 +299,7 @@ namespace Ombi.Schedule.Jobs.Plex
await Repo.AddRange(contentToAdd);
foreach (var c in contentToAdd)
{
processedContent.Add(c.Id);
processedContent.Add(c.Id, c.Key);
}
contentToAdd.Clear();
}
@ -310,7 +310,7 @@ namespace Ombi.Schedule.Jobs.Plex
await Repo.AddRange(contentToAdd);
foreach (var c in contentToAdd)
{
processedContent.Add(c.Id);
processedContent.Add(c.Id, c.Key);
}
contentToAdd.Clear();
}
@ -321,14 +321,14 @@ namespace Ombi.Schedule.Jobs.Plex
await Repo.AddRange(contentToAdd);
foreach (var c in contentToAdd)
{
processedContent.Add(c.Id);
processedContent.Add(c.Id, c.Key);
}
}
return processedContent;
return processedContent.Values;
}
private async Task ProcessTvShow(PlexServers servers, Metadata show, HashSet<PlexServerContent> contentToAdd, bool recentlyAdded, HashSet<int> contentProcessed)
private async Task ProcessTvShow(PlexServers servers, Metadata show, HashSet<PlexServerContent> contentToAdd, Dictionary<int,int> contentProcessed)
{
var seasonList = await PlexApi.GetSeasons(servers.PlexAuthToken, servers.FullUri,
show.ratingKey);
@ -349,7 +349,7 @@ namespace Ombi.Schedule.Jobs.Plex
var existingContent = await Repo.GetFirstContentByCustom(x => x.Title == show.title
&& x.ReleaseYear == show.year.ToString()
&& x.Type == PlexMediaTypeEntity.Show);
// Just double check the rating key, since this is our unique constraint
var existingKey = await Repo.GetByKey(show.ratingKey);
@ -397,6 +397,13 @@ namespace Ombi.Schedule.Jobs.Plex
}
}
// Also make sure it's not already being processed...
var alreadyProcessed = contentProcessed.Select(x => x.Value).Any(x => x == show.ratingKey);
if (alreadyProcessed)
{
return;
}
// The ratingKey keeps changing...
//var existingContent = await Repo.GetByKey(show.ratingKey);
if (existingContent != null)