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

fix slow episode responses

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-25 02:44:24 -04:00
parent 29d0b21a78
commit 916bda6f32
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
MediaBrowser.Controller/Entities/TV/Episode.cs
View File

@ -135,7 +135,10 @@ namespace MediaBrowser.Controller.Entities.TV
[IgnoreDataMember] [IgnoreDataMember]
public Series Series public Series Series
{ {
get { return FindParent<Series>(); } get
{
return SeriesId.HasValue ? (LibraryManager.GetItemById(SeriesId.Value) as Series) : null;
}
} }
[IgnoreDataMember] [IgnoreDataMember]
@ -143,24 +146,7 @@ namespace MediaBrowser.Controller.Entities.TV
{ {
get get
{ {
var season = FindParent<Season>(); return SeasonId.HasValue ? (LibraryManager.GetItemById(SeasonId.Value) as Season) : null;
// Episodes directly in series folder
if (season == null)
{
var series = Series;
if (series != null && ParentIndexNumber.HasValue)
{
var findNumber = ParentIndexNumber.Value;
season = series.Children
.OfType<Season>()
.FirstOrDefault(i => i.IndexNumber.HasValue && i.IndexNumber.Value == findNumber);
}
}
return season;
} }
} }
@ -193,7 +179,23 @@ namespace MediaBrowser.Controller.Entities.TV
public Guid? FindSeasonId() public Guid? FindSeasonId()
{ {
var season = Season; var season = FindParent<Season>();
// Episodes directly in series folder
if (season == null)
{
var series = Series;
if (series != null && ParentIndexNumber.HasValue)
{
var findNumber = ParentIndexNumber.Value;
season = series.Children
.OfType<Season>()
.FirstOrDefault(i => i.IndexNumber.HasValue && i.IndexNumber.Value == findNumber);
}
}
return season == null ? (Guid?)null : season.Id; return season == null ? (Guid?)null : season.Id;
} }
@ -263,7 +265,7 @@ namespace MediaBrowser.Controller.Entities.TV
public Guid? FindSeriesId() public Guid? FindSeriesId()
{ {
var series = Series; var series = FindParent<Series>();
return series == null ? (Guid?)null : series.Id; return series == null ? (Guid?)null : series.Id;
} }

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

@ -99,7 +99,10 @@ namespace MediaBrowser.Controller.Entities.TV
[IgnoreDataMember] [IgnoreDataMember]
public Series Series public Series Series
{ {
get { return FindParent<Series>(); } get
{
return SeriesId.HasValue ? (LibraryManager.GetItemById(SeriesId.Value) as Series) : null;
}
} }
[IgnoreDataMember] [IgnoreDataMember]
@ -241,7 +244,7 @@ namespace MediaBrowser.Controller.Entities.TV
public Guid? FindSeriesId() public Guid? FindSeriesId()
{ {
var series = Series; var series = FindParent<Series>();
return series == null ? (Guid?)null : series.Id; return series == null ? (Guid?)null : series.Id;
} }