Merge pull request #2970 from MediaBrowser/dev

Dev
This commit is contained in:
Luke 2017-10-22 17:39:10 -04:00 committed by GitHub
commit 3fd4dea0ae
13 changed files with 58 additions and 3 deletions

View File

@ -477,6 +477,11 @@ namespace Emby.Drawing
return size;
}
public ImageSize GetImageSize(string path)
{
return GetImageSize(path, true);
}
/// <summary>
/// Gets the size of the image.
/// </summary>

View File

@ -650,6 +650,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
bool enableRetry,
ListingsProviderInfo providerInfo)
{
// Schedules direct requires that the client support compression and will return a 400 response without it
options.EnableHttpCompression = true;
try
{
return await _httpClient.Post(options).ConfigureAwait(false);
@ -678,6 +681,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
bool enableRetry,
ListingsProviderInfo providerInfo)
{
// Schedules direct requires that the client support compression and will return a 400 response without it
options.EnableHttpCompression = true;
try
{
return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);

View File

@ -26,6 +26,8 @@ namespace MediaBrowser.Controller.Drawing
/// <value>The image enhancers.</value>
IImageEnhancer[] ImageEnhancers { get; }
ImageSize GetImageSize(string path);
/// <summary>
/// Gets the size of the image.
/// </summary>

View File

@ -60,6 +60,12 @@ namespace MediaBrowser.Controller.Entities.Audio
}
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get { return false; }
}
[IgnoreDataMember]
public override bool SupportsAddingToPlaylist
{

View File

@ -1164,7 +1164,7 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember]
public virtual bool SupportsPeople
{
get { return true; }
get { return false; }
}
[IgnoreDataMember]

View File

@ -34,6 +34,12 @@ namespace MediaBrowser.Controller.Entities
get { return true; }
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get { return false; }
}
/// <summary>
/// Gets or sets the remote trailers.
/// </summary>

View File

@ -45,6 +45,12 @@ namespace MediaBrowser.Controller.Entities.Movies
}
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get { return true; }
}
public Guid[] LocalTrailerIds { get; set; }
public Guid[] RemoteTrailerIds { get; set; }

View File

@ -78,6 +78,12 @@ namespace MediaBrowser.Controller.Entities.TV
get { return true; }
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get { return true; }
}
[IgnoreDataMember]
public int? AiredSeasonNumber
{

View File

@ -40,6 +40,12 @@ namespace MediaBrowser.Controller.Entities.TV
}
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get { return true; }
}
[IgnoreDataMember]
public override bool SupportsInheritedParentImages
{

View File

@ -64,6 +64,12 @@ namespace MediaBrowser.Controller.Entities.TV
}
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get { return true; }
}
public Guid[] LocalTrailerIds { get; set; }
public Guid[] RemoteTrailerIds { get; set; }

View File

@ -44,6 +44,12 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get { return true; }
}
[IgnoreDataMember]
public override bool SupportsInheritedParentImages
{

View File

@ -123,7 +123,7 @@ namespace MediaBrowser.Providers.MediaInfo
audio.Name = data.Name;
}
if (!audio.LockedFields.Contains(MetadataFields.Cast))
if (audio.SupportsPeople && !audio.LockedFields.Contains(MetadataFields.Cast))
{
var people = new List<PersonInfo>();

View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.33.17")]
[assembly: AssemblyVersion("3.2.33.18")]