diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-10 15:42:42 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-10 15:42:42 -0500 |
| commit | 90184470fa8f7c61be978e097326ebab3e413d10 (patch) | |
| tree | 2ea1e874ddbe0646e4f1bdf326ff2e05366ac036 /MediaBrowser.Controller | |
| parent | 7c6581dd0f29b9ccb73105bf80bf0b064e24cb9d (diff) | |
expose episode absolute numbers for editing
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Episode.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Season.cs | 38 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Series.cs | 85 |
3 files changed, 126 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index f24d86408..7f94ab8e8 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -52,6 +52,12 @@ namespace MediaBrowser.Controller.Entities.TV public float? DvdEpisodeNumber { get; set; } /// <summary> + /// Gets or sets the absolute episode number. + /// </summary> + /// <value>The absolute episode number.</value> + public int? AbsoluteEpisodeNumber { get; set; } + + /// <summary> /// We want to group into series not show individually in an index /// </summary> /// <value><c>true</c> if [group in index]; otherwise, <c>false</c>.</value> diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index 78e0b8bc4..3a767421a 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -1,5 +1,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Localization; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Querying; using System; using System.Collections.Generic; using System.IO; @@ -186,7 +188,7 @@ namespace MediaBrowser.Controller.Entities.TV [IgnoreDataMember] public bool IsMissingSeason { - get { return LocationType == Model.Entities.LocationType.Virtual && GetEpisodes().All(i => i.IsMissingEpisode); } + get { return LocationType == LocationType.Virtual && GetEpisodes().All(i => i.IsMissingEpisode); } } [IgnoreDataMember] @@ -198,13 +200,13 @@ namespace MediaBrowser.Controller.Entities.TV [IgnoreDataMember] public bool IsVirtualUnaired { - get { return LocationType == Model.Entities.LocationType.Virtual && IsUnaired; } + get { return LocationType == LocationType.Virtual && IsUnaired; } } [IgnoreDataMember] public bool IsMissingOrVirtualUnaired { - get { return LocationType == Model.Entities.LocationType.Virtual && GetEpisodes().All(i => i.IsVirtualUnaired || i.IsMissingEpisode); } + get { return LocationType == LocationType.Virtual && GetEpisodes().All(i => i.IsVirtualUnaired || i.IsMissingEpisode); } } [IgnoreDataMember] @@ -212,5 +214,35 @@ namespace MediaBrowser.Controller.Entities.TV { get { return (IndexNumber ?? -1) == 0; } } + + /// <summary> + /// Gets the episodes. + /// </summary> + /// <param name="user">The user.</param> + /// <returns>IEnumerable{Episode}.</returns> + public IEnumerable<Episode> GetEpisodes(User user) + { + if (IndexNumber.HasValue) + { + var series = Series; + + if (series != null) + { + return series.GetEpisodes(user, IndexNumber.Value); + } + } + + var episodes = GetRecursiveChildren(user) + .OfType<Episode>(); + + return LibraryManager + .Sort(episodes, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending) + .Cast<Episode>(); + } + + public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren, string indexBy = null) + { + return GetEpisodes(user); + } } } diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs index 2312df2a1..1c4bef942 100644 --- a/MediaBrowser.Controller/Entities/TV/Series.cs +++ b/MediaBrowser.Controller/Entities/TV/Series.cs @@ -1,6 +1,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Localization; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Querying; using System; using System.Collections.Generic; using System.IO; @@ -117,5 +118,89 @@ namespace MediaBrowser.Controller.Entities.TV return Children.OfType<Video>().Any(); } } + + public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren, string indexBy = null) + { + return GetSeasons(user); + } + + public IEnumerable<Season> GetSeasons(User user) + { + var seasons = base.GetChildren(user, true) + .OfType<Season>(); + + var config = user.Configuration; + + if (!config.DisplayMissingEpisodes && !config.DisplayUnairedEpisodes) + { + seasons = seasons.Where(i => !i.IsMissingOrVirtualUnaired); + } + else + { + if (!config.DisplayMissingEpisodes) + { + seasons = seasons.Where(i => !i.IsMissingSeason); + } + if (!config.DisplayUnairedEpisodes) + { + seasons = seasons.Where(i => !i.IsVirtualUnaired); + } + } + + return LibraryManager + .Sort(seasons, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending) + .Cast<Season>(); + } + + public IEnumerable<Episode> GetEpisodes(User user, int seasonNumber) + { + var episodes = GetRecursiveChildren(user) + .OfType<Episode>(); + + episodes = FilterEpisodesBySeason(episodes, seasonNumber, true); + + var config = user.Configuration; + + if (!config.DisplayMissingEpisodes) + { + episodes = episodes.Where(i => !i.IsMissingEpisode); + } + if (!config.DisplayUnairedEpisodes) + { + episodes = episodes.Where(i => !i.IsVirtualUnaired); + } + + return LibraryManager.Sort(episodes, user, new[] { ItemSortBy.AiredEpisodeOrder }, SortOrder.Ascending) + .Cast<Episode>(); + } + + /// <summary> + /// Filters the episodes by season. + /// </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) + { + if (!includeSpecials || seasonNumber < 1) + { + return episodes.Where(i => (i.PhysicalSeasonNumber ?? -1) == seasonNumber); + } + + return episodes.Where(i => + { + var episode = i; + + if (episode != null) + { + var currentSeasonNumber = episode.AiredSeasonNumber; + + return currentSeasonNumber.HasValue && currentSeasonNumber.Value == seasonNumber; + } + + return false; + }); + } } } |
