From 37f38526995146c8731af6d3091113bd3e842017 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sun, 11 Oct 2020 17:45:45 -0600
Subject: Add comma delimited string to array json converter

---
 .../Converters/JsonCommaDelimitedArrayConverter.cs | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs

(limited to 'MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs')

diff --git a/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
new file mode 100644
index 000000000..4f6a68531
--- /dev/null
+++ b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
@@ -0,0 +1,53 @@
+using System;
+using System.ComponentModel;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MediaBrowser.Common.Json.Converters
+{
+    /// <summary>
+    /// Convert comma delimited string to array of type.
+    /// </summary>
+    /// <typeparam name="T">Type to convert to.</typeparam>
+    public class JsonCommaDelimitedArrayConverter<T> : JsonConverter<T[]>
+    {
+        private readonly TypeConverter _typeConverter;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonCommaDelimitedArrayConverter{T}"/> class.
+        /// </summary>
+        public JsonCommaDelimitedArrayConverter()
+        {
+            _typeConverter = TypeDescriptor.GetConverter(typeof(T));
+        }
+
+        /// <inheritdoc />
+        public override T[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                var stringEntries = reader.GetString()?.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                if (stringEntries == null || stringEntries.Length == 0)
+                {
+                    return Array.Empty<T>();
+                }
+
+                var entries = new T[stringEntries.Length];
+                for (var i = 0; i < stringEntries.Length; i++)
+                {
+                    entries[i] = (T)_typeConverter.ConvertFrom(stringEntries[i]);
+                }
+
+                return entries;
+            }
+
+            return JsonSerializer.Deserialize<T[]>(ref reader, options);
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, T[] value, JsonSerializerOptions options)
+        {
+            JsonSerializer.Serialize(writer, value, options);
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From b2662894cf6e7e6b20d12ff22c79ee5159658a2a Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 16 Oct 2020 09:37:35 -0600
Subject: Add whitespace handling and tests

---
 .../Converters/JsonCommaDelimitedArrayConverter.cs |  2 +-
 .../Json/JsonCommaDelimitedArrayTests.cs           | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs')

diff --git a/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
index 4f6a68531..bf7048c37 100644
--- a/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
+++ b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.Common.Json.Converters
                 var entries = new T[stringEntries.Length];
                 for (var i = 0; i < stringEntries.Length; i++)
                 {
-                    entries[i] = (T)_typeConverter.ConvertFrom(stringEntries[i]);
+                    entries[i] = (T)_typeConverter.ConvertFrom(stringEntries[i].Trim());
                 }
 
                 return entries;
diff --git a/tests/Jellyfin.Common.Tests/Json/JsonCommaDelimitedArrayTests.cs b/tests/Jellyfin.Common.Tests/Json/JsonCommaDelimitedArrayTests.cs
index c543cfee9..16f8a690e 100644
--- a/tests/Jellyfin.Common.Tests/Json/JsonCommaDelimitedArrayTests.cs
+++ b/tests/Jellyfin.Common.Tests/Json/JsonCommaDelimitedArrayTests.cs
@@ -21,6 +21,19 @@ namespace Jellyfin.Common.Tests.Json
             Assert.Equal(desiredValue.Value, value?.Value);
         }
 
+        [Fact]
+        public static void Deserialize_String_Space_Valid_Success()
+        {
+            var desiredValue = new GenericBodyModel<string>
+            {
+                Value = new[] { "a", "b", "c" }
+            };
+
+            var options = new JsonSerializerOptions();
+            var value = JsonSerializer.Deserialize<GenericBodyModel<string>>(@"{ ""Value"": ""a, b, c"" }", options);
+            Assert.Equal(desiredValue.Value, value?.Value);
+        }
+
         [Fact]
         public static void Deserialize_GenericCommandType_Valid_Success()
         {
@@ -35,6 +48,20 @@ namespace Jellyfin.Common.Tests.Json
             Assert.Equal(desiredValue.Value, value?.Value);
         }
 
+        [Fact]
+        public static void Deserialize_GenericCommandType_Space_Valid_Success()
+        {
+            var desiredValue = new GenericBodyModel<GeneralCommandType>
+            {
+                Value = new[] { GeneralCommandType.MoveUp, GeneralCommandType.MoveDown }
+            };
+
+            var options = new JsonSerializerOptions();
+            options.Converters.Add(new JsonStringEnumConverter());
+            var value = JsonSerializer.Deserialize<GenericBodyModel<GeneralCommandType>>(@"{ ""Value"": ""MoveUp, MoveDown"" }", options);
+            Assert.Equal(desiredValue.Value, value?.Value);
+        }
+
         [Fact]
         public static void Deserialize_String_Array_Valid_Success()
         {
-- 
cgit v1.2.3