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

Backport pull request #11812 from jellyfin/release-10.9.z

Browse Source 
Extract media attachment one by one if the filename appears to be a path

Original-merge: 45e8872cc086fe2b086e209a08839b3ff689ecf3

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
gnattu 2024-06-01 18:41:00 -04:00 committed by Joshua M. Boniface
parent 1a94976752
commit c4b7c91f3a
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,15 +89,28 @@ namespace MediaBrowser.MediaEncoding.Attachments
string outputPath, string outputPath,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
using (await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false)) var shouldExtractOneByOne = mediaSource.MediaAttachments.Any(a => a.FileName.Contains('/', StringComparison.OrdinalIgnoreCase) || a.FileName.Contains('\\', StringComparison.OrdinalIgnoreCase));
if (shouldExtractOneByOne)
{ {
if (!Directory.Exists(outputPath)) var attachmentIndexes = mediaSource.MediaAttachments.Select(a => a.Index);
foreach (var i in attachmentIndexes)
{ {
await ExtractAllAttachmentsInternal( var newName = Path.Join(outputPath, i.ToString(CultureInfo.InvariantCulture));
_mediaEncoder.GetInputArgument(inputFile, mediaSource), await ExtractAttachment(inputFile, mediaSource, i, newName, cancellationToken).ConfigureAwait(false);
outputPath, }
false, }
cancellationToken).ConfigureAwait(false); else
{
using (await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false))
{
if (!Directory.Exists(outputPath))
{
await ExtractAllAttachmentsInternal(
_mediaEncoder.GetInputArgument(inputFile, mediaSource),
outputPath,
false,
cancellationToken).ConfigureAwait(false);
}
} }
} }
} }