Merge pull request #5 from jellyfin/master

Merge up to latest master

15 files changed, 305 insertions, 538 deletions

diff --git a/MediaBrowser.Model/Configuration/FanartOptions.cs b/MediaBrowser.Model/Configuration/FanartOptions.cs
deleted file mode 100644
index 9c8be39be..000000000
--- a/MediaBrowser.Model/Configuration/FanartOptions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public class FanartOptions
-    {
-        /// <summary>
-        /// Gets or sets the user API key.
-        /// </summary>
-        /// <value>The user API key.</value>
-        public string UserApiKey { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 0ba36b4b9..2673597ca 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -49,9 +49,9 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableNormalizedItemByNameIds { get; set; }
 
         /// <summary>
-        /// Gets or sets the value pointing to the file system where the ssl certiifcate is located..
+        /// Gets or sets the value pointing to the file system where the ssl certificate is located..
         /// </summary>
-        /// <value>The value pointing to the file system where the ssl certiifcate is located..</value>
+        /// <value>The value pointing to the file system where the ssl certificate is located..</value>
         public string CertificatePath { get; set; }
         public string CertificatePassword { get; set; }
 
@@ -259,7 +259,7 @@ namespace MediaBrowser.Model.Configuration
                 {
                     ItemType = "MusicVideo",
                     DisabledMetadataFetchers = new [] { "The Open Movie Database" },
-                    DisabledImageFetchers = new [] { "The Open Movie Database", "FanArt" }
+                    DisabledImageFetchers = new [] { "The Open Movie Database" }
                 },
                 new MetadataOptions
                 {
@@ -285,7 +285,6 @@ namespace MediaBrowser.Model.Configuration
                 {
                     ItemType = "Season",
                     DisabledMetadataFetchers = new [] { "TheMovieDb" },
-                    DisabledImageFetchers = new [] { "FanArt" }
                 },
                 new MetadataOptions
                 {
diff --git a/MediaBrowser.Model/Cryptography/PasswordHash.cs b/MediaBrowser.Model/Cryptography/PasswordHash.cs
index a9d0f6744..f15b27d32 100644
--- a/MediaBrowser.Model/Cryptography/PasswordHash.cs
+++ b/MediaBrowser.Model/Cryptography/PasswordHash.cs
@@ -1,153 +1,153 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace MediaBrowser.Model.Cryptography

-{

-    public class PasswordHash

-    {

-        // Defined from this hash storage spec

-        // https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md

-        // $<id>[$<param>=<value>(,<param>=<value>)*][$<salt>[$<hash>]]

-        // with one slight amendment to ease the transition, we're writing out the bytes in hex

-        // rather than making them a BASE64 string with stripped padding

-

-        private string _id;

-

-        private Dictionary<string, string> _parameters = new Dictionary<string, string>();

-

-        private string _salt;

-

-        private byte[] _saltBytes;

-

-        private string _hash;

-

-        private byte[] _hashBytes;

-

-        public string Id { get => _id; set => _id = value; }

-

-        public Dictionary<string, string> Parameters { get => _parameters; set => _parameters = value; }

-

-        public string Salt { get => _salt; set => _salt = value; }

-

-        public byte[] SaltBytes { get => _saltBytes; set => _saltBytes = value; }

-

-        public string Hash { get => _hash; set => _hash = value; }

-

-        public byte[] HashBytes { get => _hashBytes; set => _hashBytes = value; }

-

-        public PasswordHash(string storageString)

-        {

-            string[] splitted = storageString.Split('$');

-            _id = splitted[1];

-            if (splitted[2].Contains("="))

-            {

-                foreach (string paramset in (splitted[2].Split(',')))

-                {

-                    if (!string.IsNullOrEmpty(paramset))

-                    {

-                        string[] fields = paramset.Split('=');

-                        if (fields.Length == 2)

-                        {

-                            _parameters.Add(fields[0], fields[1]);

-                        }

-                        else

-                        {

-                            throw new Exception($"Malformed parameter in password hash string {paramset}");

-                        }

-                    }

-                }

-                if (splitted.Length == 5)

-                {

-                    _salt = splitted[3];

-                    _saltBytes = ConvertFromByteString(_salt);

-                    _hash = splitted[4];

-                    _hashBytes = ConvertFromByteString(_hash);

-                }

-                else

-                {

-                    _salt = string.Empty;

-                    _hash = splitted[3];

-                    _hashBytes = ConvertFromByteString(_hash);

-                }

-            }

-            else

-            {

-                if (splitted.Length == 4)

-                {

-                    _salt = splitted[2];

-                    _saltBytes = ConvertFromByteString(_salt);

-                    _hash = splitted[3];

-                    _hashBytes = ConvertFromByteString(_hash);

-                }

-                else

-                {

-                    _salt = string.Empty;

-                    _hash = splitted[2];

-                    _hashBytes = ConvertFromByteString(_hash);

-                }

-

-            }

-

-        }

-

-        public PasswordHash(ICryptoProvider cryptoProvider)

-        {

-            _id = cryptoProvider.DefaultHashMethod;

-            _saltBytes = cryptoProvider.GenerateSalt();

-            _salt = ConvertToByteString(SaltBytes);

-        }

-

-        public static byte[] ConvertFromByteString(string byteString)

-        {

-            byte[] bytes = new byte[byteString.Length / 2];

-            for (int i = 0; i < byteString.Length; i += 2)

-            {

-                // TODO: NetStandard2.1 switch this to use a span instead of a substring.

-                bytes[i / 2] = Convert.ToByte(byteString.Substring(i, 2), 16);

-            }

-

-            return bytes;

-        }

-

-        public static string ConvertToByteString(byte[] bytes)

-        {

-            return BitConverter.ToString(bytes).Replace("-", "");

-        }

-

-        private string SerializeParameters()

-        {

-            string returnString = string.Empty;

-            foreach (var KVP in _parameters)

-            {

-                returnString += $",{KVP.Key}={KVP.Value}";

-            }

-

-            if ((!string.IsNullOrEmpty(returnString)) && returnString[0] == ',')

-            {

-                returnString = returnString.Remove(0, 1);

-            }

-

-            return returnString;

-        }

-

-        public override string ToString()

-        {

-            string outString = "$" + _id;

-            string paramstring = SerializeParameters();

-            if (!string.IsNullOrEmpty(paramstring))

-            {

-                outString += $"${paramstring}";

-            }

-

-            if (!string.IsNullOrEmpty(_salt))

-            {

-                outString += $"${_salt}";

-            }

-

-            outString += $"${_hash}";

-            return outString;

-        }

-    }

-

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MediaBrowser.Model.Cryptography
+{
+    public class PasswordHash
+    {
+        // Defined from this hash storage spec
+        // https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md
+        // $<id>[$<param>=<value>(,<param>=<value>)*][$<salt>[$<hash>]]
+        // with one slight amendment to ease the transition, we're writing out the bytes in hex
+        // rather than making them a BASE64 string with stripped padding
+
+        private string _id;
+
+        private Dictionary<string, string> _parameters = new Dictionary<string, string>();
+
+        private string _salt;
+
+        private byte[] _saltBytes;
+
+        private string _hash;
+
+        private byte[] _hashBytes;
+
+        public string Id { get => _id; set => _id = value; }
+
+        public Dictionary<string, string> Parameters { get => _parameters; set => _parameters = value; }
+
+        public string Salt { get => _salt; set => _salt = value; }
+
+        public byte[] SaltBytes { get => _saltBytes; set => _saltBytes = value; }
+
+        public string Hash { get => _hash; set => _hash = value; }
+
+        public byte[] HashBytes { get => _hashBytes; set => _hashBytes = value; }
+
+        public PasswordHash(string storageString)
+        {
+            string[] splitted = storageString.Split('$');
+            _id = splitted[1];
+            if (splitted[2].Contains("="))
+            {
+                foreach (string paramset in (splitted[2].Split(',')))
+                {
+                    if (!string.IsNullOrEmpty(paramset))
+                    {
+                        string[] fields = paramset.Split('=');
+                        if (fields.Length == 2)
+                        {
+                            _parameters.Add(fields[0], fields[1]);
+                        }
+                        else
+                        {
+                            throw new Exception($"Malformed parameter in password hash string {paramset}");
+                        }
+                    }
+                }
+                if (splitted.Length == 5)
+                {
+                    _salt = splitted[3];
+                    _saltBytes = ConvertFromByteString(_salt);
+                    _hash = splitted[4];
+                    _hashBytes = ConvertFromByteString(_hash);
+                }
+                else
+                {
+                    _salt = string.Empty;
+                    _hash = splitted[3];
+                    _hashBytes = ConvertFromByteString(_hash);
+                }
+            }
+            else
+            {
+                if (splitted.Length == 4)
+                {
+                    _salt = splitted[2];
+                    _saltBytes = ConvertFromByteString(_salt);
+                    _hash = splitted[3];
+                    _hashBytes = ConvertFromByteString(_hash);
+                }
+                else
+                {
+                    _salt = string.Empty;
+                    _hash = splitted[2];
+                    _hashBytes = ConvertFromByteString(_hash);
+                }
+
+            }
+
+        }
+
+        public PasswordHash(ICryptoProvider cryptoProvider)
+        {
+            _id = cryptoProvider.DefaultHashMethod;
+            _saltBytes = cryptoProvider.GenerateSalt();
+            _salt = ConvertToByteString(SaltBytes);
+        }
+
+        public static byte[] ConvertFromByteString(string byteString)
+        {
+            byte[] bytes = new byte[byteString.Length / 2];
+            for (int i = 0; i < byteString.Length; i += 2)
+            {
+                // TODO: NetStandard2.1 switch this to use a span instead of a substring.
+                bytes[i / 2] = Convert.ToByte(byteString.Substring(i, 2), 16);
+            }
+
+            return bytes;
+        }
+
+        public static string ConvertToByteString(byte[] bytes)
+        {
+            return BitConverter.ToString(bytes).Replace("-", "");
+        }
+
+        private string SerializeParameters()
+        {
+            string returnString = string.Empty;
+            foreach (var KVP in _parameters)
+            {
+                returnString += $",{KVP.Key}={KVP.Value}";
+            }
+
+            if ((!string.IsNullOrEmpty(returnString)) && returnString[0] == ',')
+            {
+                returnString = returnString.Remove(0, 1);
+            }
+
+            return returnString;
+        }
+
+        public override string ToString()
+        {
+            string outString = "$" + _id;
+            string paramstring = SerializeParameters();
+            if (!string.IsNullOrEmpty(paramstring))
+            {
+                outString += $"${paramstring}";
+            }
+
+            if (!string.IsNullOrEmpty(_salt))
+            {
+                outString += $"${_salt}";
+            }
+
+            outString += $"${_hash}";
+            return outString;
+        }
+    }
+
+}
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index 901d81c5f..e52951dd0 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -13,7 +13,8 @@ namespace MediaBrowser.Model.Dlna
             _profile = profile;
         }
 
-        public string BuildImageHeader(string container,
+        public string BuildImageHeader(
+            string container,
             int? width,
             int? height,
             bool isDirectStream,
@@ -28,8 +29,7 @@ namespace MediaBrowser.Model.Dlna
                             DlnaFlags.InteractiveTransferMode |
                             DlnaFlags.DlnaV15;
 
-            string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
-             DlnaMaps.FlagsToString(flagValue));
+            string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}", DlnaMaps.FlagsToString(flagValue));
 
             ResponseProfile mediaProfile = _profile.GetImageMediaProfile(container,
                 width,
@@ -37,7 +37,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (string.IsNullOrEmpty(orgPn))
             {
-                orgPn = mediaProfile == null ? null : mediaProfile.OrgPn;
+                orgPn = mediaProfile?.OrgPn;
             }
 
             if (string.IsNullOrEmpty(orgPn))
@@ -50,7 +50,8 @@ namespace MediaBrowser.Model.Dlna
             return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
         }
 
-        public string BuildAudioHeader(string container,
+        public string BuildAudioHeader(
+            string container,
             string audioCodec,
             int? audioBitrate,
             int? audioSampleRate,
@@ -102,7 +103,8 @@ namespace MediaBrowser.Model.Dlna
             return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
         }
 
-        public List<string> BuildVideoHeader(string container,
+        public List<string> BuildVideoHeader(
+            string container,
             string videoCodec,
             string audioCodec,
             int? width,
@@ -206,7 +208,7 @@ namespace MediaBrowser.Model.Dlna
             return contentFeatureList;
         }
 
-        private string GetImageOrgPnValue(string container, int? width, int? height)
+        private static string GetImageOrgPnValue(string container, int? width, int? height)
         {
             MediaFormatProfile? format = new MediaFormatProfileResolver()
                 .ResolveImageFormat(container,
@@ -216,7 +218,7 @@ namespace MediaBrowser.Model.Dlna
             return format.HasValue ? format.Value.ToString() : null;
         }
 
-        private string GetAudioOrgPnValue(string container, int? audioBitrate, int? audioSampleRate, int? audioChannels)
+        private static string GetAudioOrgPnValue(string container, int? audioBitrate, int? audioSampleRate, int? audioChannels)
         {
             MediaFormatProfile? format = new MediaFormatProfileResolver()
                 .ResolveAudioFormat(container,
@@ -227,7 +229,7 @@ namespace MediaBrowser.Model.Dlna
             return format.HasValue ? format.Value.ToString() : null;
         }
 
-        private string[] GetVideoOrgPnValue(string container, string videoCodec, string audioCodec, int? width, int? height, TransportStreamTimestamp timestamp)
+        private static string[] GetVideoOrgPnValue(string container, string videoCodec, string audioCodec, int? width, int? height, TransportStreamTimestamp timestamp)
         {
             return new MediaFormatProfileResolver().ResolveVideoFormat(container, videoCodec, audioCodec, width, height, timestamp);
         }
diff --git a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
index 4edbb503b..c443a8ad1 100644
--- a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
+++ b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using MediaBrowser.Model.Net;
+using System.Net;
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Dlna
     {
         public Uri Location { get; set; }
         public Dictionary<string, string> Headers { get; set; }
-        public IpAddressInfo LocalIpAddress { get; set; }
+        public IPAddress LocalIpAddress { get; set; }
         public int LocalPort { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Net/ISocket.cs b/MediaBrowser.Model/Net/ISocket.cs
index 992ccb49b..f80de5524 100644
--- a/MediaBrowser.Model/Net/ISocket.cs
+++ b/MediaBrowser.Model/Net/ISocket.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -9,7 +10,7 @@ namespace MediaBrowser.Model.Net
     /// </summary>
     public interface ISocket : IDisposable
     {
-        IpAddressInfo LocalIPAddress { get; }
+        IPAddress LocalIPAddress { get; }
 
         Task<SocketReceiveResult> ReceiveAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken);
 
@@ -21,6 +22,6 @@ namespace MediaBrowser.Model.Net
         /// <summary>
         /// Sends a UDP message to a particular end point (uni or multicast).
         /// </summary>
-        Task SendToAsync(byte[] buffer, int offset, int bytes, IpEndPointInfo endPoint, CancellationToken cancellationToken);
+        Task SendToAsync(byte[] buffer, int offset, int bytes, IPEndPoint endPoint, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Model/Net/ISocketFactory.cs b/MediaBrowser.Model/Net/ISocketFactory.cs
index 69fe134bc..e58f4cc14 100644
--- a/MediaBrowser.Model/Net/ISocketFactory.cs
+++ b/MediaBrowser.Model/Net/ISocketFactory.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Net;
 
 namespace MediaBrowser.Model.Net
 {
@@ -8,7 +9,7 @@ namespace MediaBrowser.Model.Net
     public interface ISocketFactory
     {
         /// <summary>
-        /// Createa a new unicast socket using the specified local port number.
+        /// Creates a new unicast socket using the specified local port number.
         /// </summary>
         /// <param name="localPort">The local port to bind to.</param>
         /// <returns>A <see cref="ISocket"/> implementation.</returns>
@@ -16,15 +17,15 @@ namespace MediaBrowser.Model.Net
 
         ISocket CreateUdpBroadcastSocket(int localPort);
 
-        ISocket CreateTcpSocket(IpAddressInfo remoteAddress, int remotePort);
+        ISocket CreateTcpSocket(IPAddress remoteAddress, int remotePort);
 
         /// <summary>
-        /// Createa a new unicast socket using the specified local port number.
+        /// Creates a new unicast socket using the specified local port number.
         /// </summary>
-        ISocket CreateSsdpUdpSocket(IpAddressInfo localIp, int localPort);
+        ISocket CreateSsdpUdpSocket(IPAddress localIp, int localPort);
 
         /// <summary>
-        /// Createa a new multicast socket using the specified multicast IP address, multicast time to live and local port.
+        /// Creates a new multicast socket using the specified multicast IP address, multicast time to live and local port.
         /// </summary>
         /// <param name="ipAddress">The multicast IP address to bind to.</param>
         /// <param name="multicastTimeToLive">The multicast time to live value. Actually a maximum number of network hops for UDP packets.</param>
diff --git a/MediaBrowser.Model/Net/IpAddressInfo.cs b/MediaBrowser.Model/Net/IpAddressInfo.cs
deleted file mode 100644
index 87fa55bca..000000000
--- a/MediaBrowser.Model/Net/IpAddressInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.Net
-{
-    public class IpAddressInfo
-    {
-        public static IpAddressInfo Any = new IpAddressInfo("0.0.0.0", IpAddressFamily.InterNetwork);
-        public static IpAddressInfo IPv6Any = new IpAddressInfo("00000000000000000000", IpAddressFamily.InterNetworkV6);
-        public static IpAddressInfo Loopback = new IpAddressInfo("127.0.0.1", IpAddressFamily.InterNetwork);
-        public static IpAddressInfo IPv6Loopback = new IpAddressInfo("::1", IpAddressFamily.InterNetworkV6);
-
-        public string Address { get; set; }
-        public IpAddressInfo SubnetMask { get; set; }
-        public IpAddressFamily AddressFamily { get; set; }
-
-        public IpAddressInfo(string address, IpAddressFamily addressFamily)
-        {
-            Address = address;
-            AddressFamily = addressFamily;
-        }
-
-        public bool Equals(IpAddressInfo address)
-        {
-            return string.Equals(address.Address, Address, StringComparison.OrdinalIgnoreCase);
-        }
-
-        public override string ToString()
-        {
-            return Address;
-        }
-    }
-
-    public enum IpAddressFamily
-    {
-        InterNetwork,
-        InterNetworkV6
-    }
-}
diff --git a/MediaBrowser.Model/Net/IpEndPointInfo.cs b/MediaBrowser.Model/Net/IpEndPointInfo.cs
deleted file mode 100644
index f8c125144..000000000
--- a/MediaBrowser.Model/Net/IpEndPointInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Globalization;
-
-namespace MediaBrowser.Model.Net
-{
-    public class IpEndPointInfo
-    {
-        public IpAddressInfo IpAddress { get; set; }
-
-        public int Port { get; set; }
-
-        public IpEndPointInfo()
-        {
-
-        }
-
-        public IpEndPointInfo(IpAddressInfo address, int port)
-        {
-            IpAddress = address;
-            Port = port;
-        }
-
-        public override string ToString()
-        {
-            var ipAddresString = IpAddress == null ? string.Empty : IpAddress.ToString();
-
-            return ipAddresString + ":" + Port.ToString(CultureInfo.InvariantCulture);
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 659abe84c..d7bf956bb 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -12,113 +12,133 @@ namespace MediaBrowser.Model.Net
     public static class MimeTypes
     {
         /// <summary>
-        /// Any extension in this list is considered a video file - can be added to at runtime for extensibility
+        /// Any extension in this list is considered a video file
         /// </summary>
-        private static readonly string[] VideoFileExtensions = new string[]
-            {
-                ".mkv",
-                ".m2t",
-                ".m2ts",
-                ".img",
-                ".iso",
-                ".mk3d",
-                ".ts",
-                ".rmvb",
-                ".mov",
-                ".avi",
-                ".mpg",
-                ".mpeg",
-                ".wmv",
-                ".mp4",
-                ".divx",
-                ".dvr-ms",
-                ".wtv",
-                ".ogm",
-                ".ogv",
-                ".asf",
-                ".m4v",
-                ".flv",
-                ".f4v",
-                ".3gp",
-                ".webm",
-                ".mts",
-                ".m2v",
-                ".rec"
-        };
-
-        private static Dictionary<string, string> GetVideoFileExtensionsDictionary()
+        private static readonly HashSet<string> _videoFileExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
-            var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (string ext in VideoFileExtensions)
-            {
-                dict[ext] = ext;
-            }
-
-            return dict;
-        }
-
-        private static readonly Dictionary<string, string> VideoFileExtensionsDictionary = GetVideoFileExtensionsDictionary();
+            ".mkv",
+            ".m2t",
+            ".m2ts",
+            ".img",
+            ".iso",
+            ".mk3d",
+            ".ts",
+            ".rmvb",
+            ".mov",
+            ".avi",
+            ".mpg",
+            ".mpeg",
+            ".wmv",
+            ".mp4",
+            ".divx",
+            ".dvr-ms",
+            ".wtv",
+            ".ogm",
+            ".ogv",
+            ".asf",
+            ".m4v",
+            ".flv",
+            ".f4v",
+            ".3gp",
+            ".webm",
+            ".mts",
+            ".m2v",
+            ".rec"
+        };
 
         // http://en.wikipedia.org/wiki/Internet_media_type
         // Add more as needed
-
-        private static Dictionary<string, string> GetMimeTypeLookup()
+        private static readonly Dictionary<string, string> _mimeTypeLookup = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
-            var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            // Type application
+            { ".cbz", "application/x-cbz" },
+            { ".cbr", "application/epub+zip" },
+            { ".eot", "application/vnd.ms-fontobject" },
+            { ".epub", "application/epub+zip" },
+            { ".js", "application/x-javascript" },
+            { ".json", "application/json" },
+            { ".map", "application/x-javascript" },
+            { ".pdf", "application/pdf" },
+            { ".ttml", "application/ttml+xml" },
+            { ".m3u8", "application/x-mpegURL" },
+            { ".mobi", "application/x-mobipocket-ebook" },
+            { ".xml", "application/xml" },
+
+            // Type image
+            { ".jpg", "image/jpeg" },
+            { ".jpeg", "image/jpeg" },
+            { ".tbn", "image/jpeg" },
+            { ".png", "image/png" },
+            { ".gif", "image/gif" },
+            { ".tiff", "image/tiff" },
+            { ".webp", "image/webp" },
+            { ".ico", "image/vnd.microsoft.icon" },
+            { ".svg", "image/svg+xml" },
+            { ".svgz", "image/svg+xml" },
+
+            // Type font
+            { ".ttf" , "font/ttf" },
+            { ".woff" , "font/woff" },
 
-            dict.Add(".jpg", "image/jpeg");
-            dict.Add(".jpeg", "image/jpeg");
-            dict.Add(".tbn", "image/jpeg");
-            dict.Add(".png", "image/png");
-            dict.Add(".gif", "image/gif");
-            dict.Add(".tiff", "image/tiff");
-            dict.Add(".webp", "image/webp");
-            dict.Add(".ico", "image/vnd.microsoft.icon");
-            dict.Add(".mpg", "video/mpeg");
-            dict.Add(".mpeg", "video/mpeg");
-            dict.Add(".ogv", "video/ogg");
-            dict.Add(".mov", "video/quicktime");
-            dict.Add(".webm", "video/webm");
-            dict.Add(".mkv", "video/x-matroska");
-            dict.Add(".wmv", "video/x-ms-wmv");
-            dict.Add(".flv", "video/x-flv");
-            dict.Add(".avi", "video/x-msvideo");
-            dict.Add(".asf", "video/x-ms-asf");
-            dict.Add(".m4v", "video/x-m4v");
-            dict.Add(".m4s", "video/mp4");
-            dict.Add(".cbz", "application/x-cbz");
-            dict.Add(".cbr", "application/epub+zip");
-            dict.Add(".epub", "application/epub+zip");
-            dict.Add(".pdf", "application/pdf");
-            dict.Add(".mobi", "application/x-mobipocket-ebook");
-
-            dict.Add(".ass", "text/x-ssa");
-            dict.Add(".ssa", "text/x-ssa");
+            // Type text
+            { ".ass", "text/x-ssa" },
+            { ".ssa", "text/x-ssa" },
+            { ".css", "text/css" },
+            { ".csv", "text/csv" },
+            { ".txt", "text/plain" },
+            { ".vtt", "text/vtt" },
 
-            return dict;
-        }
+            // Type video
+            { ".mpg", "video/mpeg" },
+            { ".ogv", "video/ogg" },
+            { ".mov", "video/quicktime" },
+            { ".webm", "video/webm" },
+            { ".mkv", "video/x-matroska" },
+            { ".wmv", "video/x-ms-wmv" },
+            { ".flv", "video/x-flv" },
+            { ".avi", "video/x-msvideo" },
+            { ".asf", "video/x-ms-asf" },
+            { ".m4v", "video/x-m4v" },
+            { ".m4s", "video/mp4" },
+            { ".3gp", "video/3gpp" },
+            { ".3g2", "video/3gpp2" },
+            { ".mpd", "video/vnd.mpeg.dash.mpd" },
+            { ".ts", "video/mp2t" },
 
-        private static readonly Dictionary<string, string> MimeTypeLookup = GetMimeTypeLookup();
+            // Type audio
+            { ".mp3", "audio/mpeg" },
+            { ".m4a", "audio/mp4" },
+            { ".aac", "audio/mp4" },
+            { ".webma", "audio/webm" },
+            { ".wav", "audio/wav" },
+            { ".wma", "audio/x-ms-wma" },
+            { ".ogg", "audio/ogg" },
+            { ".oga", "audio/ogg" },
+            { ".opus", "audio/ogg" },
+            { ".ac3", "audio/ac3" },
+            { ".dsf", "audio/dsf" },
+            { ".m4b", "audio/m4b" },
+            { ".xsp", "audio/xsp" },
+            { ".dsp", "audio/dsp" },
+        };
 
-        private static readonly Dictionary<string, string> ExtensionLookup = CreateExtensionLookup();
+        private static readonly Dictionary<string, string> _extensionLookup = CreateExtensionLookup();
 
         private static Dictionary<string, string> CreateExtensionLookup()
         {
-            var dict = MimeTypeLookup
+            var dict = _mimeTypeLookup
                 .GroupBy(i => i.Value)
                 .ToDictionary(x => x.Key, x => x.First().Key, StringComparer.OrdinalIgnoreCase);
 
             dict["image/jpg"] = ".jpg";
             dict["image/x-png"] = ".png";
 
+            dict["audio/x-aac"] = ".aac";
+
             return dict;
         }
 
-        public static string GetMimeType(string path)
-        {
-            return GetMimeType(path, true);
-        }
+        public static string GetMimeType(string path) => GetMimeType(path, true);
 
         /// <summary>
         /// Gets the type of the MIME.
@@ -130,137 +150,30 @@ namespace MediaBrowser.Model.Net
                 throw new ArgumentNullException(nameof(path));
             }
 
-            var ext = Path.GetExtension(path) ?? string.Empty;
+            var ext = Path.GetExtension(path);
 
-            if (MimeTypeLookup.TryGetValue(ext, out string result))
+            if (_mimeTypeLookup.TryGetValue(ext, out string result))
             {
                 return result;
             }
 
-            // Type video
-            if (StringHelper.EqualsIgnoreCase(ext, ".3gp"))
-            {
-                return "video/3gpp";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".3g2"))
-            {
-                return "video/3gpp2";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".ts"))
-            {
-                return "video/mp2t";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".mpd"))
-            {
-                return "video/vnd.mpeg.dash.mpd";
-            }
-
             // Catch-all for all video types that don't require specific mime types
-            if (VideoFileExtensionsDictionary.ContainsKey(ext))
+            if (_videoFileExtensions.Contains(ext))
             {
-                return "video/" + ext.TrimStart('.').ToLowerInvariant();
+                return "video/" + ext.Substring(1);
             }
 
             // Type text
-            if (StringHelper.EqualsIgnoreCase(ext, ".css"))
-            {
-                return "text/css";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".csv"))
-            {
-                return "text/csv";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".html"))
+            if (StringHelper.EqualsIgnoreCase(ext, ".html")
+                || StringHelper.EqualsIgnoreCase(ext, ".htm"))
             {
                 return "text/html; charset=UTF-8";
             }
-            if (StringHelper.EqualsIgnoreCase(ext, ".htm"))
-            {
-                return "text/html; charset=UTF-8";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".txt"))
-            {
-                return "text/plain";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".log"))
-            {
-                return "text/plain";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".xml"))
-            {
-                return "application/xml";
-            }
 
-            // Type audio
-            if (StringHelper.EqualsIgnoreCase(ext, ".mp3"))
-            {
-                return "audio/mpeg";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".m4a"))
-            {
-                return "audio/mp4";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".aac"))
+            if (StringHelper.EqualsIgnoreCase(ext, ".log")
+                || StringHelper.EqualsIgnoreCase(ext, ".srt"))
             {
-                return "audio/mp4";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".webma"))
-            {
-                return "audio/webm";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".wav"))
-            {
-                return "audio/wav";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".wma"))
-            {
-                return "audio/x-ms-wma";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".flac"))
-            {
-                return "audio/flac";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".aac"))
-            {
-                return "audio/x-aac";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".ogg"))
-            {
-                return "audio/ogg";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".oga"))
-            {
-                return "audio/ogg";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".opus"))
-            {
-                return "audio/ogg";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".ac3"))
-            {
-                return "audio/ac3";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".dsf"))
-            {
-                return "audio/dsf";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".m4b"))
-            {
-                return "audio/m4b";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".xsp"))
-            {
-                return "audio/xsp";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".dsp"))
-            {
-                return "audio/dsp";
-            }
-
-            // Playlists
-            if (StringHelper.EqualsIgnoreCase(ext, ".m3u8"))
-            {
-                return "application/x-mpegURL";
+                return "text/plain";
             }
 
             // Misc
