mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 18:08:53 -07:00
restore GetImageSize method
This commit is contained in:
parent
f6df19ddf4
commit
ac09136a3d
@ -477,6 +477,11 @@ namespace Emby.Drawing
|
|||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ImageSize GetImageSize(string path)
|
||||||
|
{
|
||||||
|
return GetImageSize(path, true);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the size of the image.
|
/// Gets the size of the image.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -650,6 +650,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
|
|||||||
bool enableRetry,
|
bool enableRetry,
|
||||||
ListingsProviderInfo providerInfo)
|
ListingsProviderInfo providerInfo)
|
||||||
{
|
{
|
||||||
|
// Schedules direct requires that the client support compression and will return a 400 response without it
|
||||||
|
options.EnableHttpCompression = true;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return await _httpClient.Post(options).ConfigureAwait(false);
|
return await _httpClient.Post(options).ConfigureAwait(false);
|
||||||
@ -678,6 +681,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
|
|||||||
bool enableRetry,
|
bool enableRetry,
|
||||||
ListingsProviderInfo providerInfo)
|
ListingsProviderInfo providerInfo)
|
||||||
{
|
{
|
||||||
|
// Schedules direct requires that the client support compression and will return a 400 response without it
|
||||||
|
options.EnableHttpCompression = true;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
|
return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
|
||||||
|
@ -26,6 +26,8 @@ namespace MediaBrowser.Controller.Drawing
|
|||||||
/// <value>The image enhancers.</value>
|
/// <value>The image enhancers.</value>
|
||||||
IImageEnhancer[] ImageEnhancers { get; }
|
IImageEnhancer[] ImageEnhancers { get; }
|
||||||
|
|
||||||
|
ImageSize GetImageSize(string path);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the size of the image.
|
/// Gets the size of the image.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -60,6 +60,12 @@ namespace MediaBrowser.Controller.Entities.Audio
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public override bool SupportsPeople
|
||||||
|
{
|
||||||
|
get { return false; }
|
||||||
|
}
|
||||||
|
|
||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
public override bool SupportsAddingToPlaylist
|
public override bool SupportsAddingToPlaylist
|
||||||
{
|
{
|
||||||
|
@ -1164,7 +1164,7 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
public virtual bool SupportsPeople
|
public virtual bool SupportsPeople
|
||||||
{
|
{
|
||||||
get { return true; }
|
get { return false; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
|
@ -34,6 +34,12 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
get { return true; }
|
get { return true; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public override bool SupportsPeople
|
||||||
|
{
|
||||||
|
get { return false; }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the remote trailers.
|
/// Gets or sets the remote trailers.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -45,6 +45,12 @@ namespace MediaBrowser.Controller.Entities.Movies
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public override bool SupportsPeople
|
||||||
|
{
|
||||||
|
get { return true; }
|
||||||
|
}
|
||||||
|
|
||||||
public Guid[] LocalTrailerIds { get; set; }
|
public Guid[] LocalTrailerIds { get; set; }
|
||||||
public Guid[] RemoteTrailerIds { get; set; }
|
public Guid[] RemoteTrailerIds { get; set; }
|
||||||
|
|
||||||
|
@ -78,6 +78,12 @@ namespace MediaBrowser.Controller.Entities.TV
|
|||||||
get { return true; }
|
get { return true; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public override bool SupportsPeople
|
||||||
|
{
|
||||||
|
get { return true; }
|
||||||
|
}
|
||||||
|
|
||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
public int? AiredSeasonNumber
|
public int? AiredSeasonNumber
|
||||||
{
|
{
|
||||||
|
@ -40,6 +40,12 @@ namespace MediaBrowser.Controller.Entities.TV
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public override bool SupportsPeople
|
||||||
|
{
|
||||||
|
get { return true; }
|
||||||
|
}
|
||||||
|
|
||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
public override bool SupportsInheritedParentImages
|
public override bool SupportsInheritedParentImages
|
||||||
{
|
{
|
||||||
|
@ -64,6 +64,12 @@ namespace MediaBrowser.Controller.Entities.TV
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public override bool SupportsPeople
|
||||||
|
{
|
||||||
|
get { return true; }
|
||||||
|
}
|
||||||
|
|
||||||
public Guid[] LocalTrailerIds { get; set; }
|
public Guid[] LocalTrailerIds { get; set; }
|
||||||
public Guid[] RemoteTrailerIds { get; set; }
|
public Guid[] RemoteTrailerIds { get; set; }
|
||||||
|
|
||||||
|
@ -44,6 +44,12 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public override bool SupportsPeople
|
||||||
|
{
|
||||||
|
get { return true; }
|
||||||
|
}
|
||||||
|
|
||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
public override bool SupportsInheritedParentImages
|
public override bool SupportsInheritedParentImages
|
||||||
{
|
{
|
||||||
|
@ -123,7 +123,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
audio.Name = data.Name;
|
audio.Name = data.Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!audio.LockedFields.Contains(MetadataFields.Cast))
|
if (audio.SupportsPeople && !audio.LockedFields.Contains(MetadataFields.Cast))
|
||||||
{
|
{
|
||||||
var people = new List<PersonInfo>();
|
var people = new List<PersonInfo>();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user