lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update episode filters

Browse Source
This commit is contained in:
Luke Pulverenti 2016-05-24 15:48:53 -04:00
parent e562ab0e9c
commit d2692fb229
3 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Api/TvShowsService.cs
View File

@ -456,7 +456,16 @@ namespace MediaBrowser.Api
throw new ResourceNotFoundException("No series exists with Id " + request.Id); throw new ResourceNotFoundException("No series exists with Id " + request.Id);
} }
episodes = series.GetEpisodes(user, request.Season.Value); var season = series.GetSeasons(user).FirstOrDefault(i => i.IndexNumber == request.Season.Value);
if (season == null)
{
episodes = new List<Episode>();
}
else
{
episodes = series.GetEpisodes(user, season);
}
} }
else else
{ {

2
MediaBrowser.Controller/Entities/TV/Season.cs
View File

@ -205,7 +205,7 @@ namespace MediaBrowser.Controller.Entities.TV
if (IndexNumber.HasValue && series != null) if (IndexNumber.HasValue && series != null)
{ {
return series.GetEpisodes(user, IndexNumber.Value, includeMissingEpisodes, includeVirtualUnairedEpisodes); return series.GetEpisodes(user, this, includeMissingEpisodes, includeVirtualUnairedEpisodes);
} }
var episodes = GetRecursiveChildren(user) var episodes = GetRecursiveChildren(user)

54
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@ -338,11 +338,11 @@ namespace MediaBrowser.Controller.Entities.TV
progress.Report(100); progress.Report(100);
} }
public IEnumerable<Episode> GetEpisodes(User user, int seasonNumber) public IEnumerable<Episode> GetEpisodes(User user, Season season)
{ {
var config = user.Configuration; var config = user.Configuration;
return GetEpisodes(user, seasonNumber, config.DisplayMissingEpisodes, config.DisplayUnairedEpisodes); return GetEpisodes(user, season, config.DisplayMissingEpisodes, config.DisplayUnairedEpisodes);
} }
private bool EnablePooling() private bool EnablePooling()
@ -350,7 +350,7 @@ namespace MediaBrowser.Controller.Entities.TV
return false; return false;
} }
public IEnumerable<Episode> GetEpisodes(User user, int seasonNumber, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes) public IEnumerable<Episode> GetEpisodes(User user, Season parentSeason, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes)
{ {
IEnumerable<Episode> episodes; IEnumerable<Episode> episodes;
@ -388,7 +388,7 @@ namespace MediaBrowser.Controller.Entities.TV
}).Cast<Episode>(); }).Cast<Episode>();
} }
episodes = FilterEpisodesBySeason(episodes, seasonNumber, DisplaySpecialsWithSeasons); episodes = FilterEpisodesBySeason(episodes, parentSeason, DisplaySpecialsWithSeasons);
if (!includeMissingEpisodes) if (!includeMissingEpisodes)
{ {
@ -399,7 +399,7 @@ namespace MediaBrowser.Controller.Entities.TV
episodes = episodes.Where(i => !i.IsVirtualUnaired); episodes = episodes.Where(i => !i.IsVirtualUnaired);
} }
var sortBy = seasonNumber == 0 ? ItemSortBy.SortName : ItemSortBy.AiredEpisodeOrder; var sortBy = (parentSeason.IndexNumber ?? -1) == 0 ? ItemSortBy.SortName : ItemSortBy.AiredEpisodeOrder;
return LibraryManager.Sort(episodes, user, new[] { sortBy }, SortOrder.Ascending) return LibraryManager.Sort(episodes, user, new[] { sortBy }, SortOrder.Ascending)
.Cast<Episode>(); .Cast<Episode>();
@ -408,10 +408,6 @@ namespace MediaBrowser.Controller.Entities.TV
/// <summary> /// <summary>
/// Filters the episodes by season. /// Filters the episodes by season.
/// </summary> /// </summary>
/// <param name="episodes">The episodes.</param>
/// <param name="seasonNumber">The season number.</param>
/// <param name="includeSpecials">if set to <c>true</c> [include specials].</param>
/// <returns>IEnumerable{Episode}.</returns>
public static IEnumerable<Episode> FilterEpisodesBySeason(IEnumerable<Episode> episodes, int seasonNumber, bool includeSpecials) public static IEnumerable<Episode> FilterEpisodesBySeason(IEnumerable<Episode> episodes, int seasonNumber, bool includeSpecials)
{ {
if (!includeSpecials || seasonNumber < 1) if (!includeSpecials || seasonNumber < 1)
@ -434,6 +430,46 @@ namespace MediaBrowser.Controller.Entities.TV
}); });
} }
/// <summary>
/// Filters the episodes by season.
/// </summary>
public static IEnumerable<Episode> FilterEpisodesBySeason(IEnumerable<Episode> episodes, Season parentSeason, bool includeSpecials)
{
var seasonNumber = parentSeason.IndexNumber;
if (!includeSpecials || (seasonNumber.HasValue && seasonNumber.Value == 0))
{
var seasonPresentationKey = parentSeason.PresentationUniqueKey;
return episodes.Where(i =>
{
if ((i.ParentIndexNumber ?? -1) == seasonNumber)
{
return true;
}
var season = i.Season;
return season != null && string.Equals(season.PresentationUniqueKey, seasonPresentationKey, StringComparison.OrdinalIgnoreCase);
});
}
else
{
var seasonPresentationKey = parentSeason.PresentationUniqueKey;
return episodes.Where(episode =>
{
var currentSeasonNumber = episode.AiredSeasonNumber;
if (currentSeasonNumber.HasValue && seasonNumber.HasValue && currentSeasonNumber.Value == seasonNumber.Value)
{
return true;
}
var season = episode.Season;
return season != null && string.Equals(season.PresentationUniqueKey, seasonPresentationKey, StringComparison.OrdinalIgnoreCase);
});
}
}
protected override bool GetBlockUnratedValue(UserPolicy config) protected override bool GetBlockUnratedValue(UserPolicy config)
{ {
return config.BlockUnratedItems.Contains(UnratedItem.Series); return config.BlockUnratedItems.Contains(UnratedItem.Series);