Merge pull request #10448 from vincent/bugfix/10175-forward-user-agent-ffprobe

Forward user_agent config to ffprobe
This commit is contained in:
Bond-009 2023-10-31 15:27:51 +01:00 committed by GitHub
commit 4962640b3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 10 deletions

View File

@ -418,9 +418,24 @@ namespace MediaBrowser.MediaEncoding.Encoder
public Task<MediaInfo> GetMediaInfo(MediaInfoRequest request, CancellationToken cancellationToken) public Task<MediaInfo> GetMediaInfo(MediaInfoRequest request, CancellationToken cancellationToken)
{ {
var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters; var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters;
var analyzeDuration = string.Empty; var extraArgs = GetExtraArguments(request);
return GetMediaInfoInternal(
GetInputArgument(request.MediaSource.Path, request.MediaSource),
request.MediaSource.Path,
request.MediaSource.Protocol,
extractChapters,
extraArgs,
request.MediaType == DlnaProfileType.Audio,
request.MediaSource.VideoType,
cancellationToken);
}
internal string GetExtraArguments(MediaInfoRequest request)
{
var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty; var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty;
var ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty; var ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty;
var analyzeDuration = string.Empty;
var extraArgs = string.Empty; var extraArgs = string.Empty;
if (request.MediaSource.AnalyzeDurationMs > 0) if (request.MediaSource.AnalyzeDurationMs > 0)
@ -442,15 +457,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
extraArgs += " -probesize " + ffmpegProbeSize; extraArgs += " -probesize " + ffmpegProbeSize;
} }
return GetMediaInfoInternal( if (request.MediaSource.RequiredHttpHeaders.TryGetValue("user_agent", out var userAgent))
GetInputArgument(request.MediaSource.Path, request.MediaSource), {
request.MediaSource.Path, extraArgs += " -user_agent " + userAgent;
request.MediaSource.Protocol, }
extractChapters,
extraArgs, return extraArgs;
request.MediaType == DlnaProfileType.Audio,
request.MediaSource.VideoType,
cancellationToken);
} }
/// <inheritdoc /> /// <inheritdoc />

View File

@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.MediaEncoding.Encoder;
using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Moq;
using Xunit;
namespace Jellyfin.MediaEncoding.Tests.Probing
{
public class ProbeExternalSourcesTests
{
[Fact]
public void GetExtraArguments_Forwards_UserAgent()
{
var encoder = new MediaEncoder(
Mock.Of<ILogger<MediaEncoder>>(),
Mock.Of<IServerConfigurationManager>(),
Mock.Of<IFileSystem>(),
Mock.Of<IBlurayExaminer>(),
Mock.Of<ILocalizationManager>(),
new ConfigurationBuilder().Build(),
Mock.Of<IServerConfigurationManager>());
var userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)";
var req = new MediaBrowser.Controller.MediaEncoding.MediaInfoRequest()
{
MediaSource = new MediaBrowser.Model.Dto.MediaSourceInfo
{
Path = "/path/to/stream",
Protocol = MediaProtocol.Http,
RequiredHttpHeaders = new Dictionary<string, string>()
{
{ "user_agent", userAgent },
}
},
ExtractChapters = false,
MediaType = MediaBrowser.Model.Dlna.DlnaProfileType.Video,
};
var extraArg = encoder.GetExtraArguments(req);
Assert.Contains(userAgent, extraArg, StringComparison.InvariantCulture);
}
}
}