Merge branch 'master' into sort-nfo-data

2 files changed, 44 insertions, 5 deletions

diff --git a/MediaBrowser.Model/Extensions/ContainerHelper.cs b/MediaBrowser.Model/Extensions/ContainerHelper.cs
index c86328ba6..39e5358ba 100644
--- a/MediaBrowser.Model/Extensions/ContainerHelper.cs
+++ b/MediaBrowser.Model/Extensions/ContainerHelper.cs
@@ -14,7 +14,8 @@ public static class ContainerHelper
     /// in <paramref name="profileContainers"/>.
     /// </summary>
     /// <param name="profileContainers">The comma-delimited string being searched.
-    /// If the parameter begins with the <c>-</c> character, the operation is reversed.</param>
+    /// If the parameter begins with the <c>-</c> character, the operation is reversed.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
     public static bool ContainsContainer(string? profileContainers, string? inputContainer)
@@ -34,7 +35,8 @@ public static class ContainerHelper
     /// in <paramref name="profileContainers"/>.
     /// </summary>
     /// <param name="profileContainers">The comma-delimited string being searched.
-    /// If the parameter begins with the <c>-</c> character, the operation is reversed.</param>
+    /// If the parameter begins with the <c>-</c> character, the operation is reversed.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
     public static bool ContainsContainer(string? profileContainers, ReadOnlySpan<char> inputContainer)
@@ -53,7 +55,8 @@ public static class ContainerHelper
     /// Compares two containers, returning <paramref name="isNegativeList"/> if an item in <paramref name="inputContainer"/>
     /// does not exist in <paramref name="profileContainers"/>.
     /// </summary>
-    /// <param name="profileContainers">The comma-delimited string being searched.</param>
+    /// <param name="profileContainers">The comma-delimited string being searched.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="isNegativeList">The boolean result to return if a match is not found.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
@@ -71,7 +74,8 @@ public static class ContainerHelper
     /// Compares two containers, returning <paramref name="isNegativeList"/> if an item in <paramref name="inputContainer"/>
     /// does not exist in <paramref name="profileContainers"/>.
     /// </summary>
-    /// <param name="profileContainers">The comma-delimited string being searched.</param>
+    /// <param name="profileContainers">The comma-delimited string being searched.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="isNegativeList">The boolean result to return if a match is not found.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
@@ -106,7 +110,8 @@ public static class ContainerHelper
     /// Compares two containers, returning <paramref name="isNegativeList"/> if an item in <paramref name="inputContainer"/>
     /// does not exist in <paramref name="profileContainers"/>.
     /// </summary>
-    /// <param name="profileContainers">The profile containers being matched searched.</param>
+    /// <param name="profileContainers">The profile containers being matched searched.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="isNegativeList">The boolean result to return if a match is not found.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
diff --git a/MediaBrowser.Model/Extensions/LibraryOptionsExtension.cs b/MediaBrowser.Model/Extensions/LibraryOptionsExtension.cs
new file mode 100644
index 000000000..b088cfb53
--- /dev/null
+++ b/MediaBrowser.Model/Extensions/LibraryOptionsExtension.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Linq;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.Model.Extensions;
+
+/// <summary>
+/// Extensions for <see cref="LibraryOptions"/>.
+/// </summary>
+public static class LibraryOptionsExtension
+{
+    /// <summary>
+    /// Get the custom tag delimiters.
+    /// </summary>
+    /// <param name="options">This LibraryOptions.</param>
+    /// <returns>CustomTagDelimiters in char[].</returns>
+    public static char[] GetCustomTagDelimiters(this LibraryOptions options)
+    {
+        ArgumentNullException.ThrowIfNull(options);
+
+        var delimiterList = options.CustomTagDelimiters.Select<string, char?>(x =>
+        {
+            var isChar = char.TryParse(x, out var c);
+            if (isChar)
+            {
+                return c;
+            }
+
+            return null;
+        }).Where(x => x is not null).Select(x => x!.Value).ToList();
+        delimiterList.Add('\0');
+        return delimiterList.ToArray();
+    }
+}