Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-05 14:44:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pass CancellationToken to ExtractAllAttachments

Browse Source
This commit is contained in:
Nils Fürniß 2022-03-12 10:19:57 +01:00
parent 6904edf68c
commit 90463d5e4f
No known key found for this signature in database
GPG Key ID: 79CB1318699409FF
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Api/Helpers/TranscodingJobHelper.cs
View File

@ -530,7 +530,7 @@ namespace Jellyfin.Api.Helpers
if (state.SubtitleStream != null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode) if (state.SubtitleStream != null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
{ {
var attachmentPath = Path.Combine(_appPaths.CachePath, "attachments", state.MediaSource.Id); var attachmentPath = Path.Combine(_appPaths.CachePath, "attachments", state.MediaSource.Id);
await _attachmentExtractor.ExtractAllAttachments(state.MediaPath, state.MediaSource, attachmentPath, CancellationToken.None).ConfigureAwait(false); await _attachmentExtractor.ExtractAllAttachments(state.MediaPath, state.MediaSource, attachmentPath, cancellationTokenSource.Token).ConfigureAwait(false);
if (state.SubtitleStream.IsExternal) if (state.SubtitleStream.IsExternal)
{ {
@ -538,7 +538,7 @@ namespace Jellyfin.Api.Helpers
string subtitlePathArgument = string.Format(CultureInfo.InvariantCulture, "file:\"{0}\"", subtitlePath.Replace("\"", "\\\"", StringComparison.Ordinal)); string subtitlePathArgument = string.Format(CultureInfo.InvariantCulture, "file:\"{0}\"", subtitlePath.Replace("\"", "\\\"", StringComparison.Ordinal));
string subtitleId = subtitlePath.GetMD5().ToString("N", CultureInfo.InvariantCulture); string subtitleId = subtitlePath.GetMD5().ToString("N", CultureInfo.InvariantCulture);
await _attachmentExtractor.ExtractAllAttachmentsExternal(subtitlePathArgument, subtitleId, attachmentPath, CancellationToken.None).ConfigureAwait(false); await _attachmentExtractor.ExtractAllAttachmentsExternal(subtitlePathArgument, subtitleId, attachmentPath, cancellationTokenSource.Token).ConfigureAwait(false);
} }
} }

2
MediaBrowser.Controller/MediaEncoding/IAttachmentExtractor.cs
View File

@ -18,11 +18,13 @@ namespace MediaBrowser.Controller.MediaEncoding
string mediaSourceId, string mediaSourceId,
int attachmentStreamIndex, int attachmentStreamIndex,
CancellationToken cancellationToken); CancellationToken cancellationToken);
Task ExtractAllAttachments( Task ExtractAllAttachments(
string inputFile, string inputFile,
MediaSourceInfo mediaSource, MediaSourceInfo mediaSource,
string outputPath, string outputPath,
CancellationToken cancellationToken); CancellationToken cancellationToken);
Task ExtractAllAttachmentsExternal( Task ExtractAllAttachmentsExternal(
string inputArgument, string inputArgument,
string id, string id,