Merge branch 'master' into trickplay

21 files changed, 554 insertions, 413 deletions

diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index 7718f822b..fbad29143 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -20,7 +20,6 @@ namespace MediaBrowser.Model.Configuration
             AutomaticallyAddToCollection = false;
             EnablePhotos = true;
             SaveSubtitlesWithMedia = true;
-            EnableRealtimeMonitor = true;
             PathInfos = Array.Empty<MediaPathInfo>();
             EnableAutomaticSeriesGrouping = true;
             SeasonZeroDisplayName = "Specials";
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 18f107503..1c9cc6c01 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -4,271 +4,276 @@
 using System;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.System;
 using MediaBrowser.Model.Updates;
 
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration;
+
+/// <summary>
+/// Represents the server configuration.
+/// </summary>
+public class ServerConfiguration : BaseApplicationConfiguration
 {
     /// <summary>
-    /// Represents the server configuration.
+    /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
     /// </summary>
-    public class ServerConfiguration : BaseApplicationConfiguration
+    public ServerConfiguration()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
-        /// </summary>
-        public ServerConfiguration()
+        MetadataOptions = new[]
         {
-            MetadataOptions = new[]
+            new MetadataOptions()
+            {
+                ItemType = "Book"
+            },
+            new MetadataOptions()
+            {
+                ItemType = "Movie"
+            },
+            new MetadataOptions
+            {
+                ItemType = "MusicVideo",
+                DisabledMetadataFetchers = new[] { "The Open Movie Database" },
+                DisabledImageFetchers = new[] { "The Open Movie Database" }
+            },
+            new MetadataOptions
+            {
+                ItemType = "Series",
+            },
+            new MetadataOptions
+            {
+                ItemType = "MusicAlbum",
+                DisabledMetadataFetchers = new[] { "TheAudioDB" }
+            },
+            new MetadataOptions
+            {
+                ItemType = "MusicArtist",
+                DisabledMetadataFetchers = new[] { "TheAudioDB" }
+            },
+            new MetadataOptions
+            {
+                ItemType = "BoxSet"
+            },
+            new MetadataOptions
             {
-                new MetadataOptions()
-                {
-                    ItemType = "Book"
-                },
-                new MetadataOptions()
-                {
-                    ItemType = "Movie"
-                },
-                new MetadataOptions
-                {
-                    ItemType = "MusicVideo",
-                    DisabledMetadataFetchers = new[] { "The Open Movie Database" },
-                    DisabledImageFetchers = new[] { "The Open Movie Database" }
-                },
-                new MetadataOptions
-                {
-                    ItemType = "Series",
-                },
-                new MetadataOptions
-                {
-                    ItemType = "MusicAlbum",
-                    DisabledMetadataFetchers = new[] { "TheAudioDB" }
-                },
-                new MetadataOptions
-                {
-                    ItemType = "MusicArtist",
-                    DisabledMetadataFetchers = new[] { "TheAudioDB" }
-                },
-                new MetadataOptions
-                {
-                    ItemType = "BoxSet"
-                },
-                new MetadataOptions
-                {
-                    ItemType = "Season",
-                },
-                new MetadataOptions
-                {
-                    ItemType = "Episode",
-                }
-            };
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable prometheus metrics exporting.
-        /// </summary>
-        public bool EnableMetrics { get; set; } = false;
-
-        public bool EnableNormalizedItemByNameIds { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is port authorized.
-        /// </summary>
-        /// <value><c>true</c> if this instance is port authorized; otherwise, <c>false</c>.</value>
-        public bool IsPortAuthorized { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether quick connect is available for use on this server.
-        /// </summary>
-        public bool QuickConnectAvailable { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable case sensitive item ids].
-        /// </summary>
-        /// <value><c>true</c> if [enable case sensitive item ids]; otherwise, <c>false</c>.</value>
-        public bool EnableCaseSensitiveItemIds { get; set; } = true;
-
-        public bool DisableLiveTvChannelUserDataName { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the metadata path.
-        /// </summary>
-        /// <value>The metadata path.</value>
-        public string MetadataPath { get; set; } = string.Empty;
-
-        public string MetadataNetworkPath { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the preferred metadata language.
-        /// </summary>
-        /// <value>The preferred metadata language.</value>
-        public string PreferredMetadataLanguage { get; set; } = "en";
-
-        /// <summary>
-        /// Gets or sets the metadata country code.
-        /// </summary>
-        /// <value>The metadata country code.</value>
-        public string MetadataCountryCode { get; set; } = "US";
-
-        /// <summary>
-        /// Gets or sets characters to be replaced with a ' ' in strings to create a sort name.
-        /// </summary>
-        /// <value>The sort replace characters.</value>
-        public string[] SortReplaceCharacters { get; set; } = new[] { ".", "+", "%" };
-
-        /// <summary>
-        /// Gets or sets characters to be removed from strings to create a sort name.
-        /// </summary>
-        /// <value>The sort remove characters.</value>
-        public string[] SortRemoveCharacters { get; set; } = new[] { ",", "&", "-", "{", "}", "'" };
-
-        /// <summary>
-        /// Gets or sets words to be removed from strings to create a sort name.
-        /// </summary>
-        /// <value>The sort remove words.</value>
-        public string[] SortRemoveWords { get; set; } = new[] { "the", "a", "an" };
-
-        /// <summary>
-        /// Gets or sets the minimum percentage of an item that must be played in order for playstate to be updated.
-        /// </summary>
-        /// <value>The min resume PCT.</value>
-        public int MinResumePct { get; set; } = 5;
-
-        /// <summary>
-        /// Gets or sets the maximum percentage of an item that can be played while still saving playstate. If this percentage is crossed playstate will be reset to the beginning and the item will be marked watched.
-        /// </summary>
-        /// <value>The max resume PCT.</value>
-        public int MaxResumePct { get; set; } = 90;
-
-        /// <summary>
-        /// Gets or sets the minimum duration that an item must have in order to be eligible for playstate updates..
-        /// </summary>
-        /// <value>The min resume duration seconds.</value>
-        public int MinResumeDurationSeconds { get; set; } = 300;
-
-        /// <summary>
-        /// Gets or sets the minimum minutes of a book that must be played in order for playstate to be updated.
-        /// </summary>
-        /// <value>The min resume in minutes.</value>
-        public int MinAudiobookResume { get; set; } = 5;
-
-        /// <summary>
-        /// Gets or sets the remaining minutes of a book that can be played while still saving playstate. If this percentage is crossed playstate will be reset to the beginning and the item will be marked watched.
-        /// </summary>
-        /// <value>The remaining time in minutes.</value>
-        public int MaxAudiobookResume { get; set; } = 5;
-
-        /// <summary>
-        /// Gets or sets the delay in seconds that we will wait after a file system change to try and discover what has been added/removed
-        /// Some delay is necessary with some items because their creation is not atomic.  It involves the creation of several
-        /// different directories and files.
-        /// </summary>
-        /// <value>The file watcher delay.</value>
-        public int LibraryMonitorDelay { get; set; } = 60;
-
-        /// <summary>
-        /// Gets or sets the duration in seconds that we will wait after a library updated event before executing the library changed notification.
-        /// </summary>
-        /// <value>The library update duration.</value>
-        public int LibraryUpdateDuration { get; set; } = 30;
-
-        /// <summary>
-        /// Gets or sets the image saving convention.
-        /// </summary>
-        /// <value>The image saving convention.</value>
-        public ImageSavingConvention ImageSavingConvention { get; set; }
-
-        public MetadataOptions[] MetadataOptions { get; set; }
-
-        public bool SkipDeserializationForBasicTypes { get; set; } = true;
-
-        public string ServerName { get; set; } = string.Empty;
-
-        public string UICulture { get; set; } = "en-US";
-
-        public bool SaveMetadataHidden { get; set; } = false;
-
-        public NameValuePair[] ContentTypes { get; set; } = Array.Empty<NameValuePair>();
-
-        public int RemoteClientBitrateLimit { get; set; }
-
-        public bool EnableFolderView { get; set; } = false;
-
-        public bool EnableGroupingIntoCollections { get; set; } = false;
-
-        public bool DisplaySpecialsWithinSeasons { get; set; } = true;
-
-        public string[] CodecsUsed { get; set; } = Array.Empty<string>();
-
-        public RepositoryInfo[] PluginRepositories { get; set; } = Array.Empty<RepositoryInfo>();
-
-        public bool EnableExternalContentInSuggestions { get; set; } = true;
-
-        public int ImageExtractionTimeoutMs { get; set; }
-
-        public PathSubstitution[] PathSubstitutions { get; set; } = Array.Empty<PathSubstitution>();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether slow server responses should be logged as a warning.
-        /// </summary>
-        public bool EnableSlowResponseWarning { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the threshold for the slow response time warning in ms.
-        /// </summary>
-        public long SlowResponseThresholdMs { get; set; } = 500;
-
-        /// <summary>
-        /// Gets or sets the cors hosts.
-        /// </summary>
-        public string[] CorsHosts { get; set; } = new[] { "*" };
-
-        /// <summary>
-        /// Gets or sets the number of days we should retain activity logs.
-        /// </summary>
-        public int? ActivityLogRetentionDays { get; set; } = 30;
-
-        /// <summary>
-        /// Gets or sets the how the library scan fans out.
-        /// </summary>
-        public int LibraryScanFanoutConcurrency { get; set; }
+                ItemType = "Season",
+            },
+            new MetadataOptions
+            {
+                ItemType = "Episode",
+            }
+        };
+    }
 
-        /// <summary>
-        /// Gets or sets the how many metadata refreshes can run concurrently.
-        /// </summary>
-        public int LibraryMetadataRefreshConcurrency { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether to enable prometheus metrics exporting.
+    /// </summary>
+    public bool EnableMetrics { get; set; } = false;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether older plugins should automatically be deleted from the plugin folder.
-        /// </summary>
-        public bool RemoveOldPlugins { get; set; }
+    public bool EnableNormalizedItemByNameIds { get; set; } = true;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether clients should be allowed to upload logs.
-        /// </summary>
-        public bool AllowClientLogUpload { get; set; } = true;
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance is port authorized.
+    /// </summary>
+    /// <value><c>true</c> if this instance is port authorized; otherwise, <c>false</c>.</value>
+    public bool IsPortAuthorized { get; set; }
 
-        /// <summary>
-        /// Gets or sets the dummy chapter duration in seconds, use 0 (zero) or less to disable generation alltogether.
-        /// </summary>
-        /// <value>The dummy chapters duration.</value>
-        public int DummyChapterDuration { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether quick connect is available for use on this server.
+    /// </summary>
+    public bool QuickConnectAvailable { get; set; } = true;
 
-        /// <summary>
-        /// Gets or sets the chapter image resolution.
-        /// </summary>
-        /// <value>The chapter image resolution.</value>
-        public ImageResolution ChapterImageResolution { get; set; } = ImageResolution.MatchSource;
+    /// <summary>
+    /// Gets or sets a value indicating whether [enable case sensitive item ids].
+    /// </summary>
+    /// <value><c>true</c> if [enable case sensitive item ids]; otherwise, <c>false</c>.</value>
+    public bool EnableCaseSensitiveItemIds { get; set; } = true;
 
-        /// <summary>
-        /// Gets or sets the limit for parallel image encoding.
-        /// </summary>
-        /// <value>The limit for parallel image encoding.</value>
-        public int ParallelImageEncodingLimit { get; set; }
+    public bool DisableLiveTvChannelUserDataName { get; set; } = true;
 
-        /// <summary>
-        /// Gets or sets the trickplay options.
-        /// </summary>
-        /// <value>The trickplay options.</value>
-        public TrickplayOptions TrickplayOptions { get; set; } = new TrickplayOptions();
-    }
+    /// <summary>
+    /// Gets or sets the metadata path.
+    /// </summary>
+    /// <value>The metadata path.</value>
+    public string MetadataPath { get; set; } = string.Empty;
+
+    public string MetadataNetworkPath { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the preferred metadata language.
+    /// </summary>
+    /// <value>The preferred metadata language.</value>
+    public string PreferredMetadataLanguage { get; set; } = "en";
+
+    /// <summary>
+    /// Gets or sets the metadata country code.
+    /// </summary>
+    /// <value>The metadata country code.</value>
+    public string MetadataCountryCode { get; set; } = "US";
+
+    /// <summary>
+    /// Gets or sets characters to be replaced with a ' ' in strings to create a sort name.
+    /// </summary>
+    /// <value>The sort replace characters.</value>
+    public string[] SortReplaceCharacters { get; set; } = new[] { ".", "+", "%" };
+
+    /// <summary>
+    /// Gets or sets characters to be removed from strings to create a sort name.
+    /// </summary>
+    /// <value>The sort remove characters.</value>
+    public string[] SortRemoveCharacters { get; set; } = new[] { ",", "&", "-", "{", "}", "'" };
+
+    /// <summary>
+    /// Gets or sets words to be removed from strings to create a sort name.
+    /// </summary>
+    /// <value>The sort remove words.</value>
+    public string[] SortRemoveWords { get; set; } = new[] { "the", "a", "an" };
+
+    /// <summary>
+    /// Gets or sets the minimum percentage of an item that must be played in order for playstate to be updated.
+    /// </summary>
+    /// <value>The min resume PCT.</value>
+    public int MinResumePct { get; set; } = 5;
+
+    /// <summary>
+    /// Gets or sets the maximum percentage of an item that can be played while still saving playstate. If this percentage is crossed playstate will be reset to the beginning and the item will be marked watched.
+    /// </summary>
+    /// <value>The max resume PCT.</value>
+    public int MaxResumePct { get; set; } = 90;
+
+    /// <summary>
+    /// Gets or sets the minimum duration that an item must have in order to be eligible for playstate updates..
+    /// </summary>
+    /// <value>The min resume duration seconds.</value>
+    public int MinResumeDurationSeconds { get; set; } = 300;
+
+    /// <summary>
+    /// Gets or sets the minimum minutes of a book that must be played in order for playstate to be updated.
+    /// </summary>
+    /// <value>The min resume in minutes.</value>
+    public int MinAudiobookResume { get; set; } = 5;
+
+    /// <summary>
+    /// Gets or sets the remaining minutes of a book that can be played while still saving playstate. If this percentage is crossed playstate will be reset to the beginning and the item will be marked watched.
+    /// </summary>
+    /// <value>The remaining time in minutes.</value>
+    public int MaxAudiobookResume { get; set; } = 5;
+
+    /// <summary>
+    /// Gets or sets the delay in seconds that we will wait after a file system change to try and discover what has been added/removed
+    /// Some delay is necessary with some items because their creation is not atomic.  It involves the creation of several
+    /// different directories and files.
+    /// </summary>
+    /// <value>The file watcher delay.</value>
+    public int LibraryMonitorDelay { get; set; } = 60;
+
+    /// <summary>
+    /// Gets or sets the duration in seconds that we will wait after a library updated event before executing the library changed notification.
+    /// </summary>
+    /// <value>The library update duration.</value>
+    public int LibraryUpdateDuration { get; set; } = 30;
+
+    /// <summary>
+    /// Gets or sets the image saving convention.
+    /// </summary>
+    /// <value>The image saving convention.</value>
+    public ImageSavingConvention ImageSavingConvention { get; set; }
+
+    public MetadataOptions[] MetadataOptions { get; set; }
+
+    public bool SkipDeserializationForBasicTypes { get; set; } = true;
+
+    public string ServerName { get; set; } = string.Empty;
+
+    public string UICulture { get; set; } = "en-US";
+
+    public bool SaveMetadataHidden { get; set; } = false;
+
+    public NameValuePair[] ContentTypes { get; set; } = Array.Empty<NameValuePair>();
+
+    public int RemoteClientBitrateLimit { get; set; }
+
+    public bool EnableFolderView { get; set; } = false;
+
+    public bool EnableGroupingIntoCollections { get; set; } = false;
+
+    public bool DisplaySpecialsWithinSeasons { get; set; } = true;
+
+    public string[] CodecsUsed { get; set; } = Array.Empty<string>();
+
+    public RepositoryInfo[] PluginRepositories { get; set; } = Array.Empty<RepositoryInfo>();
+
+    public bool EnableExternalContentInSuggestions { get; set; } = true;
+
+    public int ImageExtractionTimeoutMs { get; set; }
+
+    public PathSubstitution[] PathSubstitutions { get; set; } = Array.Empty<PathSubstitution>();
+
+    /// <summary>
+    /// Gets or sets a value indicating whether slow server responses should be logged as a warning.
+    /// </summary>
+    public bool EnableSlowResponseWarning { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the threshold for the slow response time warning in ms.
+    /// </summary>
+    public long SlowResponseThresholdMs { get; set; } = 500;
+
+    /// <summary>
+    /// Gets or sets the cors hosts.
+    /// </summary>
+    public string[] CorsHosts { get; set; } = new[] { "*" };
+
+    /// <summary>
+    /// Gets or sets the number of days we should retain activity logs.
+    /// </summary>
+    public int? ActivityLogRetentionDays { get; set; } = 30;
+
+    /// <summary>
+    /// Gets or sets the how the library scan fans out.
+    /// </summary>
+    public int LibraryScanFanoutConcurrency { get; set; }
+
+    /// <summary>
+    /// Gets or sets the how many metadata refreshes can run concurrently.
+    /// </summary>
+    public int LibraryMetadataRefreshConcurrency { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether older plugins should automatically be deleted from the plugin folder.
+    /// </summary>
+    public bool RemoveOldPlugins { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether clients should be allowed to upload logs.
+    /// </summary>
+    public bool AllowClientLogUpload { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the dummy chapter duration in seconds, use 0 (zero) or less to disable generation alltogether.
+    /// </summary>
+    /// <value>The dummy chapters duration.</value>
+    public int DummyChapterDuration { get; set; }
+
+    /// <summary>
+    /// Gets or sets the chapter image resolution.
+    /// </summary>
+    /// <value>The chapter image resolution.</value>
+    public ImageResolution ChapterImageResolution { get; set; } = ImageResolution.MatchSource;
+
+    /// <summary>
+    /// Gets or sets the limit for parallel image encoding.
+    /// </summary>
+    /// <value>The limit for parallel image encoding.</value>
+    public int ParallelImageEncodingLimit { get; set; }
+
+    /// <summary>
+    /// Gets or sets the list of cast receiver applications.
+    /// </summary>
+    public CastReceiverApplication[] CastReceiverApplications { get; set; } = Array.Empty<CastReceiverApplication>();
+
+    /// <summary>
+    /// Gets or sets the trickplay options.
+    /// </summary>
+    /// <value>The trickplay options.</value>
+    public TrickplayOptions TrickplayOptions { get; set; } = new TrickplayOptions();
 }
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 94f354660..b477f2593 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -69,5 +69,10 @@ namespace MediaBrowser.Model.Configuration
         public bool RememberSubtitleSelections { get; set; }
 
         public bool EnableNextEpisodeAutoPlay { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id of the selected cast receiver.
+        /// </summary>
+        public string? CastReceiverId { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index b7c23669d..07bb002ea 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -314,7 +314,7 @@ namespace MediaBrowser.Model.Dlna
         /// <param name="audioSampleRate">The audio sample rate.</param>
         /// <param name="audioBitDepth">The audio bit depth.</param>
         /// <returns>The <see cref="ResponseProfile"/>.</returns>
-        public ResponseProfile? GetAudioMediaProfile(string container, string? audioCodec, int? audioChannels, int? audioBitrate, int? audioSampleRate, int? audioBitDepth)
+        public ResponseProfile? GetAudioMediaProfile(string? container, string? audioCodec, int? audioChannels, int? audioBitrate, int? audioSampleRate, int? audioBitDepth)
         {
             foreach (var i in ResponseProfiles)
             {
@@ -438,14 +438,14 @@ namespace MediaBrowser.Model.Dlna
         /// <param name="isAvc">True if Avc.</param>
         /// <returns>The <see cref="ResponseProfile"/>.</returns>
         public ResponseProfile? GetVideoMediaProfile(
-            string container,
+            string? container,
             string? audioCodec,
             string? videoCodec,
             int? width,
             int? height,
             int? bitDepth,
             int? videoBitrate,
-            string videoProfile,
+            string? videoProfile,
             VideoRangeType videoRangeType,
             double? videoLevel,
             float? videoFramerate,
@@ -456,7 +456,7 @@ namespace MediaBrowser.Model.Dlna
             int? refFrames,
             int? numVideoStreams,
             int? numAudioStreams,
-            string videoCodecTag,
+            string? videoCodecTag,
             bool? isAvc)
         {
             foreach (var i in ResponseProfiles)
diff --git a/MediaBrowser.Model/Dlna/SearchCriteria.cs b/MediaBrowser.Model/Dlna/SearchCriteria.cs
index 77d6a55ea..6f4a692c8 100644
--- a/MediaBrowser.Model/Dlna/SearchCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SearchCriteria.cs
@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
 
 namespace MediaBrowser.Model.Dlna
 {
-    public class SearchCriteria
+    public partial class SearchCriteria
     {
         public SearchCriteria(string search)
         {
@@ -13,10 +13,10 @@ namespace MediaBrowser.Model.Dlna
 
             SearchType = SearchType.Unknown;
 
-            string[] factors = RegexSplit(search, "(and|or)");
+            string[] factors = AndOrRegex().Split(search);
             foreach (string factor in factors)
             {
-                string[] subFactors = RegexSplit(factor.Trim().Trim('(').Trim(')').Trim(), "\\s", 3);
+                string[] subFactors = WhiteSpaceRegex().Split(factor.Trim().Trim('(').Trim(')').Trim(), 3);
 
                 if (subFactors.Length == 3)
                 {
@@ -46,27 +46,10 @@ namespace MediaBrowser.Model.Dlna
 
         public SearchType SearchType { get; set; }
 
-        /// <summary>
-        /// Splits the specified string.
-        /// </summary>
-        /// <param name="str">The string.</param>
-        /// <param name="term">The term.</param>
-        /// <param name="limit">The limit.</param>
-        /// <returns>System.String[].</returns>
-        private static string[] RegexSplit(string str, string term, int limit)
-        {
-            return new Regex(term).Split(str, limit);
-        }
+        [GeneratedRegex("\\s")]
+        private static partial Regex WhiteSpaceRegex();
 
-        /// <summary>
-        /// Splits the specified string.
-        /// </summary>
-        /// <param name="str">The string.</param>
-        /// <param name="term">The term.</param>
-        /// <returns>System.String[].</returns>
-        private static string[] RegexSplit(string str, string term)
-        {
-            return Regex.Split(str, term, RegexOptions.IgnoreCase);
-        }
+        [GeneratedRegex("(and|or)", RegexOptions.IgnoreCase)]
+        private static partial Regex AndOrRegex();
     }
 }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index f6b882c3e..666e78795 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -135,7 +135,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            if (transcodingProfile != null)
+            if (transcodingProfile is not null)
             {
                 if (!item.SupportsTranscoding)
                 {
@@ -179,15 +179,9 @@ namespace MediaBrowser.Model.Dlna
         {
             ValidateMediaOptions(options, true);
 
-            var mediaSources = new List<MediaSourceInfo>();
-            foreach (var mediaSourceInfo in options.MediaSources)
-            {
-                if (string.IsNullOrEmpty(options.MediaSourceId)
-                    || string.Equals(mediaSourceInfo.Id, options.MediaSourceId, StringComparison.OrdinalIgnoreCase))
-                {
-                    mediaSources.Add(mediaSourceInfo);
-                }
-            }
+            var mediaSources = string.IsNullOrEmpty(options.MediaSourceId)
+                ? options.MediaSources
+                : options.MediaSources.Where(x => string.Equals(x.Id, options.MediaSourceId, StringComparison.OrdinalIgnoreCase));
 
             var streams = new List<StreamInfo>();
             foreach (var mediaSourceInfo in mediaSources)
@@ -216,7 +210,7 @@ namespace MediaBrowser.Model.Dlna
             return streams.OrderBy(i =>
             {
                 // Nothing beats direct playing a file
-                if (i.PlayMethod == PlayMethod.DirectPlay && i.MediaSource.Protocol == MediaProtocol.File)
+                if (i.PlayMethod == PlayMethod.DirectPlay && i.MediaSource?.Protocol == MediaProtocol.File)
                 {
                     return 0;
                 }
@@ -235,7 +229,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }).ThenBy(i =>
             {
-                switch (i.MediaSource.Protocol)
+                switch (i.MediaSource?.Protocol)
                 {
                     case MediaProtocol.File:
                         return 0;
@@ -246,7 +240,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 if (maxBitrate > 0)
                 {
-                    if (i.MediaSource.Bitrate.HasValue)
+                    if (i.MediaSource?.Bitrate is not null)
                     {
                         return Math.Abs(i.MediaSource.Bitrate.Value - maxBitrate);
                     }
@@ -585,10 +579,10 @@ namespace MediaBrowser.Model.Dlna
                 MediaSource = item,
                 RunTimeTicks = item.RunTimeTicks,
                 Context = options.Context,
-                DeviceProfile = options.Profile
+                DeviceProfile = options.Profile,
+                SubtitleStreamIndex = options.SubtitleStreamIndex ?? GetDefaultSubtitleStreamIndex(item, options.Profile.SubtitleProfiles)
             };
 
-            playlistItem.SubtitleStreamIndex = options.SubtitleStreamIndex ?? GetDefaultSubtitleStreamIndex(item, options.Profile.SubtitleProfiles);
             var subtitleStream = playlistItem.SubtitleStreamIndex.HasValue ? item.GetMediaStream(MediaStreamType.Subtitle, playlistItem.SubtitleStreamIndex.Value) : null;
 
             var audioStream = item.GetDefaultAudioStream(options.AudioStreamIndex ?? item.DefaultAudioStreamIndex);
@@ -659,7 +653,8 @@ namespace MediaBrowser.Model.Dlna
                         if (audioStreamIndex.HasValue)
                         {
                             playlistItem.AudioStreamIndex = audioStreamIndex;
-                            playlistItem.AudioCodecs = new[] { item.GetMediaStream(MediaStreamType.Audio, audioStreamIndex.Value)?.Codec };
+                            var audioCodec = item.GetMediaStream(MediaStreamType.Audio, audioStreamIndex.Value)?.Codec;
+                            playlistItem.AudioCodecs = audioCodec is null ? Array.Empty<string>() : new[] { audioCodec };
                         }
                     }
                     else if (directPlay == PlayMethod.DirectStream)
@@ -759,7 +754,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 // prefer direct copy profile
                 float videoFramerate = videoStream?.AverageFrameRate ?? videoStream?.RealFrameRate ?? 0;
-                TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : item.Timestamp;
+                TransportStreamTimestamp? timestamp = videoStream is null ? TransportStreamTimestamp.None : item.Timestamp;
                 int? numAudioStreams = item.GetStreamCount(MediaStreamType.Audio);
                 int? numVideoStreams = item.GetStreamCount(MediaStreamType.Video);
 
@@ -842,7 +837,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (videoStream is not null && videoStream.Level != 0)
             {
-                playlistItem.SetOption(qualifier, "level", videoStream.Level.ToString());
+                playlistItem.SetOption(qualifier, "level", videoStream.Level.ToString() ?? string.Empty);
             }
 
             // Prefer matching audio codecs, could do better here
@@ -871,7 +866,7 @@ namespace MediaBrowser.Model.Dlna
 
                 // Copy matching audio codec options
                 playlistItem.AudioSampleRate = audioStream.SampleRate;
-                playlistItem.SetOption(qualifier, "audiochannels", audioStream.Channels.ToString());
+                playlistItem.SetOption(qualifier, "audiochannels", audioStream.Channels.ToString() ?? string.Empty);
 
                 if (!string.IsNullOrEmpty(audioStream.Profile))
                 {
@@ -880,7 +875,7 @@ namespace MediaBrowser.Model.Dlna
 
                 if (audioStream.Level != 0)
                 {
-                    playlistItem.SetOption(audioStream.Codec, "level", audioStream.Level.ToString());
+                    playlistItem.SetOption(audioStream.Codec, "level", audioStream.Level.ToString() ?? string.Empty);
                 }
             }
 
@@ -1318,7 +1313,7 @@ namespace MediaBrowser.Model.Dlna
             var audioFailureConditions = GetProfileConditionsForVideoAudio(profile.CodecProfiles, container, audioStream.Codec, audioStream.Channels, audioStream.BitRate, audioStream.SampleRate, audioStream.BitDepth, audioStream.Profile, mediaSource.IsSecondaryAudio(audioStream));
 
             var audioStreamFailureReasons = AggregateFailureConditions(mediaSource, profile, "VideoAudioCodecProfile", audioFailureConditions);
-            if (audioStream?.IsExternal == true)
+            if (audioStream.IsExternal == true)
             {
                 audioStreamFailureReasons |= TranscodeReason.AudioIsExternal;
             }
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 00543616d..fc146df30 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -1,9 +1,9 @@
-#nullable disable
 #pragma warning disable CS1591
 
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
@@ -34,9 +34,9 @@ namespace MediaBrowser.Model.Dlna
 
         public DlnaProfileType MediaType { get; set; }
 
-        public string Container { get; set; }
+        public string? Container { get; set; }
 
-        public string SubProtocol { get; set; }
+        public string? SubProtocol { get; set; }
 
         public long StartPositionTicks { get; set; }
 
@@ -80,11 +80,11 @@ namespace MediaBrowser.Model.Dlna
 
         public float? MaxFramerate { get; set; }
 
-        public DeviceProfile DeviceProfile { get; set; }
+        public required DeviceProfile DeviceProfile { get; set; }
 
-        public string DeviceProfileId { get; set; }
+        public string? DeviceProfileId { get; set; }
 
-        public string DeviceId { get; set; }
+        public string? DeviceId { get; set; }
 
         public long? RunTimeTicks { get; set; }
 
@@ -92,21 +92,21 @@ namespace MediaBrowser.Model.Dlna
 
         public bool EstimateContentLength { get; set; }
 
-        public MediaSourceInfo MediaSource { get; set; }
+        public MediaSourceInfo? MediaSource { get; set; }
 
         public string[] SubtitleCodecs { get; set; }
 
         public SubtitleDeliveryMethod SubtitleDeliveryMethod { get; set; }
 
-        public string SubtitleFormat { get; set; }
+        public string? SubtitleFormat { get; set; }
 
-        public string PlaySessionId { get; set; }
+        public string? PlaySessionId { get; set; }
 
         public TranscodeReason TranscodeReasons { get; set; }
 
         public Dictionary<string, string> StreamOptions { get; private set; }
 
-        public string MediaSourceId => MediaSource?.Id;
+        public string? MediaSourceId => MediaSource?.Id;
 
         public bool IsDirectStream => MediaSource?.VideoType is not (VideoType.Dvd or VideoType.BluRay)
             && PlayMethod is PlayMethod.DirectStream or PlayMethod.DirectPlay;
@@ -114,12 +114,12 @@ namespace MediaBrowser.Model.Dlna
         /// <summary>
         /// Gets the audio stream that will be used.
         /// </summary>
-        public MediaStream TargetAudioStream => MediaSource?.GetDefaultAudioStream(AudioStreamIndex);
+        public MediaStream? TargetAudioStream => MediaSource?.GetDefaultAudioStream(AudioStreamIndex);
 
         /// <summary>
         /// Gets the video stream that will be used.
         /// </summary>
-        public MediaStream TargetVideoStream => MediaSource?.VideoStream;
+        public MediaStream? TargetVideoStream => MediaSource?.VideoStream;
 
         /// <summary>
         /// Gets the audio sample rate that will be in the output stream.
@@ -259,7 +259,7 @@ namespace MediaBrowser.Model.Dlna
         /// <summary>
         /// Gets the audio sample rate that will be in the output stream.
         /// </summary>
-        public string TargetVideoProfile
+        public string? TargetVideoProfile
         {
             get
             {
@@ -307,7 +307,7 @@ namespace MediaBrowser.Model.Dlna
         /// Gets the target video codec tag.
         /// </summary>
         /// <value>The target video codec tag.</value>
-        public string TargetVideoCodecTag
+        public string? TargetVideoCodecTag
         {
             get
             {
@@ -364,7 +364,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 var stream = TargetAudioStream;
 
-                string inputCodec = stream?.Codec;
+                string? inputCodec = stream?.Codec;
 
                 if (IsDirectStream)
                 {
@@ -389,7 +389,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 var stream = TargetVideoStream;
 
-                string inputCodec = stream?.Codec;
+                string? inputCodec = stream?.Codec;
 
                 if (IsDirectStream)
                 {
@@ -417,7 +417,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 if (IsDirectStream)
                 {
-                    return MediaSource.Size;
+                    return MediaSource?.Size;
                 }
 
                 if (RunTimeTicks.HasValue)
@@ -580,7 +580,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public void SetOption(string qualifier, string name, string value)
+        public void SetOption(string? qualifier, string name, string value)
         {
             if (string.IsNullOrEmpty(qualifier))
             {
@@ -597,7 +597,7 @@ namespace MediaBrowser.Model.Dlna
             StreamOptions[name] = value;
         }
 
-        public string GetOption(string qualifier, string name)
+        public string? GetOption(string? qualifier, string name)
         {
             var value = GetOption(qualifier + "-" + name);
 
@@ -609,7 +609,7 @@ namespace MediaBrowser.Model.Dlna
             return value;
         }
 
-        public string GetOption(string name)
+        public string? GetOption(string name)
         {
             if (StreamOptions.TryGetValue(name, out var value))
             {
@@ -619,7 +619,7 @@ namespace MediaBrowser.Model.Dlna
             return null;
         }
 
-        public string ToUrl(string baseUrl, string accessToken)
+        public string ToUrl(string baseUrl, string? accessToken)
         {
             ArgumentException.ThrowIfNullOrEmpty(baseUrl);
 
@@ -686,7 +686,7 @@ namespace MediaBrowser.Model.Dlna
             return string.Format(CultureInfo.InvariantCulture, "{0}/videos/{1}/stream{2}?{3}", baseUrl, ItemId, extension, queryString);
         }
 
-        private static IEnumerable<NameValuePair> BuildParams(StreamInfo item, string accessToken)
+        private static IEnumerable<NameValuePair> BuildParams(StreamInfo item, string? accessToken)
         {
             var list = new List<NameValuePair>();
 
@@ -730,7 +730,7 @@ namespace MediaBrowser.Model.Dlna
             list.Add(new NameValuePair("PlaySessionId", item.PlaySessionId ?? string.Empty));
             list.Add(new NameValuePair("api_key", accessToken ?? string.Empty));
 
-            string liveStreamId = item.MediaSource?.LiveStreamId;
+            string? liveStreamId = item.MediaSource?.LiveStreamId;
             list.Add(new NameValuePair("LiveStreamId", liveStreamId ?? string.Empty));
 
             list.Add(new NameValuePair("SubtitleMethod", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External ? item.SubtitleDeliveryMethod.ToString() : string.Empty));
@@ -772,7 +772,7 @@ namespace MediaBrowser.Model.Dlna
                 list.Add(new NameValuePair("RequireAvc", item.RequireAvc.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
             }
 
-            list.Add(new NameValuePair("Tag", item.MediaSource.ETag ?? string.Empty));
+            list.Add(new NameValuePair("Tag", item.MediaSource?.ETag ?? string.Empty));
 
             string subtitleCodecs = item.SubtitleCodecs.Length == 0 ?
                string.Empty :
@@ -816,13 +816,18 @@ namespace MediaBrowser.Model.Dlna
             return list;
         }
 
-        public IEnumerable<SubtitleStreamInfo> GetSubtitleProfiles(ITranscoderSupport transcoderSupport, bool includeSelectedTrackOnly, string baseUrl, string accessToken)
+        public IEnumerable<SubtitleStreamInfo> GetSubtitleProfiles(ITranscoderSupport transcoderSupport, bool includeSelectedTrackOnly, string baseUrl, string? accessToken)
         {
             return GetSubtitleProfiles(transcoderSupport, includeSelectedTrackOnly, false, baseUrl, accessToken);
         }
 
-        public IEnumerable<SubtitleStreamInfo> GetSubtitleProfiles(ITranscoderSupport transcoderSupport, bool includeSelectedTrackOnly, bool enableAllProfiles, string baseUrl, string accessToken)
+        public IEnumerable<SubtitleStreamInfo> GetSubtitleProfiles(ITranscoderSupport transcoderSupport, bool includeSelectedTrackOnly, bool enableAllProfiles, string baseUrl, string? accessToken)
         {
+            if (MediaSource is null)
+            {
+                return Enumerable.Empty<SubtitleStreamInfo>();
+            }
+
             var list = new List<SubtitleStreamInfo>();
 
             // HLS will preserve timestamps so we can just grab the full subtitle stream
@@ -856,27 +861,36 @@ namespace MediaBrowser.Model.Dlna
             return list;
         }
 
-        private void AddSubtitleProfiles(List<SubtitleStreamInfo> list, MediaStream stream, ITranscoderSupport transcoderSupport, bool enableAllProfiles, string baseUrl, string accessToken, long startPositionTicks)
+        private void AddSubtitleProfiles(List<SubtitleStreamInfo> list, MediaStream stream, ITranscoderSupport transcoderSupport, bool enableAllProfiles, string baseUrl, string? accessToken, long startPositionTicks)
         {
             if (enableAllProfiles)
             {
                 foreach (var profile in DeviceProfile.SubtitleProfiles)
                 {
                     var info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, new[] { profile }, transcoderSupport);
-
-                    list.Add(info);
+                    if (info is not null)
+                    {
+                        list.Add(info);
+                    }
                 }
             }
             else
             {
                 var info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, DeviceProfile.SubtitleProfiles, transcoderSupport);
-
-                list.Add(info);
+                if (info is not null)
+                {
+                    list.Add(info);
+                }
             }
         }
 
-        private SubtitleStreamInfo GetSubtitleStreamInfo(MediaStream stream, string baseUrl, string accessToken, long startPositionTicks, SubtitleProfile[] subtitleProfiles, ITranscoderSupport transcoderSupport)
+        private SubtitleStreamInfo? GetSubtitleStreamInfo(MediaStream stream, string baseUrl, string? accessToken, long startPositionTicks, SubtitleProfile[] subtitleProfiles, ITranscoderSupport transcoderSupport)
         {
+            if (MediaSource is null)
+            {
+                return null;
+            }
+
             var subtitleProfile = StreamBuilder.GetSubtitleProfile(MediaSource, stream, subtitleProfiles, PlayMethod, transcoderSupport, Container, SubProtocol);
             var info = new SubtitleStreamInfo
             {
@@ -920,7 +934,7 @@ namespace MediaBrowser.Model.Dlna
             return info;
         }
 
-        public int? GetTargetVideoBitDepth(string codec)
+        public int? GetTargetVideoBitDepth(string? codec)
         {
             var value = GetOption(codec, "videobitdepth");
 
@@ -932,7 +946,7 @@ namespace MediaBrowser.Model.Dlna
             return null;
         }
 
-        public int? GetTargetAudioBitDepth(string codec)
+        public int? GetTargetAudioBitDepth(string? codec)
         {
             var value = GetOption(codec, "audiobitdepth");
 
@@ -944,7 +958,7 @@ namespace MediaBrowser.Model.Dlna
             return null;
         }
 
-        public double? GetTargetVideoLevel(string codec)
+        public double? GetTargetVideoLevel(string? codec)
         {
             var value = GetOption(codec, "level");
 
@@ -956,7 +970,7 @@ namespace MediaBrowser.Model.Dlna
             return null;
         }
 
-        public int? GetTargetRefFrames(string codec)
+        public int? GetTargetRefFrames(string? codec)
         {
             var value = GetOption(codec, "maxrefframes");
 
@@ -968,7 +982,7 @@ namespace MediaBrowser.Model.Dlna
             return null;
         }
 
-        public int? GetTargetAudioChannels(string codec)
+        public int? GetTargetAudioChannels(string? codec)
         {
             var defaultValue = GlobalMaxAudioChannels ?? TranscodingMaxAudioChannels;
 
@@ -988,7 +1002,7 @@ namespace MediaBrowser.Model.Dlna
 
         private int? GetMediaStreamCount(MediaStreamType type, int limit)
         {
-            var count = MediaSource.GetStreamCount(type);
+            var count = MediaSource?.GetStreamCount(type);
 
             if (count.HasValue)
             {
diff --git a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
index 987a3a908..c7489d57a 100644
--- a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
+++ b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
@@ -13,10 +13,10 @@ namespace MediaBrowser.Model.Dlna
 
         public Dictionary<string, string> Headers { get; set; }
 
-        public IPAddress LocalIpAddress { get; set; }
+        public IPAddress LocalIPAddress { get; set; }
 
         public int LocalPort { get; set; }
 
-        public IPAddress RemoteIpAddress { get; set; }
+        public IPAddress RemoteIPAddress { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs b/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs
index 68a5c2534..1bb24112e 100644
--- a/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs
+++ b/MediaBrowser.Model/Drawing/ImageFormatExtensions.cs
@@ -24,4 +24,21 @@ public static class ImageFormatExtensions
             ImageFormat.Webp => "image/webp",
             _ => throw new InvalidEnumArgumentException(nameof(format), (int)format, typeof(ImageFormat))
         };
+
+    /// <summary>
+    /// Returns the correct extension for this <see cref="ImageFormat" />.
+    /// </summary>
+    /// <param name="format">This <see cref="ImageFormat" />.</param>
+    /// <exception cref="InvalidEnumArgumentException">The <paramref name="format"/> is an invalid enumeration value.</exception>
+    /// <returns>The correct extension for this <see cref="ImageFormat" />.</returns>
+    public static string GetExtension(this ImageFormat format)
+        => format switch
+        {
+            ImageFormat.Bmp => ".bmp",
+            ImageFormat.Gif => ".gif",
+            ImageFormat.Jpg => ".jpg",
+            ImageFormat.Png => ".png",
+            ImageFormat.Webp => ".webp",
+            _ => throw new InvalidEnumArgumentException(nameof(format), (int)format, typeof(ImageFormat))
+        };
 }
diff --git a/MediaBrowser.Model/Entities/ChapterInfo.cs b/MediaBrowser.Model/Entities/ChapterInfo.cs
index 45554c3dc..d6b905651 100644
--- a/MediaBrowser.Model/Entities/ChapterInfo.cs
+++ b/MediaBrowser.Model/Entities/ChapterInfo.cs
@@ -1,4 +1,3 @@
-#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -20,16 +19,16 @@ namespace MediaBrowser.Model.Entities
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the image path.
         /// </summary>
         /// <value>The image path.</value>
-        public string ImagePath { get; set; }
+        public string? ImagePath { get; set; }
 
         public DateTime ImageDateModified { get; set; }
 
-        public string ImageTag { get; set; }
+        public string? ImageTag { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index 786b20e9e..ec381d423 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -10,8 +10,6 @@ namespace MediaBrowser.Model.IO
     /// </summary>
     public interface IFileSystem
     {
-        void AddShortcutHandler(IShortcutHandler handler);
-
         /// <summary>
         /// Determines whether the specified filename is shortcut.
         /// </summary>
@@ -117,13 +115,6 @@ namespace MediaBrowser.Model.IO
         bool ContainsSubPath(string parentPath, string path);
 
         /// <summary>
-        /// Normalizes the path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>System.String.</returns>
-        string NormalizePath(string path);
-
-        /// <summary>
         /// Gets the file name without extension.
         /// </summary>
         /// <param name="info">The information.</param>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 9a5804485..58ba83a35 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -33,6 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="MimeTypes">
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
index 85de91694..c5a99a9ec 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
@@ -9,6 +9,7 @@ namespace MediaBrowser.Model.MediaInfo
         public const string SSA = "ssa";
         public const string ASS = "ass";
         public const string VTT = "vtt";
+        public const string WEBVTT = "webvtt";
         public const string TTML = "ttml";
     }
 }
diff --git a/MediaBrowser.Model/Net/IPData.cs b/MediaBrowser.Model/Net/IPData.cs
new file mode 100644
index 000000000..e9fcd6797
--- /dev/null
+++ b/MediaBrowser.Model/Net/IPData.cs
@@ -0,0 +1,79 @@
+using System.Net;
+using System.Net.Sockets;
+using Microsoft.AspNetCore.HttpOverrides;
+
+namespace MediaBrowser.Model.Net;
+
+/// <summary>
+/// Base network object class.
+/// </summary>
+public class IPData
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="IPData"/> class.
+    /// </summary>
+    /// <param name="address">The <see cref="IPAddress"/>.</param>
+    /// <param name="subnet">The <see cref="IPNetwork"/>.</param>
+    /// <param name="name">The interface name.</param>
+    public IPData(IPAddress address, IPNetwork? subnet, string name)
+    {
+        Address = address;
+        Subnet = subnet ?? (address.AddressFamily == AddressFamily.InterNetwork ? new IPNetwork(address, 32) : new IPNetwork(address, 128));
+        Name = name;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="IPData"/> class.
+    /// </summary>
+    /// <param name="address">The <see cref="IPAddress"/>.</param>
+    /// <param name="subnet">The <see cref="IPNetwork"/>.</param>
+    public IPData(IPAddress address, IPNetwork? subnet)
+        : this(address, subnet, string.Empty)
+    {
+    }
+
+    /// <summary>
+    /// Gets or sets the object's IP address.
+    /// </summary>
+    public IPAddress Address { get; set; }
+
+    /// <summary>
+    /// Gets or sets the object's IP address.
+    /// </summary>
+    public IPNetwork Subnet { get; set; }
+
+    /// <summary>
+    /// Gets or sets the interface index.
+    /// </summary>
+    public int Index { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the network supports multicast.
+    /// </summary>
+    public bool SupportsMulticast { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets the interface name.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets the AddressFamily of the object.
+    /// </summary>
+    public AddressFamily AddressFamily
+    {
+        get
+        {
+            if (Address.Equals(IPAddress.None))
+            {
+                return Subnet.Prefix.AddressFamily.Equals(IPAddress.None)
+                    ? AddressFamily.Unspecified
+                    : Subnet.Prefix.AddressFamily;
+            }
+            else
+            {
+                return Address.AddressFamily;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Net/ISocket.cs b/MediaBrowser.Model/Net/ISocket.cs
deleted file mode 100644
index 3de41d565..000000000
--- a/MediaBrowser.Model/Net/ISocket.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Model.Net
-{
-    /// <summary>
-    /// Provides a common interface across platforms for UDP sockets used by this SSDP implementation.
-    /// </summary>
-    public interface ISocket : IDisposable
-    {
-        IPAddress LocalIPAddress { get; }
-
-        Task<SocketReceiveResult> ReceiveAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken);
-
-        IAsyncResult BeginReceive(byte[] buffer, int offset, int count, AsyncCallback callback);
-
-        SocketReceiveResult EndReceive(IAsyncResult result);
-
-        /// <summary>
-        /// Sends a UDP message to a particular end point (uni or multicast).
-        /// </summary>
-        /// <param name="buffer">An array of type <see cref="byte" /> that contains the data to send.</param>
-        /// <param name="offset">The zero-based position in buffer at which to begin sending data.</param>
-        /// <param name="bytes">The number of bytes to send.</param>
-        /// <param name="endPoint">An <see cref="IPEndPoint" /> that represents the remote device.</param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        /// <returns>The task object representing the asynchronous operation.</returns>
-        Task SendToAsync(byte[] buffer, int offset, int bytes, IPEndPoint endPoint, CancellationToken cancellationToken);
-    }
-}
diff --git a/MediaBrowser.Model/Net/ISocketFactory.cs b/MediaBrowser.Model/Net/ISocketFactory.cs
index a2835b711..128034eb8 100644
--- a/MediaBrowser.Model/Net/ISocketFactory.cs
+++ b/MediaBrowser.Model/Net/ISocketFactory.cs
@@ -1,31 +1,35 @@
-#pragma warning disable CS1591
-
 using System.Net;
+using System.Net.Sockets;
+
+namespace MediaBrowser.Model.Net;
 
-namespace MediaBrowser.Model.Net
+/// <summary>
+/// Implemented by components that can create specific socket configurations.
+/// </summary>
+public interface ISocketFactory
 {
     /// <summary>
-    /// Implemented by components that can create a platform specific UDP socket implementation, and wrap it in the cross platform <see cref="ISocket"/> interface.
+    /// Creates a new unicast socket using the specified local port number.
     /// </summary>
-    public interface ISocketFactory
-    {
-        ISocket CreateUdpBroadcastSocket(int localPort);
+    /// <param name="localPort">The local port to bind to.</param>
+    /// <returns>A new unicast socket using the specified local port number.</returns>
+    Socket CreateUdpBroadcastSocket(int localPort);
 
-        /// <summary>
-        /// Creates a new unicast socket using the specified local port number.
-        /// </summary>
-        /// <param name="localIp">The local IP address to bind to.</param>
-        /// <param name="localPort">The local port to bind to.</param>
-        /// <returns>A new unicast socket using the specified local port number.</returns>
-        ISocket CreateSsdpUdpSocket(IPAddress localIp, int localPort);
+    /// <summary>
+    /// Creates a new unicast socket using the specified local port number.
+    /// </summary>
+    /// <param name="bindInterface">The bind interface.</param>
+    /// <param name="localPort">The local port to bind to.</param>
+    /// <returns>A new unicast socket using the specified local port number.</returns>
+    Socket CreateSsdpUdpSocket(IPData bindInterface, int localPort);
 
-        /// <summary>
-        /// Creates a new multicast socket using the specified multicast IP address, multicast time to live and local port.
-        /// </summary>
-        /// <param name="ipAddress">The multicast IP address to bind to.</param>
-        /// <param name="multicastTimeToLive">The multicast time to live value. Actually a maximum number of network hops for UDP packets.</param>
-        /// <param name="localPort">The local port to bind to.</param>
-        /// <returns>A <see cref="ISocket"/> implementation.</returns>
-        ISocket CreateUdpMulticastSocket(IPAddress ipAddress, int multicastTimeToLive, int localPort);
-    }
+    /// <summary>
+    /// Creates a new multicast socket using the specified multicast IP address, multicast time to live and local port.
+    /// </summary>
+    /// <param name="multicastAddress">The multicast IP address to bind to.</param>
+    /// <param name="bindInterface">The bind interface.</param>
+    /// <param name="multicastTimeToLive">The multicast time to live value. Actually a maximum number of network hops for UDP packets.</param>
+    /// <param name="localPort">The local port to bind to.</param>
+    /// <returns>A new multicast socket using the specfied bind interface, multicast address, multicast time to live and port.</returns>
+    Socket CreateUdpMulticastSocket(IPAddress multicastAddress, IPData bindInterface, int multicastTimeToLive, int localPort);
 }
diff --git a/MediaBrowser.Model/Net/PublishedServerUriOverride.cs b/MediaBrowser.Model/Net/PublishedServerUriOverride.cs
new file mode 100644
index 000000000..476d1ba38
--- /dev/null
+++ b/MediaBrowser.Model/Net/PublishedServerUriOverride.cs
@@ -0,0 +1,42 @@
+namespace MediaBrowser.Model.Net;
+
+/// <summary>
+/// Class holding information for a published server URI override.
+/// </summary>
+public class PublishedServerUriOverride
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PublishedServerUriOverride"/> class.
+    /// </summary>
+    /// <param name="data">The <see cref="IPData"/>.</param>
+    /// <param name="overrideUri">The override.</param>
+    /// <param name="internalOverride">A value indicating whether the override is for internal requests.</param>
+    /// <param name="externalOverride">A value indicating whether the override is for external requests.</param>
+    public PublishedServerUriOverride(IPData data, string overrideUri, bool internalOverride, bool externalOverride)
+    {
+        Data = data;
+        OverrideUri = overrideUri;
+        IsInternalOverride = internalOverride;
+        IsExternalOverride = externalOverride;
+    }
+
+    /// <summary>
+    /// Gets or sets the object's IP address.
+    /// </summary>
+    public IPData Data { get; set; }
+
+    /// <summary>
+    /// Gets or sets the override URI.
+    /// </summary>
+    public string OverrideUri { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the override should be applied to internal requests.
+    /// </summary>
+    public bool IsInternalOverride { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the override should be applied to external requests.
+    /// </summary>
+    public bool IsExternalOverride { get; set; }
+}
diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
index a8d88d8a1..9f9c922a7 100644
--- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
@@ -25,8 +25,18 @@ namespace MediaBrowser.Model.Providers
 
         public float? CommunityRating { get; set; }
 
+        public float? FrameRate { get; set; }
+
         public int? DownloadCount { get; set; }
 
         public bool? IsHashMatch { get; set; }
+
+        public bool? AiTranslated { get; set; }
+
+        public bool? MachineTranslated { get; set; }
+
+        public bool? Forced { get; set; }
+
+        public bool? HearingImpaired { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index 0fb996df9..35353e6fa 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -14,6 +14,7 @@ namespace MediaBrowser.Model.Querying
             EnableTotalRecordCount = true;
             DisableFirstEpisode = false;
             NextUpDateCutoff = DateTime.MinValue;
+            EnableResumable = false;
             EnableRewatching = false;
         }
 
@@ -84,6 +85,11 @@ namespace MediaBrowser.Model.Querying
         public DateTime NextUpDateCutoff { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether to include resumable episodes as next up.
+        /// </summary>
+        public bool EnableResumable { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether getting rewatching next up list.
         /// </summary>
         public bool EnableRewatching { get; set; }
diff --git a/MediaBrowser.Model/System/CastReceiverApplication.cs b/MediaBrowser.Model/System/CastReceiverApplication.cs
new file mode 100644
index 000000000..6a49a5cac
--- /dev/null
+++ b/MediaBrowser.Model/System/CastReceiverApplication.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.System;
+
+/// <summary>
+/// The cast receiver application model.
+/// </summary>
+public class CastReceiverApplication
+{
+    /// <summary>
+    /// Gets or sets the cast receiver application id.
+    /// </summary>
+    public required string Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the cast receiver application name.
+    /// </summary>
+    public required string Name { get; set; }
+}
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index bd0099af7..aa7c03ebd 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -2,6 +2,7 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using MediaBrowser.Model.Updates;
 
@@ -84,7 +85,8 @@ namespace MediaBrowser.Model.System
         [Obsolete("This is always true")]
         public bool CanSelfRestart { get; set; } = true;
 
-        public bool CanLaunchWebBrowser { get; set; }
+        [Obsolete("This is always false")]
+        public bool CanLaunchWebBrowser { get; set; } = false;
 
         /// <summary>
         /// Gets or sets the program data path.
@@ -129,6 +131,11 @@ namespace MediaBrowser.Model.System
         public string TranscodingTempPath { get; set; }
 
         /// <summary>
+        /// Gets or sets the list of cast receiver applications.
+        /// </summary>
+        public IReadOnlyList<CastReceiverApplication> CastReceiverApplications { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether this instance has update available.
         /// </summary>
         /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>