diff options
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 24 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/ILibraryItem.cs (renamed from MediaBrowser.Controller/Entities/IBaseItem.cs) | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Episode.cs | 42 |
3 files changed, 2 insertions, 66 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 47b5247c3..c887f6977 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -23,7 +23,7 @@ namespace MediaBrowser.Controller.Entities /// <summary> /// Class BaseItem /// </summary> - public abstract class BaseItem : IHasProviderIds, IBaseItem, IHasImages, IHasUserData + public abstract class BaseItem : IHasProviderIds, ILibraryItem, IHasImages, IHasUserData { protected BaseItem() { @@ -505,28 +505,6 @@ namespace MediaBrowser.Controller.Entities public List<PersonInfo> People { get; set; } /// <summary> - /// Override this if you need to combine/collapse person information - /// </summary> - /// <value>All people.</value> - [IgnoreDataMember] - public virtual IEnumerable<PersonInfo> AllPeople - { - get { return People; } - } - - [IgnoreDataMember] - public virtual IEnumerable<string> AllStudios - { - get { return Studios; } - } - - [IgnoreDataMember] - public virtual IEnumerable<string> AllGenres - { - get { return Genres; } - } - - /// <summary> /// Gets or sets the studios. /// </summary> /// <value>The studios.</value> diff --git a/MediaBrowser.Controller/Entities/IBaseItem.cs b/MediaBrowser.Controller/Entities/ILibraryItem.cs index 83ccd55b0..b2f39608f 100644 --- a/MediaBrowser.Controller/Entities/IBaseItem.cs +++ b/MediaBrowser.Controller/Entities/ILibraryItem.cs @@ -5,7 +5,7 @@ namespace MediaBrowser.Controller.Entities /// <summary> /// Interface ILibraryItem /// </summary> - public interface IBaseItem + public interface ILibraryItem { /// <summary> /// Gets the name. diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 42897e09f..61bf14543 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -123,48 +123,6 @@ namespace MediaBrowser.Controller.Entities.TV } /// <summary> - /// Override this if you need to combine/collapse person information - /// </summary> - /// <value>All people.</value> - [IgnoreDataMember] - public override IEnumerable<PersonInfo> AllPeople - { - get - { - if (People == null) return Series != null ? Series.People : People; - return Series != null && Series.People != null ? People.Concat(Series.People) : base.AllPeople; - } - } - - /// <summary> - /// Gets all genres. - /// </summary> - /// <value>All genres.</value> - [IgnoreDataMember] - public override IEnumerable<string> AllGenres - { - get - { - if (Genres == null) return Series != null ? Series.Genres : Genres; - return Series != null && Series.Genres != null ? Genres.Concat(Series.Genres) : base.AllGenres; - } - } - - /// <summary> - /// Gets all studios. - /// </summary> - /// <value>All studios.</value> - [IgnoreDataMember] - public override IEnumerable<string> AllStudios - { - get - { - if (Studios == null) return Series != null ? Series.Studios : Studios; - return Series != null && Series.Studios != null ? Studios.Concat(Series.Studios) : base.AllStudios; - } - } - - /// <summary> /// Our rating comes from our series /// </summary> [IgnoreDataMember] |