Ombi-app/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-12-11 04:37:57 -06:00
Code Issues Packages Projects Releases 456 Wiki Activity

Merge pull request #5280 from Ombi-app/fix-dupes

Browse Source 
fix(emby): fixed duplicate episodes
This commit is contained in:
Jamie Rees 2025-10-14 22:36:58 +01:00 committed by GitHub
commit 016b6ed42f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs
View File

@ -109,26 +109,31 @@ namespace Ombi.Schedule.Jobs.Emby
var seriesLookup = await _repo.GetAllSeriesEmbyIds();
var episodeLookup = await _repo.GetAllEpisodeEmbyIds();
var total = 0;
var processed = 0;
var epToAdd = new HashSet<EmbyEpisode>();
var episodesInCurrentBatch = new HashSet<string>(); // Track episodes in current batch to avoid duplicates
_logger.LogInformation($"Starting episode sync for server {server.Name}");
// Get initial episode count
EmbyItemContainer<EmbyEpisodes> allEpisodes;
if (recentlyAdded)
{
var recentlyAddedAmountToTake = AmountToTake;
allEpisodes = await Api.RecentlyAddedEpisodes(server.ApiKey, parentIdFilter, 0, recentlyAddedAmountToTake, server.AdministratorId, server.FullUri);
if (allEpisodes.TotalRecordCount > recentlyAddedAmountToTake)
total = allEpisodes.TotalRecordCount;
if (total > recentlyAddedAmountToTake)
{
allEpisodes.TotalRecordCount = recentlyAddedAmountToTake;
total = recentlyAddedAmountToTake;
}
}
else
{
allEpisodes = await Api.GetAllEpisodes(server.ApiKey, parentIdFilter, 0, AmountToTake, server.AdministratorId, server.FullUri);
total = allEpisodes.TotalRecordCount;
}
var total = allEpisodes.TotalRecordCount;
var processed = 0;
var epToAdd = new HashSet<EmbyEpisode>();
var episodesInCurrentBatch = new HashSet<string>(); // Track episodes in current batch to avoid duplicates
_logger.LogInformation($"Processing {total} episodes in chunks of {AmountToTake}");
while (processed < total)
@ -146,9 +151,12 @@ namespace Ombi.Schedule.Jobs.Emby
continue;
}
// Create unique key for multi-episode files to prevent duplicates
var episodeKey = $"{ep.Id}_{ep.IndexNumber}_{ep.ParentIndexNumber}";
// Check if episode already exists using preloaded HashSet (O(1) lookup)
var existingInDatabase = episodeLookup.Contains(ep.Id);
var existingInCurrentBatch = episodesInCurrentBatch.Contains(ep.Id);
var existingInCurrentBatch = episodesInCurrentBatch.Contains(episodeKey);
if (!existingInDatabase && !existingInCurrentBatch)
{
@ -160,6 +168,7 @@ namespace Ombi.Schedule.Jobs.Emby
}
_logger.LogDebug("Adding new episode {0} to parent {1}", ep.Name, ep.SeriesName);
// add it
epToAdd.Add(new EmbyEpisode
{
@ -173,30 +182,36 @@ namespace Ombi.Schedule.Jobs.Emby
Title = ep.Name,
AddedAt = DateTime.UtcNow
});
episodesInCurrentBatch.Add(ep.Id);
episodesInCurrentBatch.Add(episodeKey);
if (ep.IndexNumberEnd.HasValue && ep.IndexNumberEnd.Value != ep.IndexNumber)
{
int episodeNumber = ep.IndexNumber;
do
{
_logger.LogDebug($"Multiple-episode file detected. Adding episode ${episodeNumber}");
episodeNumber++;
epToAdd.Add(new EmbyEpisode
var multiEpisodeKey = $"{ep.Id}_{episodeNumber}_{ep.ParentIndexNumber}";
// Check if this multi-episode entry already exists
if (!episodesInCurrentBatch.Contains(multiEpisodeKey))
{
EmbyId = ep.Id,
EpisodeNumber = episodeNumber,
SeasonNumber = ep.ParentIndexNumber,
ParentId = ep.SeriesId,
TvDbId = ep.ProviderIds.Tvdb,
TheMovieDbId = ep.ProviderIds.Tmdb,
ImdbId = ep.ProviderIds.Imdb,
Title = ep.Name,
AddedAt = DateTime.UtcNow
});
_logger.LogDebug($"Multiple-episode file detected. Adding episode {episodeNumber}");
epToAdd.Add(new EmbyEpisode
{
EmbyId = ep.Id,
EpisodeNumber = episodeNumber,
SeasonNumber = ep.ParentIndexNumber,
ParentId = ep.SeriesId,
TvDbId = ep.ProviderIds.Tvdb,
TheMovieDbId = ep.ProviderIds.Tmdb,
ImdbId = ep.ProviderIds.Imdb,
Title = ep.Name,
AddedAt = DateTime.UtcNow
});
episodesInCurrentBatch.Add(multiEpisodeKey);
}
} while (episodeNumber < ep.IndexNumberEnd.Value);
}
}
}