From 42a2cc1747c7859c63334a7a45792e0af1410e1a Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Mon, 24 May 2021 00:30:41 +0200
Subject: Remove some unnecessary allocations

---
 .../BaseItemManager/BaseItemManager.cs             |  9 ++++---
 MediaBrowser.Controller/Entities/BaseItem.cs       | 31 +++++++++++++---------
 .../Extensions/StringExtensions.cs                 | 21 +++++++++++++++
 MediaBrowser.Controller/Library/ILibraryManager.cs |  7 +++++
 .../MediaBrowser.Controller.csproj                 |  5 ++--
 .../Providers/DirectoryService.cs                  | 26 ++++++++++++------
 .../Providers/IDirectoryService.cs                 |  4 ++-
 .../Providers/MetadataResult.cs                    | 18 ++++++++++---
 8 files changed, 90 insertions(+), 31 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/BaseItemManager/BaseItemManager.cs b/MediaBrowser.Controller/BaseItemManager/BaseItemManager.cs
index 68119cfed..ffc274c5d 100644
--- a/MediaBrowser.Controller/BaseItemManager/BaseItemManager.cs
+++ b/MediaBrowser.Controller/BaseItemManager/BaseItemManager.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Linq;
 using System.Threading;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -52,7 +53,7 @@ namespace MediaBrowser.Controller.BaseItemManager
             var typeOptions = libraryOptions.GetTypeOptions(baseItem.GetType().Name);
             if (typeOptions != null)
             {
-                return typeOptions.MetadataFetchers.Contains(name, StringComparer.OrdinalIgnoreCase);
+                return typeOptions.MetadataFetchers.Contains(name.AsSpan(), StringComparison.OrdinalIgnoreCase);
             }
 
             if (!libraryOptions.EnableInternetProviders)
@@ -62,7 +63,7 @@ namespace MediaBrowser.Controller.BaseItemManager
 
             var itemConfig = _serverConfigurationManager.Configuration.MetadataOptions.FirstOrDefault(i => string.Equals(i.ItemType, GetType().Name, StringComparison.OrdinalIgnoreCase));
 
-            return itemConfig == null || !itemConfig.DisabledMetadataFetchers.Contains(name, StringComparer.OrdinalIgnoreCase);
+            return itemConfig == null || !itemConfig.DisabledMetadataFetchers.Contains(name.AsSpan(), StringComparison.OrdinalIgnoreCase);
         }
 
         /// <inheritdoc />
@@ -83,7 +84,7 @@ namespace MediaBrowser.Controller.BaseItemManager
             var typeOptions = libraryOptions.GetTypeOptions(baseItem.GetType().Name);
             if (typeOptions != null)
             {
-                return typeOptions.ImageFetchers.Contains(name, StringComparer.OrdinalIgnoreCase);
+                return typeOptions.ImageFetchers.Contains(name.AsSpan(), StringComparison.OrdinalIgnoreCase);
             }
 
             if (!libraryOptions.EnableInternetProviders)
@@ -93,7 +94,7 @@ namespace MediaBrowser.Controller.BaseItemManager
 
             var itemConfig = _serverConfigurationManager.Configuration.MetadataOptions.FirstOrDefault(i => string.Equals(i.ItemType, GetType().Name, StringComparison.OrdinalIgnoreCase));
 
