Merge branch 'master' into using-declarations

1 files changed, 16 insertions, 43 deletions

diff --git a/MediaBrowser.Model/Dlna/ContainerProfile.cs b/MediaBrowser.Model/Dlna/ContainerProfile.cs
index d83c8f2f3..740966088 100644
--- a/MediaBrowser.Model/Dlna/ContainerProfile.cs
+++ b/MediaBrowser.Model/Dlna/ContainerProfile.cs
@@ -1,4 +1,3 @@
-#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -9,25 +8,15 @@ namespace MediaBrowser.Model.Dlna
 {
     public class ContainerProfile
     {
-        public ContainerProfile()
-        {
-            Conditions = Array.Empty<ProfileCondition>();
-        }
-
         [XmlAttribute("type")]
         public DlnaProfileType Type { get; set; }
 
-        public ProfileCondition[] Conditions { get; set; }
+        public ProfileCondition[]? Conditions { get; set; } = Array.Empty<ProfileCondition>();
 
         [XmlAttribute("container")]
-        public string Container { get; set; }
-
-        public string[] GetContainers()
-        {
-            return SplitValue(Container);
-        }
+        public string Container { get; set; } = string.Empty;
 
-        public static string[] SplitValue(string value)
+        public static string[] SplitValue(string? value)
         {
             if (string.IsNullOrEmpty(value))
             {
@@ -37,14 +26,14 @@ namespace MediaBrowser.Model.Dlna
             return value.Split(',', StringSplitOptions.RemoveEmptyEntries);
         }
 
-        public bool ContainsContainer(string container)
+        public bool ContainsContainer(string? container)
         {
-            var containers = GetContainers();
+            var containers = SplitValue(Container);
 
             return ContainsContainer(containers, container);
         }
 
-        public static bool ContainsContainer(string profileContainers, string inputContainer)
+        public static bool ContainsContainer(string? profileContainers, string? inputContainer)
         {
             var isNegativeList = false;
             if (profileContainers != null && profileContainers.StartsWith('-'))
@@ -56,46 +45,30 @@ namespace MediaBrowser.Model.Dlna
             return ContainsContainer(SplitValue(profileContainers), isNegativeList, inputContainer);
         }
 
-        public static bool ContainsContainer(string[] profileContainers, string inputContainer)
+        public static bool ContainsContainer(string[]? profileContainers, string? inputContainer)
         {
             return ContainsContainer(profileContainers, false, inputContainer);
         }
 
-        public static bool ContainsContainer(string[] profileContainers, bool isNegativeList, string inputContainer)
+        public static bool ContainsContainer(string[]? profileContainers, bool isNegativeList, string? inputContainer)
         {
-            if (profileContainers.Length == 0)
+            if (profileContainers == null || profileContainers.Length == 0)
             {
+                // Empty profiles always support all containers/codecs
                 return true;
             }
 
-            if (isNegativeList)
-            {
-                var allInputContainers = SplitValue(inputContainer);
+            var allInputContainers = SplitValue(inputContainer);
 
-                foreach (var container in allInputContainers)
-                {
-                    if (profileContainers.Contains(container, StringComparer.OrdinalIgnoreCase))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-            else
+            foreach (var container in allInputContainers)
             {
-                var allInputContainers = SplitValue(inputContainer);
-
-                foreach (var container in allInputContainers)
+                if (profileContainers.Contains(container, StringComparer.OrdinalIgnoreCase))
                 {
-                    if (profileContainers.Contains(container, StringComparer.OrdinalIgnoreCase))
-                    {
-                        return true;
-                    }
+                    return !isNegativeList;
                 }
-
-                return false;
             }
+
+            return isNegativeList;
         }
     }
 }