Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2025-12-14 18:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add missing reset of GlobalOptions and reorder

Browse source
This commit is contained in:
Malte Rosenbjerg 2025-10-16 13:41:06 +02:00
parent 671829b501
commit 9765b78d48
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
FFMpegCore.Test/FFMpegArgumentProcessorTest.cs
View file

@ -25,12 +25,12 @@ public class FFMpegArgumentProcessorTest
public void Processor_GlobalOptions_GetUsed() public void Processor_GlobalOptions_GetUsed()
{ {
var globalWorkingDir = "Whatever"; var globalWorkingDir = "Whatever";
var processor = CreateArgumentProcessor();
try try
{ {
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir }); GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir });
var processor = CreateArgumentProcessor();
var options = processor.GetConfiguredOptions(null); var options = processor.GetConfiguredOptions(null);
Assert.AreEqual(globalWorkingDir, options.WorkingDirectory); Assert.AreEqual(globalWorkingDir, options.WorkingDirectory);
@ -57,7 +57,6 @@ public class FFMpegArgumentProcessorTest
public void Processor_Options_CanBeOverridden_And_Configured() public void Processor_Options_CanBeOverridden_And_Configured()
{ {
var globalConfig = "Whatever"; var globalConfig = "Whatever";
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalConfig, TemporaryFilesFolder = globalConfig, BinaryFolder = globalConfig });
try try
{ {
@ -67,6 +66,8 @@ public class FFMpegArgumentProcessorTest
processor.Configure(options => options.TemporaryFilesFolder = sessionTempDir); processor.Configure(options => options.TemporaryFilesFolder = sessionTempDir);
var overrideOptions = new FFOptions { WorkingDirectory = "override" }; var overrideOptions = new FFOptions { WorkingDirectory = "override" };
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalConfig, TemporaryFilesFolder = globalConfig, BinaryFolder = globalConfig });
var options = processor.GetConfiguredOptions(overrideOptions); var options = processor.GetConfiguredOptions(overrideOptions);
Assert.AreSame(options, overrideOptions); Assert.AreSame(options, overrideOptions);
@ -83,8 +84,9 @@ public class FFMpegArgumentProcessorTest
public void Options_Global_And_Session_Options_Can_Differ() public void Options_Global_And_Session_Options_Can_Differ()
{ {
var globalWorkingDir = "Whatever"; var globalWorkingDir = "Whatever";
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir });
try
{
var processor1 = CreateArgumentProcessor(); var processor1 = CreateArgumentProcessor();
var sessionWorkingDir = "./CurrentRunWorkingDir"; var sessionWorkingDir = "./CurrentRunWorkingDir";
processor1.Configure(options => options.WorkingDirectory = sessionWorkingDir); processor1.Configure(options => options.WorkingDirectory = sessionWorkingDir);
@ -92,9 +94,15 @@ public class FFMpegArgumentProcessorTest
Assert.AreEqual(sessionWorkingDir, options1.WorkingDirectory); Assert.AreEqual(sessionWorkingDir, options1.WorkingDirectory);
var processor2 = CreateArgumentProcessor(); var processor2 = CreateArgumentProcessor();
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir });
var options2 = processor2.GetConfiguredOptions(null); var options2 = processor2.GetConfiguredOptions(null);
Assert.AreEqual(globalWorkingDir, options2.WorkingDirectory); Assert.AreEqual(globalWorkingDir, options2.WorkingDirectory);
} }
finally
{
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = string.Empty });
}
}
[TestMethod] [TestMethod]
public void Concat_Escape() public void Concat_Escape()