CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-04 15:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Properly handle cancellation in MediaSegmentManager

Browse source
This commit is contained in:
Shadowghost 2026-05-13 13:47:07 +02:00
parent 5165e4e2d4
commit 38bda65ca9
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
View file

@ -81,6 +81,11 @@ public class MediaSegmentManager : IMediaSegmentManager
foreach (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 : IMediaSegmentManager
await 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);