Fix some warnings

8 files changed, 44 insertions, 83 deletions

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 1da9b4650..662bca508 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -5914,7 +5914,7 @@ AND Type = @InternalPersonType)");
             }
         }
 
-        public void SaveMediaStreams(Guid id, List<MediaStream> streams, CancellationToken cancellationToken)
+        public void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken)
         {
             CheckDisposed();
 
@@ -5946,7 +5946,7 @@ AND Type = @InternalPersonType)");
             }
         }
 
-        private void InsertMediaStreams(byte[] idBlob, List<MediaStream> streams, IDatabaseConnection db)
+        private void InsertMediaStreams(byte[] idBlob, IReadOnlyList<MediaStream> streams, IDatabaseConnection db)
         {
             const int Limit = 10;
             var startIndex = 0;
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 5c86dbbb7..4f8a52f41 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -581,7 +581,7 @@ namespace Emby.Server.Implementations.IO
         }
 
         /// <inheritdoc />
-        public virtual List<FileSystemMetadata> GetDrives()
+        public virtual IEnumerable<FileSystemMetadata> GetDrives()
         {
             // check for ready state to avoid waiting for drives to timeout
             // some drives on linux have no actual size or are used for other purposes
@@ -595,7 +595,7 @@ namespace Emby.Server.Implementations.IO
                     Name = d.Name,
                     FullName = d.RootDirectory.FullName,
                     IsDirectory = true
-                }).ToList();
+                });
         }
 
         /// <inheritdoc />
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index a414e7e16..eb95977ef 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -344,7 +344,7 @@ namespace Emby.Server.Implementations.Library
             return sources;
         }
 
