starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 22:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use System.Text.Json api

Browse Source
This commit is contained in:
Bond_009
2019-09-25 17:43:20 +02:00
parent ac9dfa8e93
commit e553eba31e
7 changed files with 95 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@@ -5,8 +5,11 @@ using System.IO;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading;
using Emby.Server.Implementations.Playlists;
using MediaBrowser.Common.Json;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
@@ -38,14 +41,6 @@ namespace Emby.Server.Implementations.Data
{
private const string ChaptersTableName = "Chapters2";
private readonly TypeMapper _typeMapper;
/// <summary>
/// Gets the json serializer.
/// </summary>
/// <value>The json serializer.</value>
private readonly IJsonSerializer _jsonSerializer;
/// <summary>
/// The _app paths
/// </summary>
@@ -53,33 +48,31 @@ namespace Emby.Server.Implementations.Data
private readonly IServerApplicationHost _appHost;
private readonly ILocalizationManager _localization;
private readonly TypeMapper _typeMapper;
private readonly JsonSerializerOptions _jsonOptions;
/// <summary>
/// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
/// </summary>
public SqliteItemRepository(
IServerConfigurationManager config,
IServerApplicationHost appHost,
IJsonSerializer jsonSerializer,
ILoggerFactory loggerFactory,
ILogger<SqliteItemRepository> logger,
ILocalizationManager localization)
: base(loggerFactory.CreateLogger(nameof(SqliteItemRepository)))
: base(logger)
{
if (config == null)
{
throw new ArgumentNullException(nameof(config));
}
if (jsonSerializer == null)
{
throw new ArgumentNullException(nameof(jsonSerializer));
}
_appHost = appHost;
_config = config;
_jsonSerializer = jsonSerializer;
_typeMapper = new TypeMapper();
_appHost = appHost;
_localization = localization;
_typeMapper = new TypeMapper();
_jsonOptions = JsonDefaults.GetOptions();
DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
}
@@ -671,7 +664,7 @@ namespace Emby.Server.Implementations.Data
if (TypeRequiresDeserialization(item.GetType()))
{
saveItemStatement.TryBind("@data", _jsonSerializer.SerializeToBytes(item));
saveItemStatement.TryBind("@data", JsonSerializer.SerializeToUtf8Bytes(item, _jsonOptions));
}
else
{
@@ -1302,11 +1295,11 @@ namespace Emby.Server.Implementations.Data
{
try
{
item = _jsonSerializer.DeserializeFromString(reader.GetString(1), type) as BaseItem;
item = JsonSerializer.Deserialize(reader[1].ToBlob(), type, _jsonOptions) as BaseItem;
}
catch (SerializationException ex)
catch (JsonException ex)
{
Logger.LogError(ex, "Error deserializing item");
Logger.LogError(ex, "Error deserializing item with JSON: {Data}", reader.GetString(1));
}
}