Update to 3.5.2 and .net core 2.1

7 files changed, 0 insertions, 427 deletions

diff --git a/MediaBrowser.Controller/Drawing/IImageEncoder.cs b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
deleted file mode 100644
index 757448eb2..000000000
--- a/MediaBrowser.Controller/Drawing/IImageEncoder.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using MediaBrowser.Model.Drawing;
-
-namespace MediaBrowser.Controller.Drawing
-{
-    public interface IImageEncoder
-    {
-        /// <summary>
-        /// Gets the supported input formats.
-        /// </summary>
-        /// <value>The supported input formats.</value>
-        string[] SupportedInputFormats { get; }
-        /// <summary>
-        /// Gets the supported output formats.
-        /// </summary>
-        /// <value>The supported output formats.</value>
-        ImageFormat[] SupportedOutputFormats { get; }
-
-        /// <summary>
-        /// Encodes the image.
-        /// </summary>
-        string EncodeImage(string inputPath, DateTime dateModified, string outputPath, bool autoOrient, ImageOrientation? orientation, int quality, ImageProcessingOptions options, ImageFormat outputFormat);
-
-        /// <summary>
-        /// Creates the image collage.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        void CreateImageCollage(ImageCollageOptions options);
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        string Name { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether [supports image collage creation].
-        /// </summary>
-        /// <value><c>true</c> if [supports image collage creation]; otherwise, <c>false</c>.</value>
-        bool SupportsImageCollageCreation { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether [supports image encoding].
-        /// </summary>
-        /// <value><c>true</c> if [supports image encoding]; otherwise, <c>false</c>.</value>
-        bool SupportsImageEncoding { get; }
-
-        ImageSize GetImageSize(string path);
-    }
-}
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
deleted file mode 100644
index 0bc92ac7e..000000000
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.Entities;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Drawing
-{
-    /// <summary>
-    /// Interface IImageProcessor
-    /// </summary>
-    public interface IImageProcessor
-    {
-        /// <summary>
-        /// Gets the supported input formats.
-        /// </summary>
-        /// <value>The supported input formats.</value>
-        string[] SupportedInputFormats { get; }
-
-        /// <summary>
-        /// Gets the image enhancers.
-        /// </summary>
-        /// <value>The image enhancers.</value>
-        IImageEnhancer[] ImageEnhancers { get; }
-
-        ImageSize GetImageSize(string path);
-
-        /// <summary>
-        /// Gets the size of the image.
-        /// </summary>
-        /// <param name="info">The information.</param>
-        /// <returns>ImageSize.</returns>
-        ImageSize GetImageSize(BaseItem item, ItemImageInfo info);
-
-        ImageSize GetImageSize(BaseItem item, ItemImageInfo info, bool allowSlowMethods, bool updateItem);
-
-        /// <summary>
-        /// Adds the parts.
-        /// </summary>
-        /// <param name="enhancers">The enhancers.</param>
-        void AddParts(IEnumerable<IImageEnhancer> enhancers);
-
-        /// <summary>
-        /// Gets the supported enhancers.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="imageType">Type of the image.</param>
-        /// <returns>IEnumerable{IImageEnhancer}.</returns>
-        List<IImageEnhancer> GetSupportedEnhancers(IHasMetadata item, ImageType imageType);
-
-        /// <summary>
-        /// Gets the image cache tag.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="image">The image.</param>
-        /// <returns>Guid.</returns>
-        string GetImageCacheTag(IHasMetadata item, ItemImageInfo image);
-
-        /// <summary>
-        /// Gets the image cache tag.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="image">The image.</param>
-        /// <param name="imageEnhancers">The image enhancers.</param>
-        /// <returns>Guid.</returns>
-        string GetImageCacheTag(IHasMetadata item, ItemImageInfo image, List<IImageEnhancer> imageEnhancers);
-
-        /// <summary>
-        /// Processes the image.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <param name="toStream">To stream.</param>
-        /// <returns>Task.</returns>
-        Task ProcessImage(ImageProcessingOptions options, Stream toStream);
-
-        /// <summary>
-        /// Processes the image.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <returns>Task.</returns>
-        Task<Tuple<string, string, DateTime>> ProcessImage(ImageProcessingOptions options);
-
-        /// <summary>
-        /// Gets the enhanced image.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="imageType">Type of the image.</param>
-        /// <param name="imageIndex">Index of the image.</param>
-        /// <returns>Task{System.String}.</returns>
-        Task<string> GetEnhancedImage(IHasMetadata item, ImageType imageType, int imageIndex);
-
-        /// <summary>
-        /// Gets the supported image output formats.
-        /// </summary>
-        /// <returns>ImageOutputFormat[].</returns>
-        ImageFormat[] GetSupportedImageOutputFormats();
-
-        /// <summary>
-        /// Creates the image collage.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        void CreateImageCollage(ImageCollageOptions options);
-
-        /// <summary>
-        /// Gets a value indicating whether [supports image collage creation].
-        /// </summary>
-        /// <value><c>true</c> if [supports image collage creation]; otherwise, <c>false</c>.</value>
-        bool SupportsImageCollageCreation { get; }
-
-        IImageEncoder ImageEncoder { get; set; }
-
-        bool SupportsTransparency(string path);
-    }
-}
diff --git a/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs b/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
deleted file mode 100644
index 92a7f5ac9..000000000
--- a/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-namespace MediaBrowser.Controller.Drawing
-{
-    public class ImageCollageOptions
-    {
-        /// <summary>
-        /// Gets or sets the input paths.
-        /// </summary>
-        /// <value>The input paths.</value>
-        public string[] InputPaths { get; set; }
-        /// <summary>
-        /// Gets or sets the output path.
-        /// </summary>
-        /// <value>The output path.</value>
-        public string OutputPath { get; set; }
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        /// <value>The width.</value>
-        public int Width { get; set; }
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        /// <value>The height.</value>
-        public int Height { get; set; }
-    }
-}
diff --git a/MediaBrowser.Controller/Drawing/ImageHelper.cs b/MediaBrowser.Controller/Drawing/ImageHelper.cs
deleted file mode 100644
index 9936b1036..000000000
--- a/MediaBrowser.Controller/Drawing/ImageHelper.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Controller.Drawing
-{
-    public static class ImageHelper
-    {
-        public static ImageSize GetNewImageSize(ImageProcessingOptions options, ImageSize? originalImageSize)
-        {
-            if (originalImageSize.HasValue)
-            {
-                // Determine the output size based on incoming parameters
-                var newSize = DrawingUtils.Resize(originalImageSize.Value, options.Width, options.Height, options.MaxWidth, options.MaxHeight);
-
-                return newSize;
-            }
-            return GetSizeEstimate(options);
-        }
-
-        public static IImageProcessor ImageProcessor { get; set; }
-
-        private static ImageSize GetSizeEstimate(ImageProcessingOptions options)
-        {
-            if (options.Width.HasValue && options.Height.HasValue)
-            {
-                return new ImageSize(options.Width.Value, options.Height.Value);
-            }
-
-            var aspect = GetEstimatedAspectRatio(options.Image.Type, options.Item);
-
-            var width = options.Width ?? options.MaxWidth;
-
-            if (width.HasValue)
-            {
-                var heightValue = width.Value / aspect;
-                return new ImageSize(width.Value, heightValue);
-            }
-
-            var height = options.Height ?? options.MaxHeight ?? 200;
-            var widthValue = aspect * height;
-            return new ImageSize(widthValue, height);
-        }
-
-        private static double GetEstimatedAspectRatio(ImageType type, IHasMetadata item)
-        {
-            switch (type)
-            {
-                case ImageType.Art:
-                case ImageType.Backdrop:
-                case ImageType.Chapter:
-                case ImageType.Screenshot:
-                case ImageType.Thumb:
-                    return 1.78;
-                case ImageType.Banner:
-                    return 5.4;
-                case ImageType.Box:
-                case ImageType.BoxRear:
-                case ImageType.Disc:
-                case ImageType.Menu:
-                    return 1;
-                case ImageType.Logo:
-                    return 2.58;
-                case ImageType.Primary:
-                    return item.GetDefaultPrimaryImageAspectRatio() ?? .667;
-                default:
-                    return 1;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
deleted file mode 100644
index 26283b5ea..000000000
--- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Drawing;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace MediaBrowser.Controller.Drawing
-{
-    public class ImageProcessingOptions
-    {
-        public ImageProcessingOptions()
-        {
-            RequiresAutoOrientation = true;
-        }
-
-        public string ItemId { get; set; }
-        public string ItemType { get; set; }
-        public IHasMetadata Item { get; set; }
-
-        public ItemImageInfo Image { get; set; }
-
-        public int ImageIndex { get; set; }
-
-        public bool CropWhiteSpace { get; set; }
-
-        public int? Width { get; set; }
-
-        public int? Height { get; set; }
-
-        public int? MaxWidth { get; set; }
-
-        public int? MaxHeight { get; set; }
-
-        public int Quality { get; set; }
-
-        public List<IImageEnhancer> Enhancers { get; set; }
-
-        public ImageFormat[] SupportedOutputFormats { get; set; }
-
-        public bool AddPlayedIndicator { get; set; }
-
-        public int? UnplayedCount { get; set; }
-        public int? Blur { get; set; }
-
-        public double PercentPlayed { get; set; }
-
-        public string BackgroundColor { get; set; }
-        public string ForegroundLayer { get; set; }
-        public bool RequiresAutoOrientation { get; set; }
-
-        public bool HasDefaultOptions(string originalImagePath)
-        {
-            return HasDefaultOptionsWithoutSize(originalImagePath) &&
-                !Width.HasValue &&
-                !Height.HasValue &&
-                !MaxWidth.HasValue &&
-                !MaxHeight.HasValue;
-        }
-
-        public bool HasDefaultOptions(string originalImagePath, ImageSize size)
-        {
-            if (!HasDefaultOptionsWithoutSize(originalImagePath))
-            {
-                return false;
-            }
-
-            if (Width.HasValue && !size.Width.Equals(Width.Value))
-            {
-                return false;
-            }
-            if (Height.HasValue && !size.Height.Equals(Height.Value))
-            {
-                return false;
-            }
-            if (MaxWidth.HasValue && size.Width > MaxWidth.Value)
-            {
-                return false;
-            }
-            if (MaxHeight.HasValue && size.Height > MaxHeight.Value)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        public bool HasDefaultOptionsWithoutSize(string originalImagePath)
-        {
-            return (Quality >= 90) &&
-                IsFormatSupported(originalImagePath) &&
-                !AddPlayedIndicator &&
-                PercentPlayed.Equals(0) &&
-                !UnplayedCount.HasValue &&
-                !Blur.HasValue &&
-                !CropWhiteSpace &&
-                string.IsNullOrEmpty(BackgroundColor) &&
-                string.IsNullOrEmpty(ForegroundLayer);
-        }
-
-        private bool IsFormatSupported(string originalImagePath)
-        {
-            var ext = Path.GetExtension(originalImagePath);
-            return SupportedOutputFormats.Any(outputFormat => string.Equals(ext, "." + outputFormat, StringComparison.OrdinalIgnoreCase));
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs b/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs
deleted file mode 100644
index 5dfa94e1e..000000000
--- a/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Controller.Drawing
-{
-    public static class ImageProcessorExtensions
-    {
-        public static string GetImageCacheTag(this IImageProcessor processor, IHasMetadata item, ImageType imageType)
-        {
-            return processor.GetImageCacheTag(item, imageType, 0);
-        }
-        
-        public static string GetImageCacheTag(this IImageProcessor processor, IHasMetadata item, ImageType imageType, int imageIndex)
-        {
-            var imageInfo = item.GetImageInfo(imageType, imageIndex);
-
-            if (imageInfo == null)
-            {
-                return null;
-            }
-
-            return processor.GetImageCacheTag(item, imageInfo);
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Drawing/ImageStream.cs b/MediaBrowser.Controller/Drawing/ImageStream.cs
deleted file mode 100644
index b5e14eb6c..000000000
--- a/MediaBrowser.Controller/Drawing/ImageStream.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using MediaBrowser.Model.Drawing;
-using System;
-using System.IO;
-
-namespace MediaBrowser.Controller.Drawing
-{
-    public class ImageStream : IDisposable
-    {
-        /// <summary>
-        /// Gets or sets the stream.
-        /// </summary>
-        /// <value>The stream.</value>
-        public Stream Stream { get; set; }
-        /// <summary>
-        /// Gets or sets the format.
-        /// </summary>
-        /// <value>The format.</value>
-        public ImageFormat Format { get; set; }
-
-        public void Dispose()
-        {
-            if (Stream != null)
-            {
-                Stream.Dispose();
-            }
-            GC.SuppressFinalize(this);
-        }
-    }
-}