diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Dto/IDtoService.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Episode.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Season.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs | 4 |
5 files changed, 23 insertions, 16 deletions
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs index b3917d70b..61b2caec0 100644 --- a/MediaBrowser.Controller/Dto/IDtoService.cs +++ b/MediaBrowser.Controller/Dto/IDtoService.cs @@ -1,8 +1,6 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Dto; -using MediaBrowser.Model.Entities; using MediaBrowser.Model.Querying; -using System; using System.Collections.Generic; namespace MediaBrowser.Controller.Dto @@ -13,14 +11,6 @@ namespace MediaBrowser.Controller.Dto public interface IDtoService { /// <summary> - /// Gets the user dto. - /// </summary> - /// <param name="user">The user.</param> - /// <returns>UserDto.</returns> - [Obsolete] - UserDto GetUserDto(User user); - - /// <summary> /// Gets the dto id. /// </summary> /// <param name="item">The item.</param> diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 313716695..3193ad091 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -429,6 +429,12 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public virtual BaseItem DisplayParent + { + get { return Parent; } + } + /// <summary> /// When the item first debuted. For movies this could be premiere date, episodes would be first aired /// </summary> @@ -548,7 +554,7 @@ namespace MediaBrowser.Controller.Entities return CustomRating; } - var parent = Parent; + var parent = DisplayParent; if (parent != null) { return parent.CustomRatingForComparison; diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 87074ca02..be7867e06 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -104,6 +104,15 @@ namespace MediaBrowser.Controller.Entities.TV } } + [IgnoreDataMember] + public override BaseItem DisplayParent + { + get + { + return Season ?? Parent; + } + } + /// <summary> /// Gets the user data key. /// </summary> @@ -153,7 +162,7 @@ namespace MediaBrowser.Controller.Entities.TV // Episodes directly in series folder if (season == null) { - var series = FindParent<Series>(); + var series = Series; if (ParentIndexNumber.HasValue) { diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index 6804b29b7..542628196 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -44,6 +44,12 @@ namespace MediaBrowser.Controller.Entities.TV } } + [IgnoreDataMember] + public override BaseItem DisplayParent + { + get { return Series ?? Parent; } + } + /// <summary> /// We want to group into our Series /// </summary> diff --git a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs index dd07979d3..e7dcd03b5 100644 --- a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs +++ b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs @@ -14,10 +14,6 @@ namespace MediaBrowser.Controller.Providers public MetadataRefreshMode MetadataRefreshMode { get; set; } - /// <summary> - /// TODO: deprecate. Keeping this for now, for api compatibility - /// </summary> - [Obsolete] public bool ForceSave { get; set; } public MetadataRefreshOptions() |