From 30ce346f343ca61f921ec7d6faf2f06311c04e71 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 5 Apr 2020 18:10:56 +0200
Subject: Enable nullabe reference types for MediaBrowser.Model

---
 MediaBrowser.Model/Net/MimeTypes.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Model/Net/MimeTypes.cs')

diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 68bcc590c..cfac4d1e2 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -8,12 +8,12 @@ using System.Linq;
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
-    /// Class MimeTypes
+    /// Class MimeTypes.
     /// </summary>
     public static class MimeTypes
     {
         /// <summary>
-        /// Any extension in this list is considered a video file
+        /// Any extension in this list is considered a video file.
         /// </summary>
         private static readonly HashSet<string> _videoFileExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
@@ -141,16 +141,16 @@ namespace MediaBrowser.Model.Net
             return dict;
         }
 
-        public static string GetMimeType(string path) => GetMimeType(path, true);
+        public static string? GetMimeType(string path) => GetMimeType(path, true);
 
         /// <summary>
         /// Gets the type of the MIME.
         /// </summary>
-        public static string GetMimeType(string path, bool enableStreamDefault)
+        public static string? GetMimeType(string path, bool enableStreamDefault)
         {
-            if (string.IsNullOrEmpty(path))
+            if (path.Length == 0)
             {
-                throw new ArgumentNullException(nameof(path));
+                throw new ArgumentException("String can't be empty.", nameof(path));
             }
 
             var ext = Path.GetExtension(path);
@@ -188,11 +188,11 @@ namespace MediaBrowser.Model.Net
             return enableStreamDefault ? "application/octet-stream" : null;
         }
 
-        public static string ToExtension(string mimeType)
+        public static string? ToExtension(string mimeType)
         {
-            if (string.IsNullOrEmpty(mimeType))
+            if (mimeType.Length == 0)
             {
-                throw new ArgumentNullException(nameof(mimeType));
+                throw new ArgumentException("String can't be empty.", nameof(mimeType));
             }
 
             // handle text/html; charset=UTF-8
-- 
cgit v1.2.3


From b065f5db1ded37703dd0e2bcaaf137d546719fc3 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Fri, 4 Sep 2020 17:41:31 -0400
Subject: Fix aac mime-type

---
 MediaBrowser.Model/Net/MimeTypes.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Model/Net/MimeTypes.cs')

diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 771ca84f7..afe7351d3 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -125,7 +125,7 @@ namespace MediaBrowser.Model.Net
             { ".wmv", "video/x-ms-wmv" },
 
             // Type audio
-            { ".aac", "audio/mp4" },
+            { ".aac", "audio/aac" },
             { ".ac3", "audio/ac3" },
             { ".ape", "audio/x-ape" },
             { ".dsf", "audio/dsf" },
-- 
cgit v1.2.3