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

Merge remote-tracking branch 'upstream/master' into random

Browse Source
This commit is contained in:
Bond-009
2019-12-06 12:06:13 +01:00
parent 94edb5b9f9 935525e77a
commit a2c35e6dba
339 changed files with 4276 additions and 4900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text.Json.Serialization;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Serialization;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.Controller.Entities.TV
@@ -49,25 +49,25 @@ namespace MediaBrowser.Controller.Entities.TV
return series == null ? SeriesName : series.SortName;
}
[IgnoreDataMember]
[JsonIgnore]
protected override bool SupportsOwnedItems => IsStacked || MediaSourceCount > 1;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsInheritedParentImages => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsPeople => true;
[IgnoreDataMember]
[JsonIgnore]
public int? AiredSeasonNumber => AirsAfterSeasonNumber ?? AirsBeforeSeasonNumber ?? ParentIndexNumber;
[IgnoreDataMember]
[JsonIgnore]
public override Folder LatestItemsIndexContainer => Series;
[IgnoreDataMember]
[JsonIgnore]
public override Guid DisplayParentId => SeasonId;
[IgnoreDataMember]
[JsonIgnore]
protected override bool EnableDefaultVideoUserDataKeys => false;
public override double GetDefaultPrimaryImageAspectRatio()
@@ -104,7 +104,7 @@ namespace MediaBrowser.Controller.Entities.TV
/// This Episode's Series Instance
/// </summary>
/// <value>The series.</value>
[IgnoreDataMember]
[JsonIgnore]
public Series Series
{
get
@@ -118,7 +118,7 @@ namespace MediaBrowser.Controller.Entities.TV
}
}
[IgnoreDataMember]
[JsonIgnore]
public Season Season
{
get
@@ -132,16 +132,16 @@ namespace MediaBrowser.Controller.Entities.TV
}
}
[IgnoreDataMember]
[JsonIgnore]
public bool IsInSeasonFolder => FindParent<Season>() != null;
[IgnoreDataMember]
[JsonIgnore]
public string SeriesPresentationUniqueKey { get; set; }
[IgnoreDataMember]
[JsonIgnore]
public string SeriesName { get; set; }
[IgnoreDataMember]
[JsonIgnore]
public string SeasonName { get; set; }
public string FindSeriesPresentationUniqueKey()
@@ -224,7 +224,7 @@ namespace MediaBrowser.Controller.Entities.TV
return false;
}
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsRemoteImageDownloading
{
get
@@ -238,12 +238,12 @@ namespace MediaBrowser.Controller.Entities.TV
}
}
[IgnoreDataMember]
[JsonIgnore]
public bool IsMissingEpisode => LocationType == LocationType.Virtual;
[IgnoreDataMember]
[JsonIgnore]
public Guid SeasonId { get; set; }
[IgnoreDataMember]
[JsonIgnore]
public Guid SeriesId { get; set; }
public Guid FindSeriesId()

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

@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Users;
namespace MediaBrowser.Controller.Entities.TV
@@ -15,22 +15,22 @@ namespace MediaBrowser.Controller.Entities.TV
/// </summary>
public class Season : Folder, IHasSeries, IHasLookupInfo<SeasonInfo>
{
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsAddingToPlaylist => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool IsPreSorted => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsDateLastMediaAdded => false;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsPeople => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsInheritedParentImages => true;
[IgnoreDataMember]
[JsonIgnore]
public override Guid DisplayParentId => SeriesId;
public override double GetDefaultPrimaryImageAspectRatio()
@@ -71,7 +71,7 @@ namespace MediaBrowser.Controller.Entities.TV
/// This Episode's Series Instance
/// </summary>
/// <value>The series.</value>
[IgnoreDataMember]
[JsonIgnore]
public Series Series
{
get
@@ -85,7 +85,7 @@ namespace MediaBrowser.Controller.Entities.TV
}
}
[IgnoreDataMember]
[JsonIgnore]
public string SeriesPath
{
get
@@ -179,13 +179,13 @@ namespace MediaBrowser.Controller.Entities.TV
return UnratedItem.Series;
}
[IgnoreDataMember]
[JsonIgnore]
public string SeriesPresentationUniqueKey { get; set; }
[IgnoreDataMember]
[JsonIgnore]
public string SeriesName { get; set; }
[IgnoreDataMember]
[JsonIgnore]
public Guid SeriesId { get; set; }
public string FindSeriesPresentationUniqueKey()

14
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Dto;
@@ -10,7 +11,6 @@ using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Users;
namespace MediaBrowser.Controller.Entities.TV
@@ -31,19 +31,19 @@ namespace MediaBrowser.Controller.Entities.TV
public DayOfWeek[] AirDays { get; set; }
public string AirTime { get; set; }
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsAddingToPlaylist => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool IsPreSorted => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsDateLastMediaAdded => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsInheritedParentImages => false;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsPeople => true;
/// <inheritdoc />
@@ -506,7 +506,7 @@ namespace MediaBrowser.Controller.Entities.TV
return list;
}
[IgnoreDataMember]
[JsonIgnore]
public override bool StopRefreshIfLocalMetadataFound => false;
}
}