-            return itemConfig == null || !itemConfig.DisabledImageFetchers.Contains(name, StringComparer.OrdinalIgnoreCase);
+            return itemConfig == null || !itemConfig.DisabledImageFetchers.Contains(name.AsSpan(), StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 6e46b4cec..2574961b8 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -666,14 +666,12 @@ namespace MediaBrowser.Controller.Entities
         {
             if (SourceType == SourceType.Channel)
             {
-                return System.IO.Path.Combine(basePath, "channels", ChannelId.ToString("N", CultureInfo.InvariantCulture), Id.ToString("N", CultureInfo.InvariantCulture));
+                return System.IO.Path.Join(basePath, "channels", ChannelId.ToString("N", CultureInfo.InvariantCulture), Id.ToString("N", CultureInfo.InvariantCulture));
             }
 
             ReadOnlySpan<char> idString = Id.ToString("N", CultureInfo.InvariantCulture);
 
-            basePath = System.IO.Path.Combine(basePath, "library");
-
-            return System.IO.Path.Join(basePath, idString.Slice(0, 2), idString);
+            return System.IO.Path.Join(basePath, "library", idString.Slice(0, 2), idString);
         }
 
         /// <summary>
@@ -1258,7 +1256,7 @@ namespace MediaBrowser.Controller.Entities
 
             // Support plex/xbmc convention
             files.AddRange(fileSystemChildren
-                .Where(i => !i.IsDirectory && string.Equals(FileSystem.GetFileNameWithoutExtension(i), ThemeSongFilename, StringComparison.OrdinalIgnoreCase)));
+                .Where(i => !i.IsDirectory && System.IO.Path.GetFileNameWithoutExtension(i.FullName.AsSpan()).Equals(ThemeSongFilename, StringComparison.OrdinalIgnoreCase)));
 
             return LibraryManager.ResolvePaths(files, directoryService, null, new LibraryOptions())
                 .OfType<Audio.Audio>()
