alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-29 11:58:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

bump System.Text.Json

Browse Source
This commit is contained in:
crobibero
2020-08-25 07:33:58 -06:00
parent 25be1a9b20
commit 5f64ab02a0
14 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
View File

@@ -168,7 +168,7 @@ namespace Jellyfin.Server.Extensions
// From JsonDefaults
options.JsonSerializerOptions.ReadCommentHandling = jsonOptions.ReadCommentHandling;
options.JsonSerializerOptions.WriteIndented = jsonOptions.WriteIndented;
options.JsonSerializerOptions.IgnoreNullValues = jsonOptions.IgnoreNullValues;
options.JsonSerializerOptions.DefaultIgnoreCondition = jsonOptions.DefaultIgnoreCondition;
options.JsonSerializerOptions.Converters.Clear();
foreach (var converter in jsonOptions.Converters)

1
Jellyfin.Server/Jellyfin.Server.csproj
View File

@@ -54,6 +54,7 @@
<PackageReference Include="Serilog.Sinks.Graylog" Version="2.1.3" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.3" />
<PackageReference Include="SQLitePCLRaw.provider.sqlite3.netstandard11" Version="1.1.14" />
<PackageReference Include="System.Text.Json" Version="5.0.0-preview.7.20364.11" />
</ItemGroup>
<ItemGroup>

5
Jellyfin.Server/Migrations/Routines/MigrateDisplayPreferencesDb.cs
View File

@@ -81,6 +81,11 @@ namespace Jellyfin.Server.Migrations.Routines
foreach (var result in results)
{
var dto = JsonSerializer.Deserialize<DisplayPreferencesDto>(result[3].ToString(), _jsonOptions);
if (dto is null)
{
continue;
}
var chromecastVersion = dto.CustomPrefs.TryGetValue("chromecastVersion", out var version)
? chromecastDict[version]
: ChromecastVersion.Stable;

7
Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs
View File

@@ -74,7 +74,12 @@ namespace Jellyfin.Server.Migrations.Routines
foreach (var entry in queryResult)
{
UserMockup mockup = JsonSerializer.Deserialize<UserMockup>(entry[2].ToBlob(), JsonDefaults.GetOptions());
UserMockup? mockup = JsonSerializer.Deserialize<UserMockup>(entry[2].ToBlob(), JsonDefaults.GetOptions());
if (mockup is null)
{
continue;
}
var userDataDir = Path.Combine(_paths.UserConfigurationDirectoryPath, mockup.Name);
var config = File.Exists(Path.Combine(userDataDir, "config.xml"))