Merge pull request #325 from jellyfin/devv3.5.2-5

Master 3.5.2-5

1 files changed, 10 insertions, 25 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 053ee1b96..e3b5b5117 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1295,7 +1295,7 @@ namespace MediaBrowser.Controller.Entities
                 }
             }
 
-            return string.Join("/", terms.ToArray(terms.Count));
+            return string.Join("/", terms.ToArray());
         }
 
         /// <summary>
@@ -1536,7 +1536,7 @@ namespace MediaBrowser.Controller.Entities
         {
             var newThemeVideos = LoadThemeVideos(fileSystemChildren, options.DirectoryService);
 
-            var newThemeVideoIds = newThemeVideos.Select(i => i.Id).ToArray(newThemeVideos.Length);
+            var newThemeVideoIds = newThemeVideos.Select(i => i.Id).ToArray();
 
             var themeVideosChanged = !item.ThemeVideoIds.SequenceEqual(newThemeVideoIds);
 
@@ -1573,7 +1573,7 @@ namespace MediaBrowser.Controller.Entities
         private async Task<bool> RefreshThemeSongs(BaseItem item, MetadataRefreshOptions options, List<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
         {
             var newThemeSongs = LoadThemeSongs(fileSystemChildren, options.DirectoryService);
-            var newThemeSongIds = newThemeSongs.Select(i => i.Id).ToArray(newThemeSongs.Length);
+            var newThemeSongIds = newThemeSongs.Select(i => i.Id).ToArray();
 
             var themeSongsChanged = !item.ThemeSongIds.SequenceEqual(newThemeSongIds);
 
@@ -2110,9 +2110,8 @@ namespace MediaBrowser.Controller.Entities
                 }
                 else
                 {
-                    var list = current.ToArray(current.Length + 1);
-                    list[list.Length - 1] = name;
-                    Studios = list;
+                    var list = 
+                    Studios = current.Concat(new [] { name }).ToArray();
                 }
             }
         }
@@ -2252,9 +2251,7 @@ namespace MediaBrowser.Controller.Entities
             else
             {
                 var currentCount = ImageInfos.Length;
-                var newList = ImageInfos.ToArray(currentCount + 1);
-                newList[currentCount] = image;
-                ImageInfos = newList;
+                ImageInfos = ImageInfos.Concat(new [] { image }) .ToArray();
             }
         }
 
@@ -2269,10 +2266,7 @@ namespace MediaBrowser.Controller.Entities
 
             if (image == null)
             {
-                var currentCount = ImageInfos.Length;
-                var newList = ImageInfos.ToArray(currentCount + 1);
-                newList[currentCount] = GetImageInfo(file, type);
-                ImageInfos = newList;
+                ImageInfos = ImageInfos.Concat(new [] { GetImageInfo(file, type) }) .ToArray();
             }
             else
             {
@@ -2486,16 +2480,7 @@ namespace MediaBrowser.Controller.Entities
 
             if (newImageList.Count > 0)
             {
-                var currentCount = ImageInfos.Length;
-                var newList = ImageInfos.ToArray(currentCount + newImageList.Count);
-
-                foreach (var image in newImageList)
-                {
-                    newList[currentCount] = GetImageInfo(image, imageType);
-                    currentCount++;
-                }
-
-                ImageInfos = newList;
+                ImageInfos = ImageInfos.Concat(newImageList.Select(i => GetImageInfo(i, imageType))).ToArray();
             }
 
             return imageUpdated || newImageList.Count > 0;
@@ -2537,7 +2522,7 @@ namespace MediaBrowser.Controller.Entities
             var extensions = new List<string> { ".nfo", ".xml", ".srt", ".vtt", ".sub", ".idx", ".txt", ".edl", ".bif", ".smi", ".ttml" };
             extensions.AddRange(SupportedImageExtensions);
 
-            return FileSystem.GetFiles(FileSystem.GetDirectoryName(Path), extensions.ToArray(extensions.Count), false, false)
+            return FileSystem.GetFiles(FileSystem.GetDirectoryName(Path), extensions.ToArray(), false, false)
                 .Where(i => System.IO.Path.GetFileNameWithoutExtension(i.FullName).StartsWith(filename, StringComparison.OrdinalIgnoreCase))
                 .ToList();
         }
@@ -2776,7 +2761,7 @@ namespace MediaBrowser.Controller.Entities
         {
             var list = GetEtagValues(user);
 
-            return string.Join("|", list.ToArray(list.Count)).GetMD5().ToString("N");
+            return string.Join("|", list.ToArray()).GetMD5().ToString("N");
         }
 
         protected virtual List<string> GetEtagValues(User user)