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

fix(sonarr): 🐛 Fixed an issue where we could attempt to add a series to sonarr before sonarr has got all the metadata #4459

Browse source
This commit is contained in:
tidusjar 2022-01-14 10:21:54 +00:00
commit 5c691dc984
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Ombi.Core/Senders/TvSender.cs
View file

@ -309,6 +309,20 @@ namespace Ombi.Core.Senders
private async Task SendToSonarr(ChildRequests model, SonarrSeries result, SonarrSettings s) private async Task SendToSonarr(ChildRequests model, SonarrSeries result, SonarrSettings s)
{ {
// Check to ensure we have the all the seasons, ensure the Sonarr metadata has grabbed all the data
foreach (var season in model.SeasonRequests)
{
var attempt = 0;
var existingSeason = result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
while (existingSeason == null && attempt < 5)
{
attempt++;
Logger.LogInformation("There was no season numer {0} in Sonarr for title {1}. Will try again as the metadata did not get created", season.SeasonNumber, model.ParentRequest.Title);
result = await SonarrApi.GetSeriesById(result.id, s.ApiKey, s.FullUri);
await Task.Delay(500);
}
}
var episodesToUpdate = new List<Episode>(); var episodesToUpdate = new List<Episode>();
// Ok, now let's sort out the episodes. // Ok, now let's sort out the episodes.
@ -327,10 +341,11 @@ namespace Ombi.Core.Senders
await Task.Delay(500); await Task.Delay(500);
} }
var seriesChanges = false;
foreach (var req in model.SeasonRequests) foreach (var season in model.SeasonRequests)
{ {
foreach (var ep in req.Episodes) foreach (var ep in season.Episodes)
{ {
var sonarrEp = sonarrEpList.FirstOrDefault(x => var sonarrEp = sonarrEpList.FirstOrDefault(x =>
x.episodeNumber == ep.EpisodeNumber && x.seasonNumber == req.SeasonNumber); x.episodeNumber == ep.EpisodeNumber && x.seasonNumber == req.SeasonNumber);
@ -340,11 +355,6 @@ namespace Ombi.Core.Senders
episodesToUpdate.Add(sonarrEp); episodesToUpdate.Add(sonarrEp);
} }
} }
}
var seriesChanges = false;
foreach (var season in model.SeasonRequests)
{
var sonarrEpisodeList = sonarrEpList.Where(x => x.seasonNumber == season.SeasonNumber).ToList(); var sonarrEpisodeList = sonarrEpList.Where(x => x.seasonNumber == season.SeasonNumber).ToList();
var sonarrEpCount = sonarrEpisodeList.Count; var sonarrEpCount = sonarrEpisodeList.Count;
var ourRequestCount = season.Episodes.Count; var ourRequestCount = season.Episodes.Count;
@ -358,13 +368,7 @@ namespace Ombi.Core.Senders
//var distinctEpisodes = ourEpisodes.Distinct().ToList(); //var distinctEpisodes = ourEpisodes.Distinct().ToList();
//var missingEpisodes = Enumerable.Range(distinctEpisodes.Min(), distinctEpisodes.Count).Except(distinctEpisodes); //var missingEpisodes = Enumerable.Range(distinctEpisodes.Min(), distinctEpisodes.Count).Except(distinctEpisodes);
var existingSeason =
result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
if (existingSeason == null)
{
Logger.LogError("There was no season numer {0} in Sonarr for title {1}", season.SeasonNumber, model.ParentRequest.Title);
continue;
}
if (sonarrEpCount == ourRequestCount /*|| !missingEpisodes.Any()*/) if (sonarrEpCount == ourRequestCount /*|| !missingEpisodes.Any()*/)