alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-17 15:46:22 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

add LocalFileInfo.Id

Browse Source
This commit is contained in:
Luke Pulverenti
2014-10-24 00:54:35 -04:00
parent 5a5b48feff
commit c8a735bcb1
84 changed files with 659 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Controller/Dto/IDtoService.cs
View File

@@ -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
@@ -12,14 +10,6 @@ namespace MediaBrowser.Controller.Dto
/// </summary>
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>

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

@@ -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;

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

@@ -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)
{

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

@@ -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>

4
MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
View File

@@ -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()