The Free Software Media System - Server Backend & API
Properly handle cancellation in MediaSegmentManager
Shadowghost38bda65ca9a5
diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.csindex 249df476a0..61c028b685 100644--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs@@ -81,6 +81,11 @@ public class MediaSegmentManager : IMediaSegmentManagerforeach (var provider in providers){+ if (cancellationToken.IsCancellationRequested)+ {+ break;+ }+if (!await provider.Supports(baseItem).ConfigureAwait(false)){_logger.LogDebug("Media Segment provider {ProviderName} does not support item with path {MediaPath}", provider.Name, baseItem.Path);@@ -146,6 +151,15 @@ public class MediaSegmentManager : IMediaSegmentManagerawait CreateSegmentAsync(segment, providerId).ConfigureAwait(false);}}+ catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)+ {+ throw;+ }+ catch (Exception ex) when (cancellationToken.IsCancellationRequested)+ {+ _logger.LogDebug(ex, "Provider {ProviderName} aborted segment extraction for {MediaPath} due to shutdown", provider.Name, baseItem.Path);+ break;+ }catch (Exception ex){_logger.LogError(ex, "Provider {ProviderName} failed to extract segments from {MediaPath}", provider.Name, baseItem.Path);