From 2a574914eaca486f6216db400d9fdf88ad88636e Mon Sep 17 00:00:00 2001
From: David <daullmer@gmail.com>
Date: Wed, 23 Dec 2020 19:24:58 +0100
Subject: Use streams instead of strings

---
 Emby.Server.Implementations/ApplicationHost.cs                |  5 +++--
 Emby.Server.Implementations/Channels/ChannelManager.cs        |  4 ++--
 Emby.Server.Implementations/Library/LiveStreamHelper.cs       |  4 ++--
 Emby.Server.Implementations/Library/MediaSourceManager.cs     |  4 ++--
 Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs |  4 ++--
 .../ScheduledTasks/ScheduledTaskWorker.cs                     | 11 ++---------
 6 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index fcc156e9c5..99cd3b6cc1 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1038,6 +1038,7 @@ namespace Emby.Server.Implementations
             }
 
             var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
+            var jsonOptions = JsonDefaults.GetOptions();
 
             foreach (var dir in directories)
             {
@@ -1046,8 +1047,8 @@ namespace Emby.Server.Implementations
                     var metafile = Path.Combine(dir, "meta.json");
                     if (File.Exists(metafile))
                     {
-                        var jsonString = File.ReadAllText(metafile);
-                        var manifest = JsonSerializer.Deserialize<PluginManifest>(jsonString, JsonDefaults.GetOptions());
+                        using FileStream jsonStream = File.OpenRead(metafile);
+                        var manifest = JsonSerializer.DeserializeAsync<PluginManifest>(jsonStream, jsonOptions).GetAwaiter().GetResult();
 
                         if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
                         {
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index 4e4fbf82c6..b462d7bdcd 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -340,8 +340,8 @@ namespace Emby.Server.Implementations.Channels
 
             try
             {
-                var jsonString = File.ReadAllText(path);
-                return JsonSerializer.Deserialize<List<MediaSourceInfo>>(jsonString, JsonDefaults.GetOptions()) ?? new List<MediaSourceInfo>();
+                using FileStream jsonStream = File.OpenRead(path);
+                return JsonSerializer.DeserializeAsync<List<MediaSourceInfo>>(jsonStream, JsonDefaults.GetOptions()).GetAwaiter().GetResult();
             }
             catch
             {
diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index ad7988fb15..3ceba0fe94 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -46,8 +46,8 @@ namespace Emby.Server.Implementations.Library
             {
                 try
                 {
-                    var jsonString = await File.ReadAllTextAsync(cacheFilePath, cancellationToken).ConfigureAwait(false);
-                    JsonSerializer.Deserialize<MediaInfo>(jsonString, JsonDefaults.GetOptions());
+                    await using FileStream jsonStream = File.OpenRead(cacheFilePath);
+                    await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, JsonDefaults.GetOptions(), cancellationToken).ConfigureAwait(false);
 
                     // _logger.LogDebug("Found cached media info");
                 }
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 264390dd33..b3900e4aa1 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -641,8 +641,8 @@ namespace Emby.Server.Implementations.Library
             {
                 try
                 {
-                    var json = await File.ReadAllTextAsync(cacheFilePath, cancellationToken).ConfigureAwait(false);
-                    mediaInfo = JsonSerializer.Deserialize<MediaInfo>(json, JsonDefaults.GetOptions());
+                    await using FileStream jsonStream = File.OpenRead(cacheFilePath);
+                    mediaInfo = await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, JsonDefaults.GetOptions(), cancellationToken).ConfigureAwait(false);
 
                     // _logger.LogDebug("Found cached media info");
                 }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index 5256a0ee72..1b9abaa78e 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -44,8 +44,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 try
                 {
-                    var json = File.ReadAllText(_dataPath);
-                    _items = JsonSerializer.Deserialize<T[]>(json, JsonDefaults.GetOptions());
+                    using FileStream jsonStream = File.OpenRead(_dataPath);
+                    _items = JsonSerializer.DeserializeAsync<T[]>(jsonStream, JsonDefaults.GetOptions()).GetAwaiter().GetResult();
                     return;
                 }
                 catch (Exception ex)
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index eee7aeea30..a9f4599864 100644
--- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -139,15 +139,8 @@ namespace Emby.Server.Implementations.ScheduledTasks
                         {
                             try
                             {
-                                var jsonString = File.ReadAllText(path);
-                                if (!string.IsNullOrWhiteSpace(jsonString))
-                                {
-                                    _lastExecutionResult = JsonSerializer.Deserialize<TaskResult>(jsonString, JsonDefaults.GetOptions());
-                                }
-                                else
-                                {
-                                    _logger.LogDebug("Scheduled Task history file {path} is empty. Skipping deserialization.", path);
-                                }
+                                using FileStream jsonStream = File.OpenRead(path);
+                                _lastExecutionResult = JsonSerializer.DeserializeAsync<TaskResult>(jsonStream, JsonDefaults.GetOptions()).GetAwaiter().GetResult();
                             }
                             catch (Exception ex)
                             {
-- 
cgit v1.2.3