alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 10:43:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Use Process.WaitForExitAsync added in .NET 5

Browse Source
This commit is contained in:
Bond_009
2023-10-10 00:18:50 +02:00
parent d5695efad9
commit 4757ce105b
4 changed files with 46 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
View File

@@ -174,22 +174,16 @@ namespace MediaBrowser.MediaEncoding.Attachments
process.Start();
var ranToCompletion = await ProcessExtensions.WaitForExitAsync(process, cancellationToken).ConfigureAwait(false);
if (!ranToCompletion)
try
{
try
{
_logger.LogWarning("Killing ffmpeg attachment extraction process");
process.Kill();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error killing attachment extraction process");
}
await process.WaitForExitAsync(cancellationToken).ConfigureAwait(false);
exitCode = process.ExitCode;
}
catch (OperationCanceledException)
{
process.Kill(true);
exitCode = -1;
}
exitCode = ranToCompletion ? process.ExitCode : -1;
}
var failed = false;
@@ -322,22 +316,16 @@ namespace MediaBrowser.MediaEncoding.Attachments
process.Start();
var ranToCompletion = await ProcessExtensions.WaitForExitAsync(process, cancellationToken).ConfigureAwait(false);
if (!ranToCompletion)
try
{
try
{
_logger.LogWarning("Killing ffmpeg attachment extraction process");
process.Kill();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error killing attachment extraction process");
}
await process.WaitForExitAsync(cancellationToken).ConfigureAwait(false);
exitCode = process.ExitCode;
}
catch (OperationCanceledException)
{
process.Kill(true);
exitCode = -1;
}
exitCode = ranToCompletion ? process.ExitCode : -1;
}
var failed = false;