mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-12-26 17:36:52 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Backport pull request #12575 from jellyfin/release-10.9.z
Some checks are pending
CodeQL / Analyze (csharp) (push) Waiting to run
Details
OpenAPI / OpenAPI - BASE (push) Waiting to run
Details
OpenAPI / OpenAPI - Difference (push) Blocked by required conditions
Details
OpenAPI / OpenAPI - Publish Unstable Spec (push) Blocked by required conditions
Details
OpenAPI / OpenAPI - Publish Stable Spec (push) Blocked by required conditions
Details
OpenAPI / OpenAPI - HEAD (push) Waiting to run
Details
Tests / run-tests (macos-latest) (push) Waiting to run
Details
Tests / run-tests (ubuntu-latest) (push) Waiting to run
Details
Tests / run-tests (windows-latest) (push) Waiting to run
Details
Project Automation / Project board (push) Waiting to run
Details
Merge Conflict Labeler / Labeling (push) Waiting to run
Details

Browse source 
Fix subtitle and attachment extraction when input path contains quotes

Original-merge: 3c3ebe8344

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dmitrylyzo 2024-09-07 18:09:54 -04:00 committed by Joshua M. Boniface
parent e10b986ea0
commit 84b20afe1f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
View file

@ -284,7 +284,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
if (extractableAttachmentIds.Count > 0)
{
await CacheAllAttachmentsInternal(mediaPath, inputFile, mediaSource, extractableAttachmentIds, cancellationToken).ConfigureAwait(false);
await CacheAllAttachmentsInternal(mediaPath, _mediaEncoder.GetInputArgument(inputFile, mediaSource), mediaSource, extractableAttachmentIds, cancellationToken).ConfigureAwait(false);
}
}
catch (Exception ex)
@ -323,7 +323,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
processArgs += string.Format(
CultureInfo.InvariantCulture,
" -i \"{0}\" -t 0 -f null null",
" -i {0} -t 0 -f null null",
inputFile);
int exitCode;

6
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View file

@ -529,11 +529,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
List<MediaStream> subtitleStreams,
CancellationToken cancellationToken)
{
var inputPath = mediaSource.Path;
var inputPath = _mediaEncoder.GetInputArgument(mediaSource.Path, mediaSource);
var outputPaths = new List<string>();
var args = string.Format(
CultureInfo.InvariantCulture,
"-i \"{0}\" -copyts",
"-i {0} -copyts",
inputPath);
foreach (var subtitleStream in subtitleStreams)
@ -704,7 +704,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
var processArgs = string.Format(
CultureInfo.InvariantCulture,
"-i \"{0}\" -copyts -map 0:{1} -an -vn -c:s {2} \"{3}\"",
"-i {0} -copyts -map 0:{1} -an -vn -c:s {2} \"{3}\"",
inputPath,
subtitleStreamIndex,
outputCodec,