mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-01-04 03:29:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

FF-1219 - fixing seven zip

Browse Source
This commit is contained in:
John Andrews
2024-02-12 07:15:51 +13:00
parent 7a10be198c
commit 2dad18c452
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
BasicNodes/Tools/SevenZip.cs
View File

@@ -165,6 +165,18 @@ public class SevenZip : Node
return destDir;
}
private Result<string> GetSevenZipLocation(NodeParameters args)
{
var sevenZip = args.GetToolPath("7zip")?.EmptyAsNull() ?? "7z";
var result = args.Execute(new()
{
Command = sevenZip
});
if (result.ExitCode != 0)
return Result<string>.Fail("7zip not found on processing node.");
return sevenZip;
}
/// <summary>
/// Executes the flow element
@@ -175,7 +187,15 @@ public class SevenZip : Node
{
try
{
string sevenZip = args.GetToolPath("7zip")?.EmptyAsNull() ?? "7z";
var sevenZipResult = GetSevenZipLocation(args);
if (sevenZipResult.IsFailed)
{
args.FailureReason = sevenZipResult.Error;
args.Logger?.ELog(sevenZipResult.Error);
return -1;
}
string sevenZip = sevenZipResult.Value;
var itemToCompressResult = GetItemToCompress(args);
if (itemToCompressResult.IsFailed)
@@ -228,7 +248,8 @@ public class SevenZip : Node
string compressionMethod = CompressionMethod?.EmptyAsNull() ?? "lzma2";
string targetFile = args.IsRemote ? FileHelper.Combine(args.TempPath, Guid.NewGuid() + ".7zip") : destFile;
string targetFile = args.IsRemote ? FileHelper.Combine(args.TempPath, Guid.NewGuid() + ".7zip") :
args.FileService.GetLocalPath(destFile); // local but maybe mapped
args.Execute(new()
{