alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-11 10:10:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #1898 from Bond-009/jsonfix

Browse Source 
Fix Json serialization error

(cherry picked from commit 91600b1c81)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
This commit is contained in:
Joshua M. Boniface
2019-10-20 15:16:01 -04:00
committed by Joshua Boniface
parent 86a50367b2
commit 6e59671cf6
44 changed files with 364 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Dto/BaseItemPerson.cs
View File

@@ -1,4 +1,4 @@
using MediaBrowser.Model.Serialization;
using System.Text.Json.Serialization;
namespace MediaBrowser.Model.Dto
{
@@ -41,7 +41,7 @@ namespace MediaBrowser.Model.Dto
/// Gets a value indicating whether this instance has primary image.
/// </summary>
/// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
[IgnoreDataMember]
[JsonIgnore]
public bool HasPrimaryImage => PrimaryImageTag != null;
}
}

6
MediaBrowser.Model/Dto/MediaSourceInfo.cs
View File

@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Session;
namespace MediaBrowser.Model.Dto
@@ -108,7 +108,7 @@ namespace MediaBrowser.Model.Dto
}
}
[IgnoreDataMember]
[JsonIgnore]
public TranscodeReason[] TranscodeReasons { get; set; }
public int? DefaultAudioStreamIndex { get; set; }
@@ -148,7 +148,7 @@ namespace MediaBrowser.Model.Dto
return null;
}
[IgnoreDataMember]
[JsonIgnore]
public MediaStream VideoStream
{
get

1
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@@ -16,6 +16,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
<PackageReference Include="System.Text.Json" Version="4.6.0" />
</ItemGroup>
<ItemGroup>

12
MediaBrowser.Model/Serialization/IgnoreDataMemberAttribute.cs
View File

@@ -1,12 +0,0 @@
using System;
namespace MediaBrowser.Model.Serialization
{
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, Inherited = false, AllowMultiple = false)]
public sealed class IgnoreDataMemberAttribute : Attribute
{
public IgnoreDataMemberAttribute()
{
}
}
}

4
MediaBrowser.Model/Updates/PackageVersionInfo.cs
View File

@@ -1,5 +1,5 @@
using System;
using MediaBrowser.Model.Serialization;
using System.Text.Json.Serialization;
namespace MediaBrowser.Model.Updates
{
@@ -36,7 +36,7 @@ namespace MediaBrowser.Model.Updates
/// Had to make this an interpreted property since Protobuf can't handle Version
/// </summary>
/// <value>The version.</value>
[IgnoreDataMember]
[JsonIgnore]
public Version Version
{
get