From 3633996a53385d78601df33286b47415475ae3bb Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Mon, 21 Dec 2020 09:01:59 +0000
Subject: [PATCH] New json converter implemented.

---
 .../Plugins/PluginManager.cs                  |  2 ++
 .../Json/Converters/JsonGuidDashConverter.cs  | 26 +++++++++++++++++++
 MediaBrowser.Common/Plugins/PluginManifest.cs |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 MediaBrowser.Common/Json/Converters/JsonGuidDashConverter.cs

diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 2497cddd9..b46c19995 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -9,6 +9,7 @@ using System.Text.Json;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Json;
+using MediaBrowser.Common.Json.Converters;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Plugins;
@@ -50,6 +51,7 @@ namespace Emby.Server.Implementations.Plugins
             _pluginsPath = pluginsPath;
             _appVersion = appVersion ?? throw new ArgumentNullException(nameof(appVersion));
             _jsonOptions = JsonDefaults.GetOptions();
+            _jsonOptions.Converters.Add(new JsonGuidDashConverter());
             _jsonOptions.WriteIndented = true;
             _config = config;
             _appHost = appHost;
diff --git a/MediaBrowser.Common/Json/Converters/JsonGuidDashConverter.cs b/MediaBrowser.Common/Json/Converters/JsonGuidDashConverter.cs
new file mode 100644
index 000000000..75bab5875
--- /dev/null
+++ b/MediaBrowser.Common/Json/Converters/JsonGuidDashConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MediaBrowser.Common.Json.Converters
+{
+    /// <summary>
+    /// Converts a GUID object or value to/from JSON.
+    /// </summary>
+    public class JsonGuidDashConverter : JsonConverter<Guid>
+    {
+        /// <inheritdoc />
+        public override Guid Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var guidStr = reader.GetString();
+            return guidStr == null ? Guid.Empty : new Guid(guidStr);
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, Guid value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToString());
+        }
+    }
+}
diff --git a/MediaBrowser.Common/Plugins/PluginManifest.cs b/MediaBrowser.Common/Plugins/PluginManifest.cs
index f93821429..956a91f85 100644
--- a/MediaBrowser.Common/Plugins/PluginManifest.cs
+++ b/MediaBrowser.Common/Plugins/PluginManifest.cs
@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using System.Text.Json.Serialization;
+using MediaBrowser.Common.Json.Converters;
 using MediaBrowser.Model.Plugins;
 
 namespace MediaBrowser.Common.Plugins
@@ -32,6 +33,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets or sets the Global Unique Identifier for the plugin.
         /// </summary>
         [JsonPropertyName("guid")]
+        [JsonConverter(typeof(JsonGuidDashConverter))]
         public Guid Id { get; set; }
 
         /// <summary>