@@ -1319,14 +1317,16 @@ namespace MediaBrowser.Controller.Entities
         {
             var extras = new List<Video>();
 
-            var folders = fileSystemChildren.Where(i => i.IsDirectory).ToArray();
+            var libraryOptions = new LibraryOptions();
+            var folders = fileSystemChildren.Where(i => i.IsDirectory).ToList();
             foreach (var extraFolderName in AllExtrasTypesFolderNames)
             {
                 var files = folders
                     .Where(i => string.Equals(i.Name, extraFolderName, StringComparison.OrdinalIgnoreCase))
                     .SelectMany(i => FileSystem.GetFiles(i.FullName));
 
-                extras.AddRange(LibraryManager.ResolvePaths(files, directoryService, null, new LibraryOptions())
+                // Re-using the same instance of LibraryOptions since it looks like it's never being altered.
+                extras.AddRange(LibraryManager.ResolvePaths(files, directoryService, null, libraryOptions)
                     .OfType<Video>()
                     .Select(item =>
                     {
@@ -2323,7 +2323,7 @@ namespace MediaBrowser.Controller.Entities
                 .Where(i => i.IsLocalFile)
                 .Select(i => System.IO.Path.GetDirectoryName(i.Path))
                 .Distinct(StringComparer.OrdinalIgnoreCase)
-                .SelectMany(directoryService.GetFilePaths)
+                .SelectMany(path => directoryService.GetFilePaths(path))
                 .ToList();
 
             var deletedImages = ImageInfos
@@ -2433,7 +2433,15 @@ namespace MediaBrowser.Controller.Entities
                 throw new ArgumentException("No image info for chapter images");
             }
 
-            return ImageInfos.Where(i => i.Type == imageType);
+            // Yield return is more performant than LINQ Where on an Array
+            for (var i = 0; i < ImageInfos.Length; i++)
+            {
+                var imageInfo = ImageInfos[i];
+                if (imageInfo.Type == imageType)
+                {
+                    yield return imageInfo;
+                }
+            }
         }
 
         /// <summary>
@@ -2465,7 +2473,7 @@ namespace MediaBrowser.Controller.Entities
                 }
 
                 var existing = existingImages
-                    .FirstOrDefault(i => string.Equals(i.Path, newImage.FullName, StringComparison.OrdinalIgnoreCase));
+                    .Find(i => string.Equals(i.Path, newImage.FullName, StringComparison.OrdinalIgnoreCase));
 
                 if (existing == null)
                 {
@@ -2496,8 +2504,7 @@ namespace MediaBrowser.Controller.Entities
                 var newImagePaths = images.Select(i => i.FullName).ToList();
 
                 var deleted = existingImages
-                    .Where(i => i.IsLocalFile && !newImagePaths.Contains(i.Path, StringComparer.OrdinalIgnoreCase) && !File.Exists(i.Path))
-                    .ToList();
+                    .FindAll(i => i.IsLocalFile && !newImagePaths.Contains(i.Path.AsSpan(), StringComparison.OrdinalIgnoreCase) && !File.Exists(i.Path));
 
                 if (deleted.Count > 0)
                 {
diff --git a/MediaBrowser.Controller/Extensions/StringExtensions.cs b/MediaBrowser.Controller/Extensions/StringExtensions.cs
index 1853896ee..291485e75 100644
--- a/MediaBrowser.Controller/Extensions/StringExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/StringExtensions.cs
@@ -22,6 +22,27 @@ namespace MediaBrowser.Controller.Extensions
             return Normalize(string.Concat(chars), NormalizationForm.FormC);
         }
 
+        /// <summary>
+        /// Counts the number of occurrences of [needle] in the string.
+        /// </summary>
+        /// <param name="value">The haystack to search in.</param>
+        /// <param name="needle">The character to search for.</param>
+        /// <returns>The number of occurrences of the [needle] character.</returns>
+        public static int CountOccurrences(this ReadOnlySpan<char> value, char needle)
+        {
+            var count = 0;
+            var length = value.Length;
+            for (var i = 0; i < length; i++)
+            {
+                if (value[i] == needle)
+                {
+                    count++;
+                }
+            }
+
+            return count;
+        }
+
         private static string Normalize(string text, NormalizationForm form, bool stripStringOnFailure = true)
         {
             if (stripStringOnFailure)
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 3fd4ff899..4e46baa66 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Naming.Common;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
@@ -593,5 +594,11 @@ namespace MediaBrowser.Controller.Library
         BaseItem GetParentItem(string parentId, Guid? userId);
 
         BaseItem GetParentItem(Guid? parentId, Guid? userId);
+
+        /// <summary>
+        /// Gets or creates a static instance of <see cref="NamingOptions"/>.
+        /// </summary>
+        /// <returns>An instance of the <see cref="NamingOptions"/> class.</returns>
+        NamingOptions GetNamingOptions();
     }
 }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 3f3a505ea..ee76ff080 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -21,8 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    <ProjectReference Include="../Emby.Naming/Emby.Naming.csproj" />
+    <ProjectReference Include="../MediaBrowser.Model/MediaBrowser.Model.csproj" />
+    <ProjectReference Include="../MediaBrowser.Common/MediaBrowser.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index 291a26883..ba5290763 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -25,15 +25,16 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata[] GetFileSystemEntries(string path)
         {
-            return _cache.GetOrAdd(path, p => _fileSystem.GetFileSystemEntries(p).ToArray());
+            return _cache.GetOrAdd(path, (p, fileSystem) => fileSystem.GetFileSystemEntries(p).ToArray(), _fileSystem);
         }
 
         public List<FileSystemMetadata> GetFiles(string path)
         {
             var list = new List<FileSystemMetadata>();
             var items = GetFileSystemEntries(path);
-            foreach (var item in items)
+            for (var i = 0; i < items.Length; i++)
             {
+                var item = items[i];
                 if (!item.IsDirectory)
                 {
                     list.Add(item);
@@ -48,10 +49,9 @@ namespace MediaBrowser.Controller.Providers
             if (!_fileCache.TryGetValue(path, out var result))
             {
                 var file = _fileSystem.GetFileInfo(path);
-                var res = file != null && file.Exists ? file : null;
-                if (res != null)
+                if (file.Exists)
                 {
-                    result = res;
+                    result = file;
                     _fileCache.TryAdd(path, result);
                 }
             }
@@ -60,16 +60,26 @@ namespace MediaBrowser.Controller.Providers
         }
 
         public IReadOnlyList<string> GetFilePaths(string path)
-            => GetFilePaths(path, false);
+            => GetFilePaths(path, false, false);
 
-        public IReadOnlyList<string> GetFilePaths(string path, bool clearCache)
+        public IReadOnlyList<string> GetSortedFilePaths(string path, bool clearCache)
+            => GetFilePaths(path, clearCache, true);
+
+        public IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false)
         {
             if (clearCache)
             {
                 _filePathCache.TryRemove(path, out _);
             }
 
-            return _filePathCache.GetOrAdd(path, p => _fileSystem.GetFilePaths(p).ToList());
+            var filePaths = _filePathCache.GetOrAdd(path, (p, fileSystem) => fileSystem.GetFilePaths(p).ToList(), _fileSystem);
+
+            if (sort)
+            {
+                filePaths.Sort();
+            }
+
+            return filePaths;
         }
     }
 }
diff --git a/MediaBrowser.Controller/Providers/IDirectoryService.cs b/MediaBrowser.Controller/Providers/IDirectoryService.cs
index 9cee06a4c..beb685b6d 100644
--- a/MediaBrowser.Controller/Providers/IDirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/IDirectoryService.cs
@@ -15,6 +15,8 @@ namespace MediaBrowser.Controller.Providers
 
         IReadOnlyList<string> GetFilePaths(string path);
 
-        IReadOnlyList<string> GetFilePaths(string path, bool clearCache);
+        IReadOnlyList<string> GetSortedFilePaths(string path, bool clearCache);
+
+        IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false);
     }
 }
