diff --git a/BasicNodes/BasicNodes.csproj b/BasicNodes/BasicNodes.csproj index 4f8cfd87..efa4df7e 100644 Binary files a/BasicNodes/BasicNodes.csproj and b/BasicNodes/BasicNodes.csproj differ diff --git a/BasicNodes/Tests/FunctionTests.cs b/BasicNodes/Tests/FunctionTests.cs index b400f551..1194985e 100644 --- a/BasicNodes/Tests/FunctionTests.cs +++ b/BasicNodes/Tests/FunctionTests.cs @@ -214,7 +214,7 @@ return 0; Function pm = new Function(); var logger = new TestLogger(); var args = new FileFlows.Plugin.NodeParameters(@"D:\videos\unprocessed\The IT Crowd - 2x04 - The Dinner Party - No English.mkv", logger, false, string.Empty); - args.GetToolPath = (string name) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string name) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\videos\temp"; pm.Code = @" let output = Flow.TempPath + '/' + Flow.NewGuid() + '.mkv'; diff --git a/ChecksumNodes/ChecksumNodes.csproj b/ChecksumNodes/ChecksumNodes.csproj index 0b2ef8b3..0d5899f0 100644 Binary files a/ChecksumNodes/ChecksumNodes.csproj and b/ChecksumNodes/ChecksumNodes.csproj differ diff --git a/CollectionNodes/CollectionNodes.csproj b/CollectionNodes/CollectionNodes.csproj index 9e0366aa..ba3954bf 100644 Binary files a/CollectionNodes/CollectionNodes.csproj and b/CollectionNodes/CollectionNodes.csproj differ diff --git a/EmailNodes/EmailNodes.csproj b/EmailNodes/EmailNodes.csproj index 59b2dd2c..1e04dbf0 100644 Binary files a/EmailNodes/EmailNodes.csproj and b/EmailNodes/EmailNodes.csproj differ diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll index e247fe9b..d55a26a2 100644 Binary files a/FileFlows.Plugin.dll and b/FileFlows.Plugin.dll differ diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb index 62a1faf4..f2644891 100644 Binary files a/FileFlows.Plugin.pdb and b/FileFlows.Plugin.pdb differ diff --git a/MetaNodes/MetaNodes.csproj b/MetaNodes/MetaNodes.csproj index f7a35217..a8afee56 100644 Binary files a/MetaNodes/MetaNodes.csproj and b/MetaNodes/MetaNodes.csproj differ diff --git a/MusicNodes/MusicNodes.csproj b/MusicNodes/MusicNodes.csproj index 37b4a5dc..d7b599f7 100644 Binary files a/MusicNodes/MusicNodes.csproj and b/MusicNodes/MusicNodes.csproj differ diff --git a/MusicNodes/Tests/ConvertTests.cs b/MusicNodes/Tests/ConvertTests.cs index 6ccb2540..f302855b 100644 --- a/MusicNodes/Tests/ConvertTests.cs +++ b/MusicNodes/Tests/ConvertTests.cs @@ -22,7 +22,7 @@ namespace FileFlows.MusicNodes.Tests ConvertToAAC node = new (); var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\music\temp"; new MusicFile().Execute(args); // need to read the music info and set it int output = node.Execute(args); @@ -38,7 +38,7 @@ namespace FileFlows.MusicNodes.Tests ConvertToMP3 node = new(); var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\music\temp"; new MusicFile().Execute(args); // need to read the music info and set it int output = node.Execute(args); @@ -53,7 +53,7 @@ namespace FileFlows.MusicNodes.Tests ConvertToWAV node = new(); var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\music\temp"; new MusicFile().Execute(args); // need to read the music info and set it int output = node.Execute(args); @@ -69,7 +69,7 @@ namespace FileFlows.MusicNodes.Tests ConvertToOGG node = new(); var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\music\temp"; new MusicFile().Execute(args); // need to read the music info and set it int output = node.Execute(args); @@ -86,7 +86,7 @@ namespace FileFlows.MusicNodes.Tests ConvertToMP3 node = new(); var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\music\temp"; new MusicFile().Execute(args); // need to read the music info and set it int output = node.Execute(args); diff --git a/VideoNodes/Tests/DetectBlackBarsTests.cs b/VideoNodes/Tests/DetectBlackBarsTests.cs index e8377be7..2b8e2148 100644 --- a/VideoNodes/Tests/DetectBlackBarsTests.cs +++ b/VideoNodes/Tests/DetectBlackBarsTests.cs @@ -23,7 +23,7 @@ namespace VideoNodes.Tests DetectBlackBars node = new(); //node.OutputFile = file + ".sup"; var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\videos\temp"; new VideoFile().Execute(args); diff --git a/VideoNodes/Tests/VideoInfoHelperTests.cs b/VideoNodes/Tests/VideoInfoHelperTests.cs index b6a5117c..b235d548 100644 --- a/VideoNodes/Tests/VideoInfoHelperTests.cs +++ b/VideoNodes/Tests/VideoInfoHelperTests.cs @@ -35,7 +35,7 @@ namespace VideoNodes.Tests "subrip", "srt" }; var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\videos\temp"; new VideoFile().Execute(args); @@ -56,7 +56,7 @@ namespace VideoNodes.Tests //vi.Read(@"D:\videos\unprocessed\Bourne.mkv"); var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\videos\temp"; int result = new DetectBlackBars().Execute(args); @@ -308,7 +308,7 @@ namespace VideoNodes.Tests const string ffmpeg = @"C:\utils\ffmpeg\ffmpeg.exe"; var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\videos\temp"; @@ -330,7 +330,7 @@ namespace VideoNodes.Tests var logger = new TestLogger(); var args = new FileFlows.Plugin.NodeParameters(file, logger, false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\videos\temp"; @@ -356,7 +356,7 @@ namespace VideoNodes.Tests SubtitleExtractor node = new (); //node.OutputFile = file + ".sup"; var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty); - args.GetToolPath = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; + args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe"; args.TempPath = @"D:\videos\temp"; new VideoFile().Execute(args); diff --git a/VideoNodes/VideoNodes.csproj b/VideoNodes/VideoNodes.csproj index 948ec3ab..17a0f922 100644 Binary files a/VideoNodes/VideoNodes.csproj and b/VideoNodes/VideoNodes.csproj differ diff --git a/build/utils/PluginInfoGenerator/FileFlows.Plugin.dll b/build/utils/PluginInfoGenerator/FileFlows.Plugin.dll index 8f7c2f00..78bd0963 100644 Binary files a/build/utils/PluginInfoGenerator/FileFlows.Plugin.dll and b/build/utils/PluginInfoGenerator/FileFlows.Plugin.dll differ diff --git a/build/utils/PluginInfoGenerator/FileFlows.Plugin.pdb b/build/utils/PluginInfoGenerator/FileFlows.Plugin.pdb index dcb5fda4..0188bfc5 100644 Binary files a/build/utils/PluginInfoGenerator/FileFlows.Plugin.pdb and b/build/utils/PluginInfoGenerator/FileFlows.Plugin.pdb differ diff --git a/build/utils/PluginInfoGenerator/FileFlows.ServerShared.dll b/build/utils/PluginInfoGenerator/FileFlows.ServerShared.dll index 2db82fc0..7974375b 100644 Binary files a/build/utils/PluginInfoGenerator/FileFlows.ServerShared.dll and b/build/utils/PluginInfoGenerator/FileFlows.ServerShared.dll differ diff --git a/build/utils/PluginInfoGenerator/FileFlows.ServerShared.pdb b/build/utils/PluginInfoGenerator/FileFlows.ServerShared.pdb index 0ff4d1fc..b6746efb 100644 Binary files a/build/utils/PluginInfoGenerator/FileFlows.ServerShared.pdb and b/build/utils/PluginInfoGenerator/FileFlows.ServerShared.pdb differ diff --git a/build/utils/PluginInfoGenerator/FileFlows.Shared.dll b/build/utils/PluginInfoGenerator/FileFlows.Shared.dll index d0e4c412..2e3cb89b 100644 Binary files a/build/utils/PluginInfoGenerator/FileFlows.Shared.dll and b/build/utils/PluginInfoGenerator/FileFlows.Shared.dll differ diff --git a/build/utils/PluginInfoGenerator/FileFlows.Shared.pdb b/build/utils/PluginInfoGenerator/FileFlows.Shared.pdb index 7aa40dda..01849c2f 100644 Binary files a/build/utils/PluginInfoGenerator/FileFlows.Shared.pdb and b/build/utils/PluginInfoGenerator/FileFlows.Shared.pdb differ diff --git a/build/utils/PluginInfoGenerator/PluginInfoGenerator.dll b/build/utils/PluginInfoGenerator/PluginInfoGenerator.dll index e2fc1c8c..8f08cd04 100644 Binary files a/build/utils/PluginInfoGenerator/PluginInfoGenerator.dll and b/build/utils/PluginInfoGenerator/PluginInfoGenerator.dll differ diff --git a/build/utils/PluginInfoGenerator/PluginInfoGenerator.pdb b/build/utils/PluginInfoGenerator/PluginInfoGenerator.pdb index 13354652..f0b74ccc 100644 Binary files a/build/utils/PluginInfoGenerator/PluginInfoGenerator.pdb and b/build/utils/PluginInfoGenerator/PluginInfoGenerator.pdb differ diff --git a/ref/FileFlows.Plugin.dll b/ref/FileFlows.Plugin.dll index 7396c3c8..2d2f712b 100644 Binary files a/ref/FileFlows.Plugin.dll and b/ref/FileFlows.Plugin.dll differ