Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-11-10 08:34:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into MetaDataArgument

Browse source 
Former-commit-id: 48689cf694
This commit is contained in:
Malte Rosenbjerg 2022-01-07 16:39:37 +01:00 committed by GitHub
commit e4ef092ac6
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
FFMpegCore.Test/FFMpegArgumentProcessorTest.cs
View file

@ -1,6 +1,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting;
using FluentAssertions; using FluentAssertions;
using System.Reflection; using System.Reflection;
using FFMpegCore.Arguments;
namespace FFMpegCore.Test namespace FFMpegCore.Test
{ {
@ -86,5 +87,12 @@ FFMpegArgumentProcessor CreateArgumentProcessor() => FFMpegArguments
var options2 = processor2.GetConfiguredOptions(null); var options2 = processor2.GetConfiguredOptions(null);
options2.WorkingDirectory.Should().Be(globalWorkingDir); options2.WorkingDirectory.Should().Be(globalWorkingDir);
} }
[TestMethod]
public void Concat_Escape()
{
var arg = new DemuxConcatArgument(new[] { @"Heaven's River\05 - Investigation.m4b" });
arg.Values.Should().BeEquivalentTo(new[] { @"file 'Heaven'\''s River\05 - Investigation.m4b'" });
}
} }
} }

11
FFMpegCore/FFMpeg/Arguments/DemuxConcatArgument.cs
View file

@ -16,8 +16,17 @@ public class DemuxConcatArgument : IInputArgument
public readonly IEnumerable<string> Values; public readonly IEnumerable<string> Values;
public DemuxConcatArgument(IEnumerable<string> values) public DemuxConcatArgument(IEnumerable<string> values)
{ {
Values = values.Select(value => $"file '{value}'"); Values = values.Select(value => $"file '{Escape(value)}'");
} }
/// <summary>
/// Thanks slhck
/// https://superuser.com/a/787651/1089628
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
private string Escape(string value) => value.Replace("'", @"'\''");
private readonly string _tempFileName = Path.Combine(GlobalFFOptions.Current.TemporaryFilesFolder, $"concat_{Guid.NewGuid()}.txt"); private readonly string _tempFileName = Path.Combine(GlobalFFOptions.Current.TemporaryFilesFolder, $"concat_{Guid.NewGuid()}.txt");
public void Pre() => File.WriteAllLines(_tempFileName, Values); public void Pre() => File.WriteAllLines(_tempFileName, Values);