diff --git a/MediaBrowser.Controller/Providers/MetadataResult.cs b/MediaBrowser.Controller/Providers/MetadataResult.cs
index 8b0967a6e..7ec1eefcd 100644
--- a/MediaBrowser.Controller/Providers/MetadataResult.cs
+++ b/MediaBrowser.Controller/Providers/MetadataResult.cs
@@ -12,16 +12,26 @@ namespace MediaBrowser.Controller.Providers
 {
     public class MetadataResult<T>
     {
+        // Images aren't always used so the allocation is a waste a lot of the time
+        private List<LocalImageInfo> _images;
+        private List<(string url, ImageType type)> _remoteImages;
+
         public MetadataResult()
         {
-            Images = new List<LocalImageInfo>();
-            RemoteImages = new List<(string url, ImageType type)>();
             ResultLanguage = "en";
         }
 
-        public List<LocalImageInfo> Images { get; set; }
+        public List<LocalImageInfo> Images
+        {
+            get => _images ??= new List<LocalImageInfo>();
+            set => _images = value;
+        }
 
-        public List<(string url, ImageType type)> RemoteImages { get; set; }
+        public List<(string url, ImageType type)> RemoteImages
+        {
+            get => _remoteImages ??= new List<(string url, ImageType type)>();
+            set => _remoteImages = value;
+        }
 
         public List<UserItemData> UserDataList { get; set; }
 
-- 
cgit v1.2.3


From 0835b26889e1b26d3bd00abfb076da3b6eb4424e Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Mon, 31 May 2021 13:55:54 +0200
Subject: review

---
 .../Data/SqliteItemRepository.cs                   | 97 +++++++++++++---------
 .../Extensions/StringBuilderExtensions.cs          | 34 ++++++++
 .../Providers/DirectoryService.cs                  |  5 +-
 .../Providers/IDirectoryService.cs                 |  2 -
 .../MediaInfo/SubtitleResolver.cs                  |  2 +-
 .../Data/SqliteItemRepositoryTests.cs              | 20 -----
 6 files changed, 95 insertions(+), 65 deletions(-)
 create mode 100644 MediaBrowser.Common/Extensions/StringBuilderExtensions.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 1480600cf..15a4ab318 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -2270,7 +2270,7 @@ namespace Emby.Server.Implementations.Data
             return query.IncludeItemTypes.Any(x => _seriesTypes.Contains(x));
         }
 
-        private List<string> GetFinalColumnsToSelect(InternalItemsQuery query, List<string> columns)
+        private void SetFinalColumnsToSelect(InternalItemsQuery query, List<string> columns)
         {
             foreach (var field in _allFields)
             {
@@ -2438,8 +2438,6 @@ namespace Emby.Server.Implementations.Data
 
                 columns.Add(builder.ToString());
             }
-
-            return columns;
         }
 
         private void BindSearchParams(InternalItemsQuery query, IStatement statement)
@@ -2541,8 +2539,10 @@ namespace Emby.Server.Implementations.Data
                 query.Limit = query.Limit.Value + 4;
             }
 
