From 4d1d9f23d5edd248900118963874a7ab83d04aa1 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 23 May 2021 00:20:19 +0200
Subject: Use new Enum.TryParse(ReadOnlySpan<char>) overload

---
 .../Data/SqliteItemRepository.cs                   | 27 +++++++++-------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteItemRepository.cs')

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 88fc5018d..88cd4476a 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1150,7 +1150,7 @@ namespace Emby.Server.Implementations.Data
                 return null;
             }
 
-            if (Enum.TryParse(imageType.ToString(), true, out ImageType type))
+            if (Enum.TryParse(imageType, true, out ImageType type))
             {
                 image.Type = type;
             }
@@ -1571,7 +1571,6 @@ namespace Emby.Server.Implementations.Data
 
             if (reader.TryGetString(index++, out var audioString))
             {
-                // TODO Span overload coming in the future https://github.com/dotnet/runtime/issues/1916
                 if (Enum.TryParse(audioString, true, out ProgramAudio audio))
                 {
                     item.Audio = audio;
@@ -1610,18 +1609,16 @@ namespace Emby.Server.Implementations.Data
             {
                 if (reader.TryGetString(index++, out var lockedFields))
                 {
-                    IEnumerable<MetadataField> GetLockedFields(string s)
+                    List<MetadataField> fields = null;
+                    foreach (var i in lockedFields.Split('|'))
                     {
-                        foreach (var i in s.Split('|', StringSplitOptions.RemoveEmptyEntries))
+                        if (Enum.TryParse(i, true, out MetadataField parsedValue))
                         {
-                            if (Enum.TryParse(i, true, out MetadataField parsedValue))
-                            {
-                                yield return parsedValue;
-                            }
+                            (fields ??= new List<MetadataField>()).Add(parsedValue);
                         }
                     }
 
-                    item.LockedFields = GetLockedFields(lockedFields).ToArray();
+                    item.LockedFields = fields?.ToArray() ?? Array.Empty<MetadataField>();
                 }
             }
 
@@ -1647,18 +1644,16 @@ namespace Emby.Server.Implementations.Data
                 {
                     if (reader.TryGetString(index, out var trailerTypes))
                     {
-                        IEnumerable<TrailerType> GetTrailerTypes(string s)
+                        List<TrailerType> types = null;
+                        foreach (var i in trailerTypes.Split('|'))
                         {
-                            foreach (var i in s.Split('|', StringSplitOptions.RemoveEmptyEntries))
+                            if (Enum.TryParse(i, true, out TrailerType parsedValue))
                             {
-                                if (Enum.TryParse(i, true, out TrailerType parsedValue))
-                                {
-                                    yield return parsedValue;
-                                }
+                                (types ??= new List<TrailerType>()).Add(parsedValue);
                             }
                         }
 
-                        trailer.TrailerTypes = GetTrailerTypes(trailerTypes).ToArray();
+                        trailer.TrailerTypes = types.ToArray() ?? Array.Empty<TrailerType>();
                     }
                 }
 
-- 
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 'Emby.Server.Implementations/Data/SqliteItemRepository.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