From e814d8e2cfe41acb9269c048bbbd5f133dfcae7b Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Fri, 12 Mar 2021 06:43:57 -0700
Subject: Add JsonStringConverter

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

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

diff --git a/MediaBrowser.Common/Json/Converters/JsonStringConverter.cs b/MediaBrowser.Common/Json/Converters/JsonStringConverter.cs
new file mode 100644
index 000000000..585f52b8f
--- /dev/null
+++ b/MediaBrowser.Common/Json/Converters/JsonStringConverter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MediaBrowser.Common.Json.Converters
+{
+    /// <summary>
+    /// Converter to allow the serializer to read strings.
+    /// </summary>
+    public class JsonStringConverter : JsonConverter<string>
+    {
+        /// <inheritdoc />
+        public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return reader.TokenType switch
+            {
+                JsonTokenType.Null => null,
+                JsonTokenType.String => reader.GetString(),
+                _ => GetRawValue(reader)
+            };
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value);
+        }
+
+        private static string GetRawValue(Utf8JsonReader reader)
+        {
+            var utf8Bytes = reader.HasValueSequence
+                ? reader.ValueSequence.FirstSpan
+                : reader.ValueSpan;
+            return Encoding.UTF8.GetString(utf8Bytes);
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 37b1b31a46e818cb5d229ebf11d7db7895c3b964 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sat, 13 Mar 2021 08:41:16 -0700
Subject: Convert full ValueSequence

---
 MediaBrowser.Common/Json/Converters/JsonStringConverter.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/MediaBrowser.Common/Json/Converters/JsonStringConverter.cs b/MediaBrowser.Common/Json/Converters/JsonStringConverter.cs
index 585f52b8f..669b3cd07 100644
--- a/MediaBrowser.Common/Json/Converters/JsonStringConverter.cs
+++ b/MediaBrowser.Common/Json/Converters/JsonStringConverter.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Buffers;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -30,7 +31,7 @@ namespace MediaBrowser.Common.Json.Converters
         private static string GetRawValue(Utf8JsonReader reader)
         {
             var utf8Bytes = reader.HasValueSequence
-                ? reader.ValueSequence.FirstSpan
+                ? reader.ValueSequence.ToArray()
                 : reader.ValueSpan;
             return Encoding.UTF8.GetString(utf8Bytes);
         }
-- 
cgit v1.2.3