-            var commandTextBuilder = new StringBuilder("select ")
-                .AppendJoin(',', GetFinalColumnsToSelect(query, new List<string> { "count(distinct PresentationUniqueKey)" }))
+            var columns = new List<string> { "count(distinct PresentationUniqueKey)" };
+            SetFinalColumnsToSelect(query, columns);
+            var commandTextBuilder = new StringBuilder("select ", 256)
+                .AppendJoin(',', columns)
                 .Append(FromText)
                 .Append(GetJoinUserDataText(query));
 
@@ -2595,8 +2595,10 @@ namespace Emby.Server.Implementations.Data
                 query.Limit = query.Limit.Value + 4;
             }
 
-            var commandTextBuilder = new StringBuilder("select ")
-                .AppendJoin(',', GetFinalColumnsToSelect(query, _retriveItemColumns.ToList()))
+            var columns = _retriveItemColumns.ToList();
+            SetFinalColumnsToSelect(query, columns);
+            var commandTextBuilder = new StringBuilder("select ", 1024)
+                .AppendJoin(',', columns)
                 .Append(FromText)
                 .Append(GetJoinUserDataText(query));
 
@@ -2618,13 +2620,13 @@ namespace Emby.Server.Implementations.Data
                 if (query.Limit.HasValue || offset > 0)
                 {
                     commandTextBuilder.Append(" LIMIT ")
-                        .Append((query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture));
+                        .Append(query.Limit ?? int.MaxValue);
                 }
 
                 if (offset > 0)
                 {
                     commandTextBuilder.Append(" OFFSET ")
-                        .Append(offset.ToString(CultureInfo.InvariantCulture));
+                        .Append(offset);
                 }
             }
 
@@ -2784,8 +2786,10 @@ namespace Emby.Server.Implementations.Data
                 query.Limit = query.Limit.Value + 4;
             }
 
-            var commandTextBuilder = new StringBuilder("select ")
-                .AppendJoin(',', GetFinalColumnsToSelect(query, _retriveItemColumns.ToList()))
+            var columns = _retriveItemColumns.ToList();
+            SetFinalColumnsToSelect(query, columns);
+            var commandTextBuilder = new StringBuilder("select ", 512)
+                .AppendJoin(',', columns)
                 .Append(FromText)
                 .Append(GetJoinUserDataText(query));
 
@@ -2811,13 +2815,13 @@ namespace Emby.Server.Implementations.Data
                 if (query.Limit.HasValue || offset > 0)
                 {
                     commandTextBuilder.Append(" LIMIT ")
-                        .Append((query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture));
+                        .Append(query.Limit ?? int.MaxValue);
                 }
 
                 if (offset > 0)
                 {
                     commandTextBuilder.Append(" OFFSET ")
-                        .Append(offset.ToString(CultureInfo.InvariantCulture));
+                        .Append(offset);
                 }
             }
 
@@ -2836,20 +2840,24 @@ namespace Emby.Server.Implementations.Data
 
                 commandTextBuilder.Append(" select ");
 
+                List<string> columnsToSelect;
                 if (EnableGroupByPresentationUniqueKey(query))
                 {
-                    commandTextBuilder.AppendJoin(',', GetFinalColumnsToSelect(query, new List<string> { "count (distinct PresentationUniqueKey)" }));
+                    columnsToSelect = new List<string> { "count (distinct PresentationUniqueKey)" };
                 }
                 else if (query.GroupBySeriesPresentationUniqueKey)
                 {
-                    commandTextBuilder.AppendJoin(',', GetFinalColumnsToSelect(query, new List<string> { "count (distinct SeriesPresentationUniqueKey)" }));
+                    columnsToSelect = new List<string> { "count (distinct SeriesPresentationUniqueKey)" };
                 }
                 else
                 {
-                    commandTextBuilder.AppendJoin(',', GetFinalColumnsToSelect(query, new List<string> { "count (guid)" }));
+                    columnsToSelect = new List<string> { "count (guid)" };
                 }
 
