Преглед изворни кода

restore GetImageSize method

Luke Pulverenti пре 7 година
родитељ
комит
ac09136a3d

+ 5 - 0
Emby.Drawing/ImageProcessor.cs

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

+ 6 - 0
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs

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

+ 2 - 0
MediaBrowser.Controller/Drawing/IImageProcessor.cs

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

+ 6 - 0
MediaBrowser.Controller/Entities/Audio/Audio.cs

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

+ 1 - 1
MediaBrowser.Controller/Entities/BaseItem.cs

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

+ 6 - 0
MediaBrowser.Controller/Entities/Game.cs

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

+ 6 - 0
MediaBrowser.Controller/Entities/Movies/BoxSet.cs

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

+ 6 - 0
MediaBrowser.Controller/Entities/TV/Episode.cs

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

+ 6 - 0
MediaBrowser.Controller/Entities/TV/Season.cs

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

+ 6 - 0
MediaBrowser.Controller/Entities/TV/Series.cs

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

+ 6 - 0
MediaBrowser.Controller/Entities/Video.cs

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

+ 1 - 1
MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs

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