alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-14 06:12:17 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update DisplayParent

Browse Source
This commit is contained in:
Luke Pulverenti
2016-04-09 00:16:53 -04:00
parent a95cbac076
commit 2ec515027f
11 changed files with 67 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -306,7 +306,7 @@ namespace MediaBrowser.Controller.Entities
}
}
private List<Tuple<StringBuilder,bool>> GetSortChunks(string s1)
private List<Tuple<StringBuilder, bool>> GetSortChunks(string s1)
{
var list = new List<Tuple<StringBuilder, bool>>();
@@ -668,9 +668,30 @@ namespace MediaBrowser.Controller.Entities
}
[IgnoreDataMember]
public virtual BaseItem DisplayParent
public virtual Guid? DisplayParentId
{
get { return GetParent(); }
get
{
if (ParentId == Guid.Empty)
{
return null;
}
return ParentId;
}
}
[IgnoreDataMember]
public BaseItem DisplayParent
{
get
{
var id = DisplayParentId;
if (!id.HasValue)
{
return null;
}
return LibraryManager.GetItemById(id.Value);
}
}
/// <summary>
@@ -1454,7 +1475,7 @@ namespace MediaBrowser.Controller.Entities
public virtual string GetClientTypeName()
{
if (IsFolder && SourceType == SourceType.Channel)
if (IsFolder && SourceType == SourceType.Channel && !(this is Channel))
{
return "ChannelFolderItem";
}

12
MediaBrowser.Controller/Entities/IHasTrailers.cs
View File

@@ -1,6 +1,7 @@
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
namespace MediaBrowser.Controller.Entities
{
@@ -18,11 +19,20 @@ namespace MediaBrowser.Controller.Entities
/// <value>The local trailer ids.</value>
List<Guid> LocalTrailerIds { get; set; }
List<Guid> RemoteTrailerIds { get; set; }
}
public static class HasTrailerExtensions
{
/// <summary>
/// Gets the trailer ids.
/// </summary>
/// <returns>List&lt;Guid&gt;.</returns>
List<Guid> GetTrailerIds();
public static List<Guid> GetTrailerIds(this IHasTrailers item)
{
var list = item.LocalTrailerIds.ToList();
list.AddRange(item.RemoteTrailerIds);
return list;
}
}
}

11
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@@ -78,17 +78,6 @@ namespace MediaBrowser.Controller.Entities.Movies
set { TmdbCollectionName = value; }
}
/// <summary>
/// Gets the trailer ids.
/// </summary>
/// <returns>List&lt;Guid&gt;.</returns>
public List<Guid> GetTrailerIds()
{
var list = LocalTrailerIds.ToList();
list.AddRange(RemoteTrailerIds);
return list;
}
/// <summary>
/// Gets the user data key.
/// </summary>

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

@@ -90,11 +90,11 @@ namespace MediaBrowser.Controller.Entities.TV
}
[IgnoreDataMember]
public override BaseItem DisplayParent
public override Guid? DisplayParentId
{
get
{
return Season ?? GetParent();
return SeasonId;
}
}

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

@@ -33,9 +33,13 @@ namespace MediaBrowser.Controller.Entities.TV
}
[IgnoreDataMember]
public override BaseItem DisplayParent
public override Guid? DisplayParentId
{
get { return Series ?? GetParent(); }
get
{
var series = Series;
return series == null ? ParentId : series.Id;
}
}
// Genre, Rating and Stuido will all be the same