From 08592fb3fec648aff1b5cf64d03d3339b200cac9 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Wed, 17 Jan 2024 19:36:14 +0000
Subject: [PATCH 1/4] Add ex to catch if cached mediainfo doesnt exist

---
 .../Library/LiveStreamHelper.cs               | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index 59d705acef..d41845cdf0 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -48,20 +48,25 @@ namespace Emby.Server.Implementations.Library
 
             if (!string.IsNullOrEmpty(cacheKey))
             {
-                FileStream jsonStream = AsyncFile.OpenRead(cacheFilePath);
                 try
                 {
-                    mediaInfo = await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+                    FileStream jsonStream = AsyncFile.OpenRead(cacheFilePath);
 
-                    // _logger.LogDebug("Found cached media info");
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error deserializing mediainfo cache");
+                    try
+                    {
+                        mediaInfo = await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+                        // _logger.LogDebug("Found cached media info");
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Error deserializing mediainfo cache");
+                    }
+
+                    await jsonStream.DisposeAsync().ConfigureAwait(false);
                 }
-                finally
+                catch
                 {
-                    await jsonStream.DisposeAsync().ConfigureAwait(false);
+                    _logger.LogError("Could not open cached media info");
                 }
             }
 

From 538f141b4cd7c3537f4a60060d54c51f7e19afcf Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 19 Jan 2024 17:25:57 +0000
Subject: [PATCH 2/4] Update error handling

---
 Emby.Server.Implementations/Library/LiveStreamHelper.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index d41845cdf0..5f54c73190 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -64,9 +64,13 @@ namespace Emby.Server.Implementations.Library
 
                     await jsonStream.DisposeAsync().ConfigureAwait(false);
                 }
-                catch
+                catch (IOException)
                 {
-                    _logger.LogError("Could not open cached media info");
+                    _logger.LogDebug("Could not open cached media info");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error opening cached media info");
                 }
             }
 

From 1d235205ae0a53fd7e584b6561dd0f0c6437f691 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Mon, 22 Jan 2024 17:43:35 +0000
Subject: [PATCH 3/4] Log IOException

---
 Emby.Server.Implementations/Library/LiveStreamHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index 5f54c73190..d6530df2dd 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -64,9 +64,9 @@ namespace Emby.Server.Implementations.Library
 
                     await jsonStream.DisposeAsync().ConfigureAwait(false);
                 }
-                catch (IOException)
+                catch (IOException ex)
                 {
-                    _logger.LogDebug("Could not open cached media info");
+                    _logger.LogDebug(ex, "Could not open cached media info");
                 }
                 catch (Exception ex)
                 {

From 7d6a03bad6b8baacb83625be32e708090722fe10 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Thu, 1 Feb 2024 07:14:25 +0000
Subject: [PATCH 4/4] Change nested try catch to using statement

---
 Emby.Server.Implementations/Library/LiveStreamHelper.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index d6530df2dd..d4aeae41a5 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -52,17 +52,11 @@ namespace Emby.Server.Implementations.Library
                 {
                     FileStream jsonStream = AsyncFile.OpenRead(cacheFilePath);
 
-                    try
+                    await using (jsonStream.ConfigureAwait(false))
                     {
                         mediaInfo = await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
                         // _logger.LogDebug("Found cached media info");
                     }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error deserializing mediainfo cache");
-                    }
-
-                    await jsonStream.DisposeAsync().ConfigureAwait(false);
                 }
                 catch (IOException ex)
                 {