diff --git a/BasicNodes/BasicNodes.csproj b/BasicNodes/BasicNodes.csproj index e4cbabf6..10c50d0b 100644 Binary files a/BasicNodes/BasicNodes.csproj and b/BasicNodes/BasicNodes.csproj differ diff --git a/BasicNodes/File/MoveFile.cs b/BasicNodes/File/MoveFile.cs index 43c6b1da..c56879be 100644 --- a/BasicNodes/File/MoveFile.cs +++ b/BasicNodes/File/MoveFile.cs @@ -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); } diff --git a/Builds/BasicNodes.zip b/Builds/BasicNodes.zip index ee46383d..dced7a6f 100644 Binary files a/Builds/BasicNodes.zip and b/Builds/BasicNodes.zip differ diff --git a/Builds/MetaNodes.zip b/Builds/MetaNodes.zip index d1fe1185..05bdcd42 100644 Binary files a/Builds/MetaNodes.zip and b/Builds/MetaNodes.zip differ diff --git a/Builds/VideoNodes.zip b/Builds/VideoNodes.zip index 881378d1..c6000180 100644 Binary files a/Builds/VideoNodes.zip and b/Builds/VideoNodes.zip differ diff --git a/MetaNodes/MetaNodes.csproj b/MetaNodes/MetaNodes.csproj index 729154b2..04155d83 100644 Binary files a/MetaNodes/MetaNodes.csproj and b/MetaNodes/MetaNodes.csproj differ diff --git a/VideoNodes/VideoNodes.csproj b/VideoNodes/VideoNodes.csproj index 72f6a2c8..b466e2c8 100644 Binary files a/VideoNodes/VideoNodes.csproj and b/VideoNodes/VideoNodes.csproj differ diff --git a/plugins.json b/plugins.json index d071007d..b5abc5b2 100644 --- a/plugins.json +++ b/plugins.json @@ -1,17 +1,17 @@ [ { "Name": "BasicNodes", - "Version": "0.0.1.14", + "Version": "0.0.1.15", "Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/BasicNodes.zip?raw=true" }, { "Name": "MetaNodes", - "Version": "0.0.1.14", + "Version": "0.0.1.15", "Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/MetaNodes.zip?raw=true" }, { "Name": "VideoNodes", - "Version": "0.0.1.14", + "Version": "0.0.1.15", "Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/VideoNodes.zip?raw=true" } ]