open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add names to tuple items and reduce list iterations

Browse Source
pull/776/head
Claus Vium 6 years ago
parent 6887e790c8
commit b997b12d27
1 changed files with 78 additions and 85 deletions
Show Stats Download Patch File Download Diff File

163
MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
Unescape View File

@ -30,6 +30,7 @@ namespace MediaBrowser.Providers.TV
private readonly IFileSystem _fileSystem; private readonly IFileSystem _fileSystem;
private readonly CultureInfo _usCulture = new CultureInfo("en-US"); private readonly CultureInfo _usCulture = new CultureInfo("en-US");
private const double UnairedEpisodeThresholdDays = 2;
public MissingEpisodeProvider(ILogger logger, IServerConfigurationManager config, ILibraryManager libraryManager, ILocalizationManager localization, IFileSystem fileSystem) public MissingEpisodeProvider(ILogger logger, IServerConfigurationManager config, ILibraryManager libraryManager, ILocalizationManager localization, IFileSystem fileSystem)
{ {
@ -54,10 +55,13 @@ namespace MediaBrowser.Providers.TV
.Select(i => .Select(i =>
{ {
DateTime.TryParse(i.FirstAired, out var firstAired); DateTime.TryParse(i.FirstAired, out var firstAired);
return new ValueTuple<int, int, DateTime>( var seasonNumber = i.AiredSeason.GetValueOrDefault(-1);
i.AiredSeason.GetValueOrDefault(-1), i.AiredEpisodeNumber.GetValueOrDefault(-1), firstAired); var episodeNumber = i.AiredEpisodeNumber.GetValueOrDefault(-1);
return (SeasonNumber: seasonNumber, EpisodeNumber: episodeNumber, firstAired: firstAired);
}) })
.Where(i => i.Item1 != -1 && i.Item2 != -1) .Where(i => i.SeasonNumber != -1 && i.EpisodeNumber != -1)
.OrderBy(i => i.SeasonNumber)
.ThenBy(i => i.EpisodeNumber)
.ToList(); .ToList();
var allRecursiveChildren = series.GetRecursiveChildren(); var allRecursiveChildren = series.GetRecursiveChildren();
@ -118,37 +122,25 @@ namespace MediaBrowser.Providers.TV
}); });
} }
private const double UnairedEpisodeThresholdDays = 2;
private async Task<bool> AddMissingEpisodes( private async Task<bool> AddMissingEpisodes(
Series series, Series series,
IList<BaseItem> allItems, IEnumerable<BaseItem> allItems,
bool addMissingEpisodes, bool addMissingEpisodes,
List<ValueTuple<int, int, DateTime>> episodeLookup, IReadOnlyCollection<(int SeasonNumber, int Episodenumber, DateTime FirstAired)> episodeLookup,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var existingEpisodes = allItems.OfType<Episode>() var existingEpisodes = allItems.OfType<Episode>()
.ToList(); .ToList();
var seasonCounts = (from e in episodeLookup var seasonCounts = episodeLookup.GroupBy(e => e.SeasonNumber).ToDictionary(g => g.Key, g => g.Count());
group e by e.Item1 into g
select g)
.ToDictionary(g => g.Key, g => g.Count());
var hasChanges = false; var hasChanges = false;
foreach (var tuple in episodeLookup) foreach (var tuple in episodeLookup)
{ {
if (tuple.Item1 <= 0) if (tuple.SeasonNumber <= 0 || tuple.Episodenumber <= 0)
{ {
// Ignore season zeros // Ignore episode/season zeros
continue;
}
if (tuple.Item2 <= 0)
{
// Ignore episode zeros
continue; continue;
} }
@ -159,15 +151,15 @@ namespace MediaBrowser.Providers.TV
continue; continue;
} }
var airDate = tuple.Item3; var airDate = tuple.FirstAired;
var now = DateTime.UtcNow.AddDays(0 - UnairedEpisodeThresholdDays); var now = DateTime.UtcNow.AddDays(0 - UnairedEpisodeThresholdDays);
if (airDate < now && addMissingEpisodes || airDate > now) if (airDate < now && addMissingEpisodes || airDate > now)
{ {
// tvdb has a lot of nearly blank episodes // tvdb has a lot of nearly blank episodes
_logger.LogInformation("Creating virtual missing/unaired episode {0} {1}x{2}", series.Name, tuple.Item1, tuple.Item2); _logger.LogInformation("Creating virtual missing/unaired episode {0} {1}x{2}", series.Name, tuple.SeasonNumber, tuple.Episodenumber);
await AddEpisode(series, tuple.Item1, tuple.Item2, cancellationToken).ConfigureAwait(false); await AddEpisode(series, tuple.SeasonNumber, tuple.Episodenumber, cancellationToken).ConfigureAwait(false);
hasChanges = true; hasChanges = true;
} }
@ -180,58 +172,57 @@ namespace MediaBrowser.Providers.TV
/// Removes the virtual entry after a corresponding physical version has been added /// Removes the virtual entry after a corresponding physical version has been added
/// </summary> /// </summary>
private bool RemoveObsoleteOrMissingEpisodes( private bool RemoveObsoleteOrMissingEpisodes(
IList<BaseItem> allRecursiveChildren, IEnumerable<BaseItem> allRecursiveChildren,
IEnumerable<ValueTuple<int, int, DateTime>> episodeLookup, IEnumerable<(int SeasonNumber, int EpisodeNumber, DateTime FirstAired)> episodeLookup,
bool allowMissingEpisodes) bool allowMissingEpisodes)
{ {
var existingEpisodes = allRecursiveChildren.OfType<Episode>() var existingEpisodes = allRecursiveChildren.OfType<Episode>();
.ToList();
var physicalEpisodes = existingEpisodes
.Where(i => i.LocationType != LocationType.Virtual)
.ToList();
var virtualEpisodes = existingEpisodes var physicalEpisodes = new List<Episode>();
.Where(i => i.LocationType == LocationType.Virtual) var virtualEpisodes = new List<Episode>();
.ToList(); foreach (var episode in existingEpisodes)
{
if (episode.LocationType == LocationType.Virtual)
{
virtualEpisodes.Add(episode);
}
else
{
physicalEpisodes.Add(episode);
}
}
var episodesToRemove = virtualEpisodes var episodesToRemove = virtualEpisodes
.Where(i => .Where(i =>
{ {
if (i.IndexNumber.HasValue && i.ParentIndexNumber.HasValue) if (!i.IndexNumber.HasValue || !i.ParentIndexNumber.HasValue)
{ {
var seasonNumber = i.ParentIndexNumber.Value; return true;
var episodeNumber = i.IndexNumber.Value; }
// If there's a physical episode with the same season and episode number, delete it
if (physicalEpisodes.Any(p =>
p.ParentIndexNumber.HasValue && (p.ParentIndexNumber.Value) == seasonNumber &&
p.ContainsEpisodeNumber(episodeNumber)))
{
return true;
}
// If the episode no longer exists in the remote lookup, delete it var seasonNumber = i.ParentIndexNumber.Value;
if (!episodeLookup.Any(e => e.Item1 == seasonNumber && e.Item2 == episodeNumber)) var episodeNumber = i.IndexNumber.Value;
{
return true;
}
if (!allowMissingEpisodes && i.IsMissingEpisode) // If there's a physical episode with the same season and episode number, delete it
{ if (physicalEpisodes.Any(p =>
// If it's missing, but not unaired, remove it p.ParentIndexNumber.HasValue && p.ParentIndexNumber.Value == seasonNumber &&
if (!i.PremiereDate.HasValue || i.PremiereDate.Value.ToLocalTime().Date.AddDays(UnairedEpisodeThresholdDays) < DateTime.Now.Date) p.ContainsEpisodeNumber(episodeNumber)))
{ {
return true; return true;
} }
}
return false; // If the episode no longer exists in the remote lookup, delete it
if (!episodeLookup.Any(e => e.SeasonNumber == seasonNumber && e.EpisodeNumber == episodeNumber))
{
return true;
} }
return true; // If it's missing, but not unaired, remove it
}) return !allowMissingEpisodes && i.IsMissingEpisode &&
.ToList(); (!i.PremiereDate.HasValue ||
i.PremiereDate.Value.ToLocalTime().Date.AddDays(UnairedEpisodeThresholdDays) <
DateTime.Now.Date);
});
var hasChanges = false; var hasChanges = false;
@ -240,7 +231,6 @@ namespace MediaBrowser.Providers.TV
_libraryManager.DeleteItem(episodeToRemove, new DeleteOptions _libraryManager.DeleteItem(episodeToRemove, new DeleteOptions
{ {
DeleteFileLocation = true DeleteFileLocation = true
}, false); }, false);
hasChanges = true; hasChanges = true;
@ -256,17 +246,23 @@ namespace MediaBrowser.Providers.TV
/// <param name="episodeLookup">The episode lookup.</param> /// <param name="episodeLookup">The episode lookup.</param>
/// <returns>Task{System.Boolean}.</returns> /// <returns>Task{System.Boolean}.</returns>
private bool RemoveObsoleteOrMissingSeasons(IList<BaseItem> allRecursiveChildren, private bool RemoveObsoleteOrMissingSeasons(IList<BaseItem> allRecursiveChildren,
IEnumerable<(int, int, DateTime)> episodeLookup) IEnumerable<(int SeasonNumber, int EpisodeNumber, DateTime FirstAired)> episodeLookup)
{ {
var existingSeasons = allRecursiveChildren.OfType<Season>().ToList(); var existingSeasons = allRecursiveChildren.OfType<Season>().ToList();
var physicalSeasons = existingSeasons var physicalSeasons = new List<Season>();
.Where(i => i.LocationType != LocationType.Virtual) var virtualSeasons = new List<Season>();
.ToList(); foreach (var season in existingSeasons)
{
var virtualSeasons = existingSeasons if (season.LocationType == LocationType.Virtual)
.Where(i => i.LocationType == LocationType.Virtual) {
.ToList(); virtualSeasons.Add(season);
}
else
{
physicalSeasons.Add(season);
}
}
var allEpisodes = allRecursiveChildren.OfType<Episode>().ToList(); var allEpisodes = allRecursiveChildren.OfType<Episode>().ToList();
@ -278,13 +274,13 @@ namespace MediaBrowser.Providers.TV
var seasonNumber = i.IndexNumber.Value; var seasonNumber = i.IndexNumber.Value;
// If there's a physical season with the same number, delete it // If there's a physical season with the same number, delete it
if (physicalSeasons.Any(p => p.IndexNumber.HasValue && (p.IndexNumber.Value) == seasonNumber && string.Equals(p.Series.PresentationUniqueKey, i.Series.PresentationUniqueKey, StringComparison.Ordinal))) if (physicalSeasons.Any(p => p.IndexNumber.HasValue && p.IndexNumber.Value == seasonNumber && string.Equals(p.Series.PresentationUniqueKey, i.Series.PresentationUniqueKey, StringComparison.Ordinal)))
{ {
return true; return true;
} }
// If the season no longer exists in the remote lookup, delete it, but only if an existing episode doesn't require it // If the season no longer exists in the remote lookup, delete it, but only if an existing episode doesn't require it
if (episodeLookup.All(e => e.Item1 != seasonNumber)) if (episodeLookup.All(e => e.SeasonNumber != seasonNumber))
{ {
if (allEpisodes.All(s => s.ParentIndexNumber != seasonNumber || s.IsInSeasonFolder)) if (allEpisodes.All(s => s.ParentIndexNumber != seasonNumber || s.IsInSeasonFolder))
{ {
@ -298,8 +294,7 @@ namespace MediaBrowser.Providers.TV
// Season does not have a number // Season does not have a number
// Remove if there are no episodes directly in series without a season number // Remove if there are no episodes directly in series without a season number
return allEpisodes.All(s => s.ParentIndexNumber.HasValue || s.IsInSeasonFolder); return allEpisodes.All(s => s.ParentIndexNumber.HasValue || s.IsInSeasonFolder);
}) });
.ToList();
var hasChanges = false; var hasChanges = false;
@ -343,14 +338,12 @@ namespace MediaBrowser.Providers.TV
Name = name, Name = name,
IndexNumber = episodeNumber, IndexNumber = episodeNumber,
ParentIndexNumber = seasonNumber, ParentIndexNumber = seasonNumber,
Id = _libraryManager.GetNewItemId((series.Id + seasonNumber.ToString(_usCulture) + name), typeof(Episode)), Id = _libraryManager.GetNewItemId(series.Id + seasonNumber.ToString(_usCulture) + name, typeof(Episode)),
IsVirtualItem = true, IsVirtualItem = true,
SeasonId = season?.Id ?? Guid.Empty, SeasonId = season?.Id ?? Guid.Empty,
SeriesId = series.Id SeriesId = series.Id
}; };
episode.SetParent(season);
season.AddChild(episode, cancellationToken); season.AddChild(episode, cancellationToken);
await episode.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_logger, _fileSystem)), cancellationToken).ConfigureAwait(false); await episode.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_logger, _fileSystem)), cancellationToken).ConfigureAwait(false);
@ -363,21 +356,21 @@ namespace MediaBrowser.Providers.TV
/// <param name="seasonCounts"></param> /// <param name="seasonCounts"></param>
/// <param name="tuple">The tuple.</param> /// <param name="tuple">The tuple.</param>
/// <returns>Episode.</returns> /// <returns>Episode.</returns>
private Episode GetExistingEpisode(IList<Episode> existingEpisodes, Dictionary<int, int> seasonCounts, ValueTuple<int, int, DateTime> tuple) private Episode GetExistingEpisode(IList<Episode> existingEpisodes, Dictionary<int, int> seasonCounts, (int SeasonNumber, int EpisodeNumber, DateTime FirstAired) episodeTuple)
{ {
var s = tuple.Item1; var seasonNumber = episodeTuple.SeasonNumber;
var e = tuple.Item2; var episodeNumber = episodeTuple.EpisodeNumber;
while (true) while (true)
{ {
var episode = GetExistingEpisode(existingEpisodes, s, e); var episode = GetExistingEpisode(existingEpisodes, seasonNumber, episodeNumber);
if (episode != null) if (episode != null)
return episode; return episode;
s--; seasonNumber--;
if (seasonCounts.ContainsKey(s)) if (seasonCounts.ContainsKey(seasonNumber))
e += seasonCounts[s]; episodeNumber += seasonCounts[seasonNumber];
else else
break; break;
} }

Write Preview
Loading…
Cancel
Save