aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid <daullmer@gmail.com>2020-12-23 13:12:06 +0100
committerDavid <daullmer@gmail.com>2020-12-23 13:14:40 +0100
commitbc0976ceac32b5f7e0ef234ec01a0b17477b9086 (patch)
treecb1531c1706101fda23f6f77192715831c42d2fb
parente09d3ba9efa7505a14d57d344707fe7ce71119b2 (diff)
Remove custom Json serializer from Dlna
-rw-r--r--Emby.Dlna/DlnaManager.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index fedd20b68..df69dd516 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -7,12 +7,14 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
+using System.Text.Json;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Emby.Dlna.Profiles;
using Emby.Dlna.Server;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Json;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Dlna;
using MediaBrowser.Controller.Drawing;
@@ -32,7 +34,6 @@ namespace Emby.Dlna
private readonly IXmlSerializer _xmlSerializer;
private readonly IFileSystem _fileSystem;
private readonly ILogger<DlnaManager> _logger;
- private readonly IJsonSerializer _jsonSerializer;
private readonly IServerApplicationHost _appHost;
private static readonly Assembly _assembly = typeof(DlnaManager).Assembly;
@@ -43,14 +44,12 @@ namespace Emby.Dlna
IFileSystem fileSystem,
IApplicationPaths appPaths,
ILoggerFactory loggerFactory,
- IJsonSerializer jsonSerializer,
IServerApplicationHost appHost)
{
_xmlSerializer = xmlSerializer;
_fileSystem = fileSystem;
_appPaths = appPaths;
_logger = loggerFactory.CreateLogger<DlnaManager>();
- _jsonSerializer = jsonSerializer;
_appHost = appHost;
}
@@ -495,9 +494,9 @@ namespace Emby.Dlna
return profile;
}
- var json = _jsonSerializer.SerializeToString(profile);
+ var json = JsonSerializer.Serialize(profile, JsonDefaults.GetOptions());
- return _jsonSerializer.DeserializeFromString<DeviceProfile>(json);
+ return JsonSerializer.Deserialize<DeviceProfile>(json, options: JsonDefaults.GetOptions());
}
public string GetServerDescriptionXml(IHeaderDictionary headers, string serverUuId, string serverAddress)