make next up smarter using watched history from deleted items

This commit is contained in:
Luke Pulverenti
2013-12-11 14:54:20 -05:00
parent 7ea2bdcf16
commit aa83cb75fd
3 changed files with 49 additions and 40 deletions

View File

@@ -221,6 +221,13 @@ namespace MediaBrowser.Controller.Entities.TV
/// <param name="user">The user.</param>
/// <returns>IEnumerable{Episode}.</returns>
public IEnumerable<Episode> GetEpisodes(User user)
{
var config = user.Configuration;
return GetEpisodes(user, config.DisplayMissingEpisodes, config.DisplayUnairedEpisodes);
}
public IEnumerable<Episode> GetEpisodes(User user, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes)
{
if (IndexNumber.HasValue)
{
@@ -228,13 +235,22 @@ namespace MediaBrowser.Controller.Entities.TV
if (series != null)
{
return series.GetEpisodes(user, IndexNumber.Value);
return series.GetEpisodes(user, IndexNumber.Value, includeMissingEpisodes, includeVirtualUnairedEpisodes);
}
}
var episodes = GetRecursiveChildren(user)
.OfType<Episode>();
if (!includeMissingEpisodes)
{
episodes = episodes.Where(i => !i.IsMissingEpisode);
}
if (!includeVirtualUnairedEpisodes)
{
episodes = episodes.Where(i => !i.IsVirtualUnaired);
}
return LibraryManager
.Sort(episodes, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending)
.Cast<Episode>();