Merge pull request #10881 from TelepathicWalrus/fix-livetv-delay

Fix long live tv load times, Fixes #10761
jellyfin · Feb 1, 2024 · a2fdec4 · a2fdec4
2 parents f4d5538 + 7d6a03b
commit a2fdec4
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -48,20 +48,23 @@ public async Task AddMediaInfoWithProbe(MediaSourceInfo mediaSource, bool isAudi
 
             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");
+                    await using (jsonStream.ConfigureAwait(false))
+                    {
+                        mediaInfo = await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+                        // _logger.LogDebug("Found cached media info");
+                    }
                 }
-                catch (Exception ex)
+                catch (IOException ex)
                 {
-                    _logger.LogError(ex, "Error deserializing mediainfo cache");
+                    _logger.LogDebug(ex, "Could not open cached media info");
                 }
-                finally
+                catch (Exception ex)
                 {
-                    await jsonStream.DisposeAsync().ConfigureAwait(false);
+                    _logger.LogError(ex, "Error opening cached media info");
                 }
             }