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

Merge pull request #5005 from jellyfin/bytes

Browse Source 
JsonSerializer deserialize from bytes where possible
This commit is contained in:
dkanada
2021-02-05 11:47:06 +09:00
committed by GitHub
parent 2e9661c415 1fdd2d6e05
commit 54a3ab15a3
5 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
View File

@@ -143,21 +143,21 @@ namespace Emby.Server.Implementations.ScheduledTasks
{
if (File.Exists(path))
{
try
var bytes = File.ReadAllBytes(path);
if (bytes.Length > 0)
{
var jsonString = File.ReadAllText(path, Encoding.UTF8);
if (!string.IsNullOrWhiteSpace(jsonString))
try
{
_lastExecutionResult = JsonSerializer.Deserialize<TaskResult>(jsonString, _jsonOptions);
_lastExecutionResult = JsonSerializer.Deserialize<TaskResult>(bytes, _jsonOptions);
}
else
catch (JsonException ex)
{
_logger.LogDebug("Scheduled Task history file {Path} is empty. Skipping deserialization.", path);
_logger.LogError(ex, "Error deserializing {File}", path);
}
}
catch (Exception ex)
else
{
_logger.LogError(ex, "Error deserializing {File}", path);
_logger.LogDebug("Scheduled Task history file {Path} is empty. Skipping deserialization.", path);
}
}
@@ -541,8 +541,8 @@ namespace Emby.Server.Implementations.ScheduledTasks
TaskTriggerInfo[] list = null;
if (File.Exists(path))
{
var jsonString = File.ReadAllText(path, Encoding.UTF8);
list = JsonSerializer.Deserialize<TaskTriggerInfo[]>(jsonString, _jsonOptions);
var bytes = File.ReadAllBytes(path);
list = JsonSerializer.Deserialize<TaskTriggerInfo[]>(bytes, _jsonOptions);
}
// Return defaults if file doesn't exist.