mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-05-06 15:09:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

FF-1548: Added logging to unpack and handled unpack failure

Browse Source
This commit is contained in:
John Andrews
2024-05-17 08:27:54 +12:00
parent 7ab2644803
commit 4ffb743577
10 changed files with 176 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BasicNodes/Tools/Unpack.cs
+34 -21
View File
@@ -18,65 +18,78 @@ public class Unpack: Node
public override FlowElementType Type => FlowElementType.Process;
/// <inheritdoc />
public override string Icon => "fas fa-file-archive";
/// <summary>
/// Gets the Help URL for this element
/// </summary>
/// <inheritdoc />
public override string HelpUrl => "https://fileflows.com/docs/plugins/basic-nodes/unpack";
private string _DestinationPath = string.Empty;
private string _file = string.Empty;
/// <summary>
/// Gets or sets the destination path
/// </summary>
[Folder(1)]
public string DestinationPath
{
get => _DestinationPath;
set { _DestinationPath = value ?? ""; }
}
public string DestinationPath { get; set; }
/// <summary>
/// Gets or sets the file to unpack
/// </summary>
[TextVariable(2)]
public string File
{
get => _file;
set => _file = value ?? string.Empty;
}
public string File { get; set; }
/// <inheritdoc />
public override int Execute(NodeParameters args)
{
try
{
var filename = args.ReplaceVariables(File ?? string.Empty, stripMissing: true)?.EmptyAsNull() ?? args.WorkingFile;
var localFileResult = args.FileService.GetLocalPath(
args.ReplaceVariables(File ?? string.Empty, stripMissing: true)?.EmptyAsNull() ?? args.WorkingFile);
if (localFileResult.Failed(out string error))
{
args.FailureReason = "Failed to get local file: " + error;
args.Logger?.ELog(args.FailureReason);
return -1;
}
var filename = localFileResult.Value;
var fileInfo = new FileInfo(filename);
if (fileInfo.Exists == false)
{
args.Logger?.ELog("File does not exist: " + filename);
args.FailureReason = "File does not exist: " + filename;
args.Logger?.ELog(args.FailureReason);
return -1;
}
string destDir = args.ReplaceVariables(DestinationPath, stripMissing: true, cleanSpecialCharacters: true);
var destDir = args.ReplaceVariables(DestinationPath, stripMissing: true, cleanSpecialCharacters: true);
destDir = args.MapPath(destDir);
if (Directory.Exists(destDir) == false)
Directory.CreateDirectory(destDir);
{
if (args.FileService.DirectoryCreate(destDir).Failed(out error))
{
args.FailureReason = "Failed to create destination directory: " + error;
args.Logger?.ELog(args.FailureReason);
return -1;
}
}
args.ArchiveHelper.Extract(filename, destDir, (percent) =>
var result = args.ArchiveHelper.Extract(filename, destDir, (percent) =>
{
args.PartPercentageUpdate(percent);
});
if (result.Failed(out error))
{
args.FailureReason = error;
args.Logger?.ELog(error);
return -1;
}
return 1;
}
catch (Exception ex)
{
args.Logger?.ELog("Failed unzip: " + ex.Message + Environment.NewLine + ex.StackTrace);
args.FailureReason = "Failed to unpack: " + ex.Message;
args.Logger?.ELog(args.FailureReason);
return -1;
}
}
ComicNodes/Comics/ComicExtractor.cs
+1 -1
View File
@@ -49,7 +49,7 @@ public class ComicExtractor : Node
var metadata = new Dictionary<string, object>();
metadata.Add("Format", args.WorkingFile[(args.WorkingFile.LastIndexOf(".", StringComparison.Ordinal) + 1)..].ToUpper());
var rgxImages = new Regex(@"\.(jpeg|jpg|jpe|png|bmp|tiff|webp|gif)$");
var rgxImages = new Regex(@"\.(jpeg|jpg|jpe|jp2|png|bmp|tiff|webp|gif)$");
metadata.Add("Pages", Directory.GetFiles(dest, "*.*", SearchOption.AllDirectories).Count(x => rgxImages.IsMatch(x)));
args.SetMetadata(metadata);
FileFlows.Plugin.dll
BIN
View File
Binary file not shown.
FileFlows.Plugin.pdb
BIN
View File
Binary file not shown.
VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs
+13 -8
View File
@@ -95,17 +95,20 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode
var model = this.Model;
if (model == null)
{
args.Logger.ELog("FFMPEG Builder model is null");
args.FailureReason = "FFMPEG Builder model is null";
args.Logger.ELog(args.FailureReason);
return -1;
}
else if (model.VideoInfo == null)
if (model.VideoInfo == null)
{
args.Logger.ELog("FFMPEG Builder VideoInfo is null");
args.FailureReason = "FFMPEG Builder VideoInfo is null";
args.Logger.ELog(args.FailureReason);
return -1;
}
else if (model.VideoInfo.FileName == null)
if (model.VideoInfo.FileName == null)
{
args.Logger.ELog("FFMPEG Builder VideoInfo Filename is null");
args.FailureReason = "FFMPEG Builder VideoInfo Filename is null";
args.Logger.ELog(args.FailureReason);
return -1;
}
List<string> ffArgs = new List<string>();
@@ -278,12 +281,14 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode
GetHardwareDecodingArgs(args, localFile, FFMPEG, video?.Stream?.Codec, pxtFormat, encodingParameters: encodingParameters);
if (decodingParameters.Any() == true)
{
args.StatisticRecorderRunningTotals("DecoderParameters", string.Join(" ", decodingParameters));
args.StatisticRecorderRunningTotals?.Invoke("DecoderParameters", string.Join(" ", decodingParameters));
startArgs.AddRange(decodingParameters);
}
}
}
startArgs.AddRange(["-c:s", "webvtt"]);
foreach (var file in model.InputFiles)
{
startArgs.Add("-i");
@@ -467,7 +472,7 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode
arguments = new VaapiAdjustments().Run(args.Logger, arguments);
}
args.AdditionalInfoRecorder("Testing", string.Join(" ", hw), 1, new TimeSpan(0, 0, 10));
args.AdditionalInfoRecorder?.Invoke("Testing", string.Join(" ", hw), 1, new TimeSpan(0, 0, 10));
try
{
@@ -515,7 +520,7 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode
}
finally
{
args.AdditionalInfoRecorder("Testing", null, 1, new TimeSpan(0, 0, 10));
args.AdditionalInfoRecorder?.Invoke("Testing", null, 1, new TimeSpan(0, 0, 10));
try
{
if (System.IO.File.Exists(testFile))
VideoNodes/FfmpegBuilderNodes/FfmpegBuilderStart.cs
+5
View File
@@ -52,7 +52,12 @@ public class FfmpegBuilderStart: FfmpegBuilderNode
{
VideoInfo videoInfo = GetVideoInfo(args);
if (videoInfo == null)
{
args.FailureReason = "No VideoInformation found";
args.Logger?.ELog(args.FailureReason);
return -1;
}
this.Model = Models.FfmpegModel.CreateModel(videoInfo);
args.Logger.ILog("FFMPEG Builder File: " + videoInfo.FileName);
VideoNodes/FfmpegBuilderNodes/Models/FfmpegSubtitleStream.cs
+2 -2
View File
@@ -52,8 +52,8 @@ public class FfmpegSubtitleStream : FfmpegStream
}
}
if (destCodec == "copy" && Stream.Codec == "webvtt")
destCodec = "webvtt"; // FF-1534: webvtt issue
// if (destCodec == "copy" && Stream.Codec == "webvtt")
// destCodec = "webvtt"; // FF-1534: webvtt issue
List<string> results= new List<string> { "-map", Stream.InputFileIndex + ":s:{sourceTypeIndex}", "-c:s:{index}", destCodec };
VideoNodes/Tests/FfmpegBuilderTests/FfmpegBuilder_VideoEncodeTests.cs
+42 -1
View File
@@ -4,6 +4,7 @@ using FileFlows.VideoNodes.FfmpegBuilderNodes;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using VideoNodes.Tests;
using System.IO;
using FileFlows.VideoNodes.Helpers;
namespace FileFlows.VideoNodes.Tests.FfmpegBuilderTests;
@@ -30,7 +31,7 @@ public class FfmpegBuilder_VideoEncode_VideoEncodeTests: TestBase
Assert.AreEqual(1, ffStart.Execute(args));
FfmpegBuilderVideoEncode ffEncode = new();
ffEncode.Encoder = "VAAPI";
//ffEncode.Encoder = "VAAPI";
//ffEncode.Encoder = "NVIDIA";
// ffEncode.Encoder = "Intel QSV";
ffEncode.Codec = codec;
@@ -256,6 +257,46 @@ public class FfmpegBuilder_VideoEncode_VideoEncodeTests: TestBase
TestContext.WriteLine(log);
Assert.AreEqual(1, result);
}
[TestMethod]
public void FfmpegBuilder_VideoEncode_WebVTT()
{
var logger = new TestLogger();
string ffmpeg = FfmpegPath;
const string FILE = "/home/john/Videos/webvtt/webvtt.mkv";
var vi = new VideoInfoHelper(ffmpeg, logger);
var vii = vi.Read(FILE);
var args = new NodeParameters(FILE, logger, false, string.Empty, new LocalFileService());
args.GetToolPathActual = (string tool) => ffmpeg;
args.TempPath = TempPath;
args.Parameters.Add("VideoInfo", vii.Value);
FfmpegBuilderStart ffStart = new();
ffStart.PreExecute(args);
Assert.AreEqual(1, ffStart.Execute(args));
FfmpegBuilderVideoEncode ffEncode = new();
ffEncode.Quality = 28;
ffEncode.Speed = "fast";
ffEncode.Encoder = "CPU";
ffEncode.Codec = "h265";
ffEncode.PreExecute(args);
ffEncode.Execute(args);
FFmpegBuilderDurationStart ds = new();
ds.Start = new TimeSpan(0, 0, 0);
ds.Duration = new TimeSpan(0, 1, 0);
ds.PreExecute(args);
ds.Execute(args);
FfmpegBuilderExecutor ffExecutor = new();
ffExecutor.Strictness = "experimental";
ffExecutor.PreExecute(args);
int result = ffExecutor.Execute(args);
string log = logger.ToString();
TestContext.WriteLine(log);
Assert.AreEqual(1, result);
}
}
#endif
VideoNodes/Tests/SubtitleExtractorTests.cs
+70 -47
View File
@@ -1,69 +1,92 @@
#if(DEBUG)
namespace VideoNodes.Tests
using FileFlows.VideoNodes;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.IO;
using VideoFile = FileFlows.VideoNodes.VideoFile;
namespace VideoNodes.Tests;
[TestClass]
public class SubtitleExtractorTests: TestBase
{
using FileFlows.VideoNodes;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.IO;
[TestClass]
public class SubtitleExtractorTests: TestBase
[TestMethod]
public void SubtitleExtractor_Extension_Test()
{
[TestMethod]
public void SubtitleExtractor_Extension_Test()
string file = TestFile_BasicMkv;
var vi = new VideoInfoHelper(FfmpegPath, new TestLogger());
var vii = vi.Read(file);
foreach (string ext in new[] { String.Empty, ".srt", ".sup" })
{
string file = TestFile_BasicMkv;
var vi = new VideoInfoHelper(FfmpegPath, new TestLogger());
var vii = vi.Read(file);
SubtitleExtractor node = new();
node.OutputFile = Path.Combine(TempPath, "subtitle.en" + ext);
node.Language = "eng";
foreach (string ext in new[] { String.Empty, ".srt", ".sup" })
{
SubtitleExtractor node = new();
node.OutputFile = Path.Combine(TempPath, "subtitle.en" + ext);
node.Language = "eng";
var args = new NodeParameters(file, new TestLogger(), false, string.Empty, null);;
args.GetToolPathActual = (string tool) => FfmpegPath;
args.TempPath = TempPath;
var args = new NodeParameters(file, new TestLogger(), false, string.Empty, null);;
args.GetToolPathActual = (string tool) => FfmpegPath;
args.TempPath = TempPath;
Assert.AreEqual(1, new VideoFile().Execute(args));
Assert.AreEqual(1, new VideoFile().Execute(args));
int output = node.Execute(args);
int output = node.Execute(args);
Assert.AreEqual(1, output);
}
Assert.AreEqual(1, output);
}
}
[TestMethod]
public void SubtitleExtractor_Pgs_Test()
[TestMethod]
public void SubtitleExtractor_Pgs_Test()
{
string file = TestFile_Pgs;
var vi = new VideoInfoHelper(FfmpegPath, new TestLogger());
var vii = vi.Read(file);
foreach (string ext in new[] { string.Empty, ".srt", ".sup" })
{
string file = TestFile_Pgs;
var vi = new VideoInfoHelper(FfmpegPath, new TestLogger());
var vii = vi.Read(file);
SubtitleExtractor node = new();
node.ForcedOnly = true;
node.OutputFile = Path.Combine(TempPath, "subtitle.en" + ext);
node.Language = "eng";
foreach (string ext in new[] { string.Empty, ".srt", ".sup" })
{
SubtitleExtractor node = new();
node.ForcedOnly = true;
node.OutputFile = Path.Combine(TempPath, "subtitle.en" + ext);
node.Language = "eng";
var args = new NodeParameters(file, new TestLogger(), false, string.Empty, null);;
args.GetToolPathActual = (string tool) => FfmpegPath;
args.TempPath = TempPath;
var args = new NodeParameters(file, new TestLogger(), false, string.Empty, null);;
args.GetToolPathActual = (string tool) => FfmpegPath;
args.TempPath = TempPath;
var vf = new VideoFile();
vf.PreExecute(args);
Assert.AreEqual(1, vf.Execute(args));
var vf = new VideoFile();
vf.PreExecute(args);
Assert.AreEqual(1, vf.Execute(args));
int output = node.Execute(args);
int output = node.Execute(args);
Assert.AreEqual(1, output);
}
Assert.AreEqual(1, output);
}
}
[TestMethod]
public void Webvtt_Extract()
{
string file = TestFile_Webvtt;
var args = new NodeParameters(file, new TestLogger(), false, string.Empty, new LocalFileService());;
args.GetToolPathActual = (string tool) => FfmpegPath;
args.TempPath = TempPath;
var vf = new VideoFile();
vf.PreExecute(args);
Assert.AreEqual(1, vf.Execute(args));
SubtitleExtractor extractor = new();
extractor.OutputFile = Path.Combine(TempPath, "subtitle.srt");
extractor.ExtractAll = true;
extractor.PreExecute(args);
int output = extractor.Execute(args);
Assert.AreEqual(1, output);
}
}
#endif
VideoNodes/Tests/_TestBase.cs
+9
View File
@@ -16,6 +16,8 @@ public abstract class TestBase
/// </summary>
private TestContext testContextInstance;
internal TestLogger Logger = new();
/// <summary>
/// Gets or sets the test context
/// </summary>
@@ -56,6 +58,12 @@ public abstract class TestBase
Directory.CreateDirectory(this.TempPath);
}
[TestCleanup]
public void CleanUp()
{
TestContext.WriteLine(Logger.ToString());
}
private void LoadSettings(string filename)
{
try
@@ -81,6 +89,7 @@ public abstract class TestBase
protected string TestFile_MovText_Mp4 => Path.Combine(TestPath, "movtext.mp4");
protected string TestFile_BasicMkv => Path.Combine(TestPath, "basic.mkv");
protected string TestFile_Webvtt => Path.Combine(TestPath, "webvtt.mkv");
protected string TestFile_Tag => Path.Combine(TestPath, "tag.mp4");
protected string TestFile_Sitcom => Path.Combine(TestPath, "sitcom.mkv");
protected string TestFile_Pgs => Path.Combine(TestPath, "pgs.mkv");