Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-11 09:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7437 from Nalsai/mks-attachments

Browse Source
This commit is contained in:
Joshua M. Boniface 2022-03-23 20:19:32 -04:00 committed by GitHub
commit 97d3212410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ using Jellyfin.Api.Models.StreamingDtos;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using MediaBrowser.Common; using MediaBrowser.Common;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.MediaEncoding; using MediaBrowser.Controller.MediaEncoding;
@ -529,7 +530,16 @@ 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 && string.Equals(Path.GetExtension(state.SubtitleStream.Path), ".mks", StringComparison.OrdinalIgnoreCase))
{
string subtitlePath = state.SubtitleStream.Path;
string subtitlePathArgument = string.Format(CultureInfo.InvariantCulture, "file:\"{0}\"", subtitlePath.Replace("\"", "\\\"", StringComparison.Ordinal));
string subtitleId = subtitlePath.GetMD5().ToString("N", CultureInfo.InvariantCulture);
await _attachmentExtractor.ExtractAllAttachmentsExternal(subtitlePathArgument, subtitleId, attachmentPath, cancellationTokenSource.Token).ConfigureAwait(false);
}
} }
var process = new Process var process = new Process

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

@ -18,10 +18,17 @@ 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(
string inputArgument,
string id,
string outputPath,
CancellationToken cancellationToken);
} }
} }

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

@ -100,6 +100,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
await ExtractAllAttachmentsInternal( await ExtractAllAttachmentsInternal(
_mediaEncoder.GetInputArgument(inputFile, mediaSource), _mediaEncoder.GetInputArgument(inputFile, mediaSource),
outputPath, outputPath,
false,
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);
} }
} }
@ -109,9 +110,42 @@ namespace MediaBrowser.MediaEncoding.Attachments
} }
} }
public async Task ExtractAllAttachmentsExternal(
string inputArgument,
string id,
string outputPath,
CancellationToken cancellationToken)
{
var semaphore = _semaphoreLocks.GetOrAdd(outputPath, key => new SemaphoreSlim(1, 1));
await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
if (!File.Exists(Path.Join(outputPath, id)))
{
await ExtractAllAttachmentsInternal(
inputArgument,
outputPath,
true,
cancellationToken).ConfigureAwait(false);
if (Directory.Exists(outputPath))
{
File.Create(Path.Join(outputPath, id));
}
}
}
finally
{
semaphore.Release();
}
}
private async Task ExtractAllAttachmentsInternal( private async Task ExtractAllAttachmentsInternal(
string inputPath, string inputPath,
string outputPath, string outputPath,
bool isExternal,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
if (string.IsNullOrEmpty(inputPath)) if (string.IsNullOrEmpty(inputPath))
@ -128,7 +162,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
var processArgs = string.Format( var processArgs = string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
"-dump_attachment:t \"\" -i {0} -t 0 -f null null", "-dump_attachment:t \"\" -y -i {0} -t 0 -f null null",
inputPath); inputPath);
int exitCode; int exitCode;
@ -174,19 +208,24 @@ namespace MediaBrowser.MediaEncoding.Attachments
if (exitCode != 0) if (exitCode != 0)
{ {
failed = true; if (isExternal && exitCode == 1)
_logger.LogWarning("Deleting extracted attachments {Path} due to failure: {ExitCode}", outputPath, exitCode);
try
{ {
if (Directory.Exists(outputPath)) // ffmpeg returns exitCode 1 because there is no video or audio stream
// this can be ignored
}
else
{
failed = true;
_logger.LogWarning("Deleting extracted attachments {Path} due to failure: {ExitCode}", outputPath, exitCode);
try
{ {
Directory.Delete(outputPath); Directory.Delete(outputPath);
} }
} catch (IOException ex)
catch (IOException ex) {
{ _logger.LogError(ex, "Error deleting extracted attachments {Path}", outputPath);
_logger.LogError(ex, "Error deleting extracted attachments {Path}", outputPath); }
} }
} }
else if (!Directory.Exists(outputPath)) else if (!Directory.Exists(outputPath))