-                commandTextBuilder.Append(FromText)
+                SetFinalColumnsToSelect(query, columnsToSelect);
+
+                commandTextBuilder.AppendJoin(',', columnsToSelect)
+                    .Append(FromText)
                     .Append(GetJoinUserDataText(query));
                 if (!string.IsNullOrEmpty(whereText))
                 {
@@ -3062,8 +3070,10 @@ namespace Emby.Server.Implementations.Data
 
             var now = DateTime.UtcNow;
 
-            var commandTextBuilder = new StringBuilder("select ")
-                .AppendJoin(',', GetFinalColumnsToSelect(query, new List<string> { "guid" }))
+            var columns = new List<string> { "guid" };
+            SetFinalColumnsToSelect(query, columns);
+            var commandTextBuilder = new StringBuilder("select ", 256)
+                .AppendJoin(',', columns)
                 .Append(FromText)
                 .Append(GetJoinUserDataText(query));
 
@@ -3084,13 +3094,13 @@ namespace Emby.Server.Implementations.Data
                 if (query.Limit.HasValue || offset > 0)
                 {
                     commandTextBuilder.Append(" LIMIT ")
-                        .Append((query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture));
+                        .Append(query.Limit ?? int.MaxValue);
                 }
 
                 if (offset > 0)
                 {
                     commandTextBuilder.Append(" OFFSET ")
-                        .Append(offset.ToString(CultureInfo.InvariantCulture));
+                        .Append(offset);
                 }
             }
 
@@ -3133,7 +3143,9 @@ namespace Emby.Server.Implementations.Data
 
             var now = DateTime.UtcNow;
 
-            var commandText = "select " + string.Join(',', GetFinalColumnsToSelect(query, new List<string> { "guid", "path" })) + FromText;
+            var columns = new List<string> { "guid", "path" };
+            SetFinalColumnsToSelect(query, columns);
+            var commandText = "select " + string.Join(',', columns) + FromText;
 
             var whereClauses = GetWhereClauses(query, null);
             if (whereClauses.Count != 0)
@@ -3209,8 +3221,10 @@ namespace Emby.Server.Implementations.Data
 
             var now = DateTime.UtcNow;
 
+            var columns = new List<string> { "guid" };
+            SetFinalColumnsToSelect(query, columns);
             var commandText = "select "
-                            + string.Join(',', GetFinalColumnsToSelect(query, new List<string> { "guid" }))
+                            + string.Join(',', columns)
                             + FromText
                             + GetJoinUserDataText(query);
 
@@ -3251,19 +3265,23 @@ namespace Emby.Server.Implementations.Data
             {
                 commandText = string.Empty;
 
+                List<string> columnsToSelect;
                 if (EnableGroupByPresentationUniqueKey(query))
                 {
-                    commandText += " select " + string.Join(',', GetFinalColumnsToSelect(query, new List<string> { "count (distinct PresentationUniqueKey)" })) + FromText;
+                    columnsToSelect = new List<string> { "count (distinct PresentationUniqueKey)" };
                 }
                 else if (query.GroupBySeriesPresentationUniqueKey)
                 {
-                    commandText += " select " + string.Join(',', GetFinalColumnsToSelect(query, new List<string> { "count (distinct SeriesPresentationUniqueKey)" })) + FromText;
+                    columnsToSelect = new List<string> { "count (distinct SeriesPresentationUniqueKey)" };
                 }
                 else
                 {
-                    commandText += " select " + string.Join(',', GetFinalColumnsToSelect(query, new List<string> { "count (guid)" })) + FromText;
+                    columnsToSelect = new List<string> { "count (guid)" };
                 }
 
+                SetFinalColumnsToSelect(query, columnsToSelect);
+                commandText += " select " + string.Join(',', columnsToSelect) + FromText;
+
                 commandText += GetJoinUserDataText(query)
                             + whereText;
                 statementTexts.Add(commandText);
@@ -5232,30 +5250,30 @@ AND Type = @InternalPersonType)");
 
             var now = DateTime.UtcNow;
 
