From 13fbfe6091e61450aedc07bc78c96bf4c414bc65 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 14 Feb 2021 15:11:46 +0100
Subject: Target net6.0

---
 MediaBrowser.Model/Net/MimeTypes.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 7b3c17c85..1d9150f02 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Jellyfin.Extensions;
@@ -164,15 +165,16 @@ namespace MediaBrowser.Model.Net
             return dict;
         }
 
-        public static string? GetMimeType(string path) => GetMimeType(path, true);
+        public static string GetMimeType(string path) => GetMimeType(path, "application/octet-stream");
 
         /// <summary>
         /// Gets the type of the MIME.
         /// </summary>
         /// <param name="filename">The filename to find the MIME type of.</param>
-        /// <param name="enableStreamDefault">Whether of not to return a default value if no fitting MIME type is found.</param>
-        /// <returns>The worrect MIME type for the given filename, or `null` if it wasn't found and <paramref name="enableStreamDefault"/> is false.</returns>
-        public static string? GetMimeType(string filename, bool enableStreamDefault)
+        /// <param name="defaultValue">Theefault value to return if no fitting MIME type is found.</param>
+        /// <returns>The correct MIME type for the given filename, or <paramref name="defaultValue"/> if it wasn't found.</returns>
+        [return: NotNullIfNotNullAttribute("defaultValue")]
+        public static string? GetMimeType(string filename, string? defaultValue = null)
         {
             if (filename.Length == 0)
             {
@@ -211,7 +213,7 @@ namespace MediaBrowser.Model.Net
                 return "application/octet-stream";
             }
 
-            return enableStreamDefault ? "application/octet-stream" : null;
+            return defaultValue;
         }
 
         public static string? ToExtension(string mimeType)
-- 
cgit v1.2.3


From 5fd315b17c7c95c05eaba0713b27f6a95d31e164 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 24 Sep 2021 20:15:10 +0200
Subject: Address comments

---
 Emby.Server.Implementations/Data/SqliteItemRepository.cs | 6 +++---
 MediaBrowser.Model/Net/MimeTypes.cs                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 88cd4476a..0a48b844d 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1610,7 +1610,7 @@ namespace Emby.Server.Implementations.Data
                 if (reader.TryGetString(index++, out var lockedFields))
                 {
                     List<MetadataField> fields = null;
-                    foreach (var i in lockedFields.Split('|'))
+                    foreach (var i in lockedFields.AsSpan().Split('|'))
                     {
                         if (Enum.TryParse(i, true, out MetadataField parsedValue))
                         {
@@ -1645,7 +1645,7 @@ namespace Emby.Server.Implementations.Data
                     if (reader.TryGetString(index, out var trailerTypes))
                     {
                         List<TrailerType> types = null;
-                        foreach (var i in trailerTypes.Split('|'))
+                        foreach (var i in trailerTypes.AsSpan().Split('|'))
                         {
                             if (Enum.TryParse(i, true, out TrailerType parsedValue))
                             {
@@ -1653,7 +1653,7 @@ namespace Emby.Server.Implementations.Data
                             }
                         }
 
-                        trailer.TrailerTypes = types.ToArray() ?? Array.Empty<TrailerType>();
+                        trailer.TrailerTypes = types?.ToArray() ?? Array.Empty<TrailerType>();
                     }
                 }
 
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 1d9150f02..748170a0e 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -171,7 +171,7 @@ namespace MediaBrowser.Model.Net
         /// Gets the type of the MIME.
         /// </summary>
         /// <param name="filename">The filename to find the MIME type of.</param>
-        /// <param name="defaultValue">Theefault value to return if no fitting MIME type is found.</param>
+        /// <param name="defaultValue">The default value to return if no fitting MIME type is found.</param>
         /// <returns>The correct MIME type for the given filename, or <paramref name="defaultValue"/> if it wasn't found.</returns>
         [return: NotNullIfNotNullAttribute("defaultValue")]
         public static string? GetMimeType(string filename, string? defaultValue = null)
-- 
cgit v1.2.3