@@ -269,63 +182,7 @@ namespace MediaBrowser.Model.Net
                 return "application/octet-stream";
             }
 
-            // Web
-            if (StringHelper.EqualsIgnoreCase(ext, ".js"))
-            {
-                return "application/x-javascript";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".json"))
-            {
-                return "application/json";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".map"))
-            {
-                return "application/x-javascript";
-            }
-
-            if (StringHelper.EqualsIgnoreCase(ext, ".woff"))
-            {
-                return "font/woff";
-            }
-
-            if (StringHelper.EqualsIgnoreCase(ext, ".ttf"))
-            {
-                return "font/ttf";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".eot"))
-            {
-                return "application/vnd.ms-fontobject";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".svg"))
-            {
-                return "image/svg+xml";
-            }
-            if (StringHelper.EqualsIgnoreCase(ext, ".svgz"))
-            {
-                return "image/svg+xml";
-            }
-
-            if (StringHelper.EqualsIgnoreCase(ext, ".srt"))
-            {
-                return "text/plain";
-            }
-
-            if (StringHelper.EqualsIgnoreCase(ext, ".vtt"))
-            {
-                return "text/vtt";
-            }
-
-            if (StringHelper.EqualsIgnoreCase(ext, ".ttml"))
-            {
-                return "application/ttml+xml";
-            }
-
-            if (enableStreamDefault)
-            {
-                return "application/octet-stream";
-            }
-
-            return null;
+            return enableStreamDefault ? "application/octet-stream" : null;
         }
 
         public static string ToExtension(string mimeType)
