mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-01-06 02:49:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue with move trying to delete working file and not the original file

Browse Source
This commit is contained in:
reven
2021-11-25 23:52:51 +13:00
parent 7e93bbee63
commit fc09f75c05
8 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
BasicNodes/BasicNodes.csproj
View File

Binary file not shown.

11
BasicNodes/File/MoveFile.cs
View File

@@ -25,7 +25,7 @@ namespace FileFlows.BasicNodes.File
public override int Execute(NodeParameters args)
{
string dest = DestinationPath;
string dest = args.ReplaceVariables(DestinationPath, true);
if (string.IsNullOrEmpty(dest))
{
args.Logger?.ELog("No destination specified");
@@ -52,16 +52,17 @@ namespace FileFlows.BasicNodes.File
if (string.IsNullOrEmpty(destDir) == false && Directory.Exists(destDir) == false)
Directory.CreateDirectory(destDir);
string original = args.WorkingFile;
if (args.MoveFile(dest) == false)
return -1;
if (DeleteOriginal && original != args.FileName)
if (DeleteOriginal && args.FileName != args.WorkingFile)
{
args.Logger?.ILog("Deleting orginal file: " + args.FileName);
try
{
System.IO.File.Delete(original);
}catch(Exception ex)
System.IO.File.Delete(args.FileName);
}
catch(Exception ex)
{
args.Logger?.WLog("Failed to delete original file: " + ex.Message);
}