diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 116997d96d..7e8540ebe7 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -1,7 +1,4 @@ -using MediaBrowser.Common.Extensions; -using MediaBrowser.Model.Entities; -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; @@ -131,20 +128,6 @@ namespace MediaBrowser.Controller.Entities.TV } } - /// - /// We persist the MB Id of our series object so we can always find it no matter - /// what context we happen to be loaded from. - /// - /// The series item id. - public Guid SeriesItemId { get; set; } - - /// - /// We persist the MB Id of our season object so we can always find it no matter - /// what context we happen to be loaded from. - /// - /// The season item id. - public Guid SeasonItemId { get; set; } - /// /// The _series /// diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index 79d6084591..b4dc3eae40 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -1,11 +1,8 @@ -using System.Collections.Generic; -using System.IO; -using MediaBrowser.Common.Extensions; -using MediaBrowser.Controller.IO; -using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Localization; -using MediaBrowser.Model.Entities; using System; +using System.Collections.Generic; +using System.IO; using System.Runtime.Serialization; namespace MediaBrowser.Controller.Entities.TV @@ -82,13 +79,6 @@ namespace MediaBrowser.Controller.Entities.TV return base.GetUserDataKey(); } - /// - /// We persist the MB Id of our series object so we can always find it no matter - /// what context we happen to be loaded from. - /// - /// The series item id. - public Guid SeriesItemId { get; set; } - /// /// The _series /// diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs index cc9016190e..3969acac78 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs @@ -2,7 +2,6 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Entities; -using System; namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { @@ -71,32 +70,5 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV return null; } - - /// - /// Sets the initial item values. - /// - /// The item. - /// The args. - protected override void SetInitialItemValues(Episode item, ItemResolveArgs args) - { - base.SetInitialItemValues(item, args); - - //fill in our season and series ids - var season = args.Parent as Season; - if (season != null) - { - item.SeasonItemId = season.Id; - var series = season.Parent as Series; - if (series != null) - { - item.SeriesItemId = series.Id; - } - } - else - { - var series = args.Parent as Series; - item.SeriesItemId = series != null ? series.Id : Guid.Empty; - } - } } } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs index 7ad5d08db6..c426fed25e 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs @@ -1,7 +1,6 @@ using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; -using System; namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { @@ -58,9 +57,6 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { base.SetInitialItemValues(item, args); - var series = args.Parent as Series; - item.SeriesItemId = series != null ? series.Id : Guid.Empty; - Season.AddMetadataFiles(args); } }