-            var stringBuilder = new StringBuilder("Select Value From ItemValues where Type");
+            var stringBuilder = new StringBuilder("Select Value From ItemValues where Type", 128);
             if (itemValueTypes.Length == 1)
             {
                 stringBuilder.Append('=')
-                    .Append(itemValueTypes[0].ToString(CultureInfo.InvariantCulture));
+                    .Append(itemValueTypes[0]);
             }
             else
             {
                 stringBuilder.Append(" in (")
-                    .AppendJoin(',', itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)))
+                    .AppendJoin(',', itemValueTypes)
                     .Append(')');
             }
 
             if (withItemTypes.Count > 0)
             {
                 stringBuilder.Append(" AND ItemId In (select guid from typedbaseitems where type in (")
-                    .AppendJoin(',', withItemTypes.Select(i => "'" + i + "'"))
+                    .AppendJoinInSingleQuotes(',', withItemTypes)
                     .Append("))");
             }
 
             if (excludeItemTypes.Count > 0)
             {
                 stringBuilder.Append(" AND ItemId not In (select guid from typedbaseitems where type in (")
-                    .AppendJoin(',', excludeItemTypes.Select(i => "'" + i + "'"))
+                    .AppendJoinInSingleQuotes(',', excludeItemTypes)
                     .Append("))");
             }
 
@@ -5296,14 +5314,14 @@ AND Type = @InternalPersonType)");
             var now = DateTime.UtcNow;
 
             var typeClause = itemValueTypes.Length == 1 ?
-                ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) :
-                ("Type in (" + string.Join(',', itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture))) + ")");
+                ("Type=" + itemValueTypes[0]) :
+                ("Type in (" + string.Join(',', itemValueTypes) + ")");
 
             InternalItemsQuery typeSubQuery = null;
 
             string itemCountColumns = null;
 
-            var stringBuilder = new StringBuilder();
+            var stringBuilder = new StringBuilder(1024);
             var typesToCount = query.IncludeItemTypes;
 
             if (typesToCount.Length > 0)
@@ -5326,6 +5344,7 @@ AND Type = @InternalPersonType)");
 
                 stringBuilder.Append(" where ")
                     .AppendJoin(" AND ", whereClauses)
+                    .Append(" AND ")
                     .Append("guid in (select ItemId from ItemValues where ItemValues.CleanValue=A.CleanName AND ")
                     .Append(typeClause)
                     .Append(")) as itemTypes");
@@ -5359,7 +5378,7 @@ AND Type = @InternalPersonType)");
                 IsSeries = query.IsSeries
             };
 
-            columns = GetFinalColumnsToSelect(query, columns);
+            SetFinalColumnsToSelect(query, columns);
 
             var innerWhereClauses = GetWhereClauses(innerQuery, null);
 
@@ -5431,13 +5450,13 @@ AND Type = @InternalPersonType)");
                 if (query.Limit.HasValue || offset > 0)
                 {
                     stringBuilder.Append(" LIMIT ")
-                        .Append((query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture));
+                        .Append(query.Limit ?? int.MaxValue);
                 }
 
                 if (offset > 0)
                 {
                     stringBuilder.Append(" OFFSET ")
-                        .Append(offset.ToString(CultureInfo.InvariantCulture));
+                        .Append(offset);
                 }
             }
 