@@ -338,10 +195,11 @@ namespace MediaBrowser.Model.Net
             // handle text/html; charset=UTF-8
             mimeType = mimeType.Split(';')[0];
 
-            if (ExtensionLookup.TryGetValue(mimeType, out string result))
+            if (_extensionLookup.TryGetValue(mimeType, out string result))
             {
                 return result;
             }
+
             return null;
         }
     }
diff --git a/MediaBrowser.Model/Net/SocketReceiveResult.cs b/MediaBrowser.Model/Net/SocketReceiveResult.cs
index 8c394f7c7..cd7a2e55f 100644
--- a/MediaBrowser.Model/Net/SocketReceiveResult.cs
+++ b/MediaBrowser.Model/Net/SocketReceiveResult.cs
@@ -1,3 +1,5 @@
+using System.Net;
+
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
@@ -18,7 +20,7 @@ namespace MediaBrowser.Model.Net
         /// <summary>
         /// The <see cref="IpEndPointInfo"/> the data was received from.
         /// </summary>
-        public IpEndPointInfo RemoteEndPoint { get; set; }
-        public IpAddressInfo LocalIPAddress { get; set; }
+        public IPEndPoint RemoteEndPoint { get; set; }
+        public IPAddress LocalIPAddress { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Services/IHttpRequest.cs b/MediaBrowser.Model/Services/IHttpRequest.cs
index 50c6076f3..daf91488f 100644
--- a/MediaBrowser.Model/Services/IHttpRequest.cs
+++ b/MediaBrowser.Model/Services/IHttpRequest.cs
@@ -8,26 +8,6 @@ namespace MediaBrowser.Model.Services
         string HttpMethod { get; }
 
         /// <summary>
-        /// The IP Address of the X-Forwarded-For header, null if null or empty
-        /// </summary>
-        string XForwardedFor { get; }
-
-        /// <summary>
-        /// The Port number of the X-Forwarded-Port header, null if null or empty
-        /// </summary>
-        int? XForwardedPort { get; }
-
-        /// <summary>
-        /// The http or https scheme of the X-Forwarded-Proto header, null if null or empty
-        /// </summary>
-        string XForwardedProtocol { get; }
-
-        /// <summary>
-        /// The value of the X-Real-IP header, null if null or empty
-        /// </summary>
-        string XRealIp { get; }
-
-        /// <summary>
         /// The value of the Accept HTTP Request Header
         /// </summary>
         string Accept { get; }
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
index d97eda352..d6e031e42 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -25,6 +25,11 @@ namespace MediaBrowser.Model.System
         /// </summary>
         /// <value>The version.</value>
         public string Version { get; set; }
+        
+        /// <summary>
+        /// The product name. This is the AssemblyProduct name.
+        /// </summary>
+        public string ProductName { get; set; }
 
         /// <summary>
         /// Gets or sets the operating system.
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 222c10798..3f73cc4e0 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -32,10 +32,6 @@ namespace MediaBrowser.Model.System
         /// <value>The display name of the operating system.</value>
         public string OperatingSystemDisplayName { get; set; }
 
-        /// <summary>
-        /// The product name. This is the AssemblyProduct name.
-        /// </summary>
-        public string ProductName { get; set; }
 
         /// <summary>
         /// Get or sets the package name.
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 5415fd5e8..f63ab2bb4 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -75,6 +75,7 @@ namespace MediaBrowser.Model.Users
 
         public int RemoteClientBitrateLimit { get; set; }
         public string AuthenticationProviderId { get; set; }
+        public string PasswordResetProviderId { get; set; }
 
         public UserPolicy()
         {