-        private string[] NormalizeLanguage(string language)
+        private IReadOnlyList<string> NormalizeLanguage(string language)
         {
             if (string.IsNullOrEmpty(language))
             {
diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
index da0c89c13..13f0999b3 100644
--- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs
+++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System;
@@ -13,39 +11,24 @@ namespace Emby.Server.Implementations.Library
 {
     public static class MediaStreamSelector
     {
-        public static int? GetDefaultAudioStreamIndex(List<MediaStream> streams, string[] preferredLanguages, bool preferDefaultTrack)
+        public static int? GetDefaultAudioStreamIndex(IReadOnlyList<MediaStream> streams, IReadOnlyList<string> preferredLanguages, bool preferDefaultTrack)
         {
-            streams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages)
-               .ToList();
+            var sortedStreams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages);
 
             if (preferDefaultTrack)
             {
-                var defaultStream = streams.FirstOrDefault(i => i.IsDefault);
-
-                if (defaultStream != null)
-                {
-                    return defaultStream.Index;
-                }
-            }
-
-            var stream = streams.FirstOrDefault();
-
-            if (stream != null)
-            {
-                return stream.Index;
+                return sortedStreams.FirstOrDefault(i => i.IsDefault)?.Index;
             }
 
-            return null;
+            return sortedStreams.FirstOrDefault()?.Index;
         }
 
         public static int? GetDefaultSubtitleStreamIndex(
             IEnumerable<MediaStream> streams,
-            string[] preferredLanguages,
+            IReadOnlyList<string> preferredLanguages,
             SubtitlePlaybackMode mode,
             string audioTrackLanguage)
         {
-            MediaStream stream = null;
-
             if (mode == SubtitlePlaybackMode.None)
             {
                 return null;
@@ -59,6 +42,7 @@ namespace Emby.Server.Implementations.Library
                 .ThenByDescending(x => x.IsDefault)
                 .ToList();
 
+            MediaStream? stream = null;
             if (mode == SubtitlePlaybackMode.Default)
             {
                 // Prefer embedded metadata over smart logic
@@ -95,26 +79,27 @@ namespace Emby.Server.Implementations.Library
             return stream?.Index;
         }
 
-        private static IEnumerable<MediaStream> GetSortedStreams(IEnumerable<MediaStream> streams, MediaStreamType type, string[] languagePreferences)
+        private static IEnumerable<MediaStream> GetSortedStreams(IEnumerable<MediaStream> streams, MediaStreamType type, IReadOnlyList<string> languagePreferences)
         {
             // Give some preference to external text subs for better performance
-            return streams.Where(i => i.Type == type)
+            return streams
+            .Where(i => i.Type == type)
                 .OrderBy(i =>
-            {
-                var index = FindIndex(languagePreferences, i.Language);
-
-                return index == -1 ? 100 : index;
-            })
-                 .ThenBy(i => GetBooleanOrderBy(i.IsDefault))
-                 .ThenBy(i => GetBooleanOrderBy(i.SupportsExternalStream))
-                 .ThenBy(i => GetBooleanOrderBy(i.IsTextSubtitleStream))
-                 .ThenBy(i => GetBooleanOrderBy(i.IsExternal))
-                 .ThenBy(i => i.Index);
+                {
+                    var index = languagePreferences.FindIndex(x => string.Equals(x, i.Language, StringComparison.OrdinalIgnoreCase));
+
+                    return index == -1 ? 100 : index;
+                })
+                .ThenBy(i => GetBooleanOrderBy(i.IsDefault))
+                .ThenBy(i => GetBooleanOrderBy(i.SupportsExternalStream))
+                .ThenBy(i => GetBooleanOrderBy(i.IsTextSubtitleStream))
+                .ThenBy(i => GetBooleanOrderBy(i.IsExternal))
+                .ThenBy(i => i.Index);
         }
 
         public static void SetSubtitleStreamScores(
-            List<MediaStream> streams,
-            string[] preferredLanguages,
+            IReadOnlyList<MediaStream> streams,
+            IReadOnlyList<string> preferredLanguages,
             SubtitlePlaybackMode mode,
             string audioTrackLanguage)
         {
@@ -123,15 +108,14 @@ namespace Emby.Server.Implementations.Library
                 return;
             }
 
-            streams = GetSortedStreams(streams, MediaStreamType.Subtitle, preferredLanguages)
-                .ToList();
+            var sortedStreams = GetSortedStreams(streams, MediaStreamType.Subtitle, preferredLanguages);
 
             var filteredStreams = new List<MediaStream>();
 
             if (mode == SubtitlePlaybackMode.Default)
             {
                 // Prefer embedded metadata over smart logic
-                filteredStreams = streams.Where(s => s.IsForced || s.IsDefault)
+                filteredStreams = sortedStreams.Where(s => s.IsForced || s.IsDefault)
                     .ToList();
             }
             else if (mode == SubtitlePlaybackMode.Smart)
@@ -139,54 +123,37 @@ namespace Emby.Server.Implementations.Library
                 // Prefer smart logic over embedded metadata
                 if (!preferredLanguages.Contains(audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
                 {
-                    filteredStreams = streams.Where(s => !s.IsForced && preferredLanguages.Contains(s.Language, StringComparison.OrdinalIgnoreCase))
+                    filteredStreams = sortedStreams.Where(s => !s.IsForced && preferredLanguages.Contains(s.Language, StringComparison.OrdinalIgnoreCase))
                         .ToList();
                 }
             }
             else if (mode == SubtitlePlaybackMode.Always)
             {
                 // always load the most suitable full subtitles
-                filteredStreams = streams.Where(s => !s.IsForced)
-                    .ToList();
+                filteredStreams = sortedStreams.Where(s => !s.IsForced).ToList();
             }
             else if (mode == SubtitlePlaybackMode.OnlyForced)
             {
                 // always load the most suitable full subtitles
-                filteredStreams = streams.Where(s => s.IsForced).ToList();
+                filteredStreams = sortedStreams.Where(s => s.IsForced).ToList();
             }
 
             // load forced subs if we have found no suitable full subtitles
-            if (filteredStreams.Count == 0)
-            {
-                filteredStreams = streams
-                    .Where(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
-                    .ToList();
-            }
+            var iterStreams = filteredStreams.Count == 0
+                ? sortedStreams.Where(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
+                : filteredStreams;
 
-            foreach (var stream in filteredStreams)
+            foreach (var stream in iterStreams)
             {
                 stream.Score = GetSubtitleScore(stream, preferredLanguages);
             }
         }
 
-        private static int FindIndex(string[] list, string value)
-        {
-            for (var i = 0; i < list.Length; i++)
-            {
-                if (string.Equals(list[i], value, StringComparison.OrdinalIgnoreCase))
-                {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-
-        private static int GetSubtitleScore(MediaStream stream, string[] languagePreferences)
+        private static int GetSubtitleScore(MediaStream stream, IReadOnlyList<string> languagePreferences)
         {
             var values = new List<int>();
 
-            var index = FindIndex(languagePreferences, stream.Language);
+            var index = languagePreferences.FindIndex(x => string.Equals(x, stream.Language, StringComparison.OrdinalIgnoreCase));
 
             values.Add(index == -1 ? 0 : 100 - index);
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 6a9a3077c..5df18f6de 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -312,7 +312,7 @@ namespace Emby.Server.Implementations.LiveTv
             {
                 if (isVideo)
                 {
-                    mediaSource.MediaStreams.AddRange(new List<MediaStream>
+                    mediaSource.MediaStreams = new MediaStream[]
                     {
                         new MediaStream
                         {
@@ -329,11 +329,11 @@ namespace Emby.Server.Implementations.LiveTv
                             // Set the index to -1 because we don't know the exact index of the audio stream within the container
                             Index = -1
                         }
-                    });
+                    };
                 }
                 else
                 {
-                    mediaSource.MediaStreams.AddRange(new List<MediaStream>
+                    mediaSource.MediaStreams = new MediaStream[]
                     {
                         new MediaStream
                         {
@@ -341,7 +341,7 @@ namespace Emby.Server.Implementations.LiveTv
                             // Set the index to -1 because we don't know the exact index of the audio stream within the container
                             Index = -1
                         }
-                    });
+                    };
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 532790019..e0eaa8e58 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -446,7 +446,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             {
                 Path = url,
                 Protocol = MediaProtocol.Udp,
-                MediaStreams = new List<MediaStream>
+                MediaStreams = new MediaStream[]
                 {
                     new MediaStream
                     {
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index dd83f9a53..2a468e14d 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -170,7 +170,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             {
                 Path = path,
                 Protocol = protocol,
-                MediaStreams = new List<MediaStream>
+                MediaStreams = new MediaStream[]
                 {
                     new MediaStream
                     {
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index dbd70342a..281dbb00b 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -147,13 +147,7 @@ namespace Emby.Server.Implementations.Localization
                         threeletterNames = new[] { parts[0], parts[1] };
                     }
 
-                    list.Add(new CultureDto
-                    {
-                        DisplayName = name,
-                        Name = name,
-                        ThreeLetterISOLanguageNames = threeletterNames,
-                        TwoLetterISOLanguageName = twoCharName
-                    });
+                    list.Add(new CultureDto(name, name, twoCharName, threeletterNames));
                 }
             }