@@ -5454,8 +5473,10 @@ AND Type = @InternalPersonType)");
             if (query.EnableTotalRecordCount)
             {
                 stringBuilder.Clear();
+                var columnsToSelect = new List<string> { "count (distinct PresentationUniqueKey)" };
+                SetFinalColumnsToSelect(query, columnsToSelect);
                 stringBuilder.Append("select ")
-                    .AppendJoin(',', GetFinalColumnsToSelect(query, new List<string> { "count (distinct PresentationUniqueKey)" }))
+                    .AppendJoin(',', columnsToSelect)
                     .Append(FromText)
                     .Append(GetJoinUserDataText(query))
                     .Append(whereText);
diff --git a/MediaBrowser.Common/Extensions/StringBuilderExtensions.cs b/MediaBrowser.Common/Extensions/StringBuilderExtensions.cs
new file mode 100644
index 000000000..0e0bc4282
--- /dev/null
+++ b/MediaBrowser.Common/Extensions/StringBuilderExtensions.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Text;
+
+namespace MediaBrowser.Common.Extensions
+{
+    /// <summary>
+    /// Extension methods for the <see cref="StringBuilder"/> class.
+    /// </summary>
+    public static class StringBuilderExtensions
+    {
+        /// <summary>
+        /// Concatenates and appends the members of a collection in single quotes using the specified delimiter.
+        /// </summary>
+        /// <param name="builder">The string builder.</param>
+        /// <param name="delimiter">The character delimiter.</param>
+        /// <param name="values">The collection of strings to concatenate.</param>
+        /// <returns>The updated string builder.</returns>
+        public static StringBuilder AppendJoinInSingleQuotes(this StringBuilder builder, char delimiter, IReadOnlyList<string> values)
+        {
+            for (var i = 0; i < values.Count; i++)
+            {
+                builder.Append('\'')
+                    .Append(values[i])
+                    .Append('\'')
+                    .Append(delimiter);
+            }
+
+            // remove last ,
+            builder.Length--;
+
+            return builder;
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index ba5290763..b31270270 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -60,10 +60,7 @@ namespace MediaBrowser.Controller.Providers
         }
 
         public IReadOnlyList<string> GetFilePaths(string path)
-            => GetFilePaths(path, false, false);
-
-        public IReadOnlyList<string> GetSortedFilePaths(string path, bool clearCache)
-            => GetFilePaths(path, clearCache, true);
+            => GetFilePaths(path, false);
 
         public IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false)
         {
diff --git a/MediaBrowser.Controller/Providers/IDirectoryService.cs b/MediaBrowser.Controller/Providers/IDirectoryService.cs
index beb685b6d..b1a36e102 100644
--- a/MediaBrowser.Controller/Providers/IDirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/IDirectoryService.cs
@@ -15,8 +15,6 @@ namespace MediaBrowser.Controller.Providers
 
         IReadOnlyList<string> GetFilePaths(string path);
 
-        IReadOnlyList<string> GetSortedFilePaths(string path, bool clearCache);
-
         IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false);
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
index cb8ae0c51..3cd7ec772 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
@@ -187,7 +187,7 @@ namespace MediaBrowser.Providers.MediaInfo
             IDirectoryService directoryService,
             bool clearCache)
         {
-            var files = directoryService.GetSortedFilePaths(folder, clearCache);
+            var files = directoryService.GetFilePaths(folder, clearCache, true);
 
             AddExternalSubtitleStreams(streams, videoPath, startIndex, files);
         }
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
index f312933fb..ba67e55f3 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
@@ -164,10 +164,7 @@ namespace Jellyfin.Server.Implementations.Tests.Data
                     }
                 }
             };
-        }
 
-        public static IEnumerable<object[]> DeserializeImages_ValidAndInvalid_TestData()
-        {
             yield return new object[]
             {
                 string.Empty,
@@ -215,23 +212,6 @@ namespace Jellyfin.Server.Implementations.Tests.Data
             }
         }
 
-        [Theory]
-        [MemberData(nameof(DeserializeImages_ValidAndInvalid_TestData))]
-        public void DeserializeImages_ValidAndInvalid_Success(string value, ItemImageInfo[] expected)
-        {
-            var result = _sqliteItemRepository.DeserializeImages(value);
-            Assert.Equal(expected.Length, result.Length);
-            for (int i = 0; i < expected.Length; i++)
-            {
-                Assert.Equal(expected[i].Path, result[i].Path);
-                Assert.Equal(expected[i].Type, result[i].Type);
-                Assert.Equal(expected[i].DateModified, result[i].DateModified);
-                Assert.Equal(expected[i].Width, result[i].Width);
-                Assert.Equal(expected[i].Height, result[i].Height);
-                Assert.Equal(expected[i].BlurHash, result[i].BlurHash);
-            }
-        }
-
         [Theory]
         [MemberData(nameof(DeserializeImages_Valid_TestData))]
         public void SerializeImages_Valid_Success(string expected, ItemImageInfo[] value)
-- 
cgit v1.2.3