From abdd8611ec7cceac95a53a483fa5fd2a91e1c760 Mon Sep 17 00:00:00 2001 From: John Andrews Date: Sat, 8 Jul 2023 09:33:18 +1200 Subject: [PATCH] FF-1012 - fixing issue with move folder --- BasicNodes/File/MoveFile.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/BasicNodes/File/MoveFile.cs b/BasicNodes/File/MoveFile.cs index fc2e433d..1199466c 100644 --- a/BasicNodes/File/MoveFile.cs +++ b/BasicNodes/File/MoveFile.cs @@ -159,10 +159,13 @@ public class MoveFile : Node } args.Result = NodeResult.Failure; - if (moveFolder) - dest = Path.Combine(dest, args.RelativeFile); - else - dest = Path.Combine(dest, new FileInfo(args.FileName).Name); + if (moveFolder) // we only want the full directory relative to the library, we don't want the original filename + { + dest = new FileInfo(Path.Combine(dest, args.RelativeFile)).DirectoryName; + args.Logger?.ILog("Using relative directory: " + dest); + } + + dest = Path.Combine(dest, new FileInfo(args.FileName).Name); var fiDest = new FileInfo(dest); var fiWorking = new FileInfo(args.WorkingFile); @@ -189,6 +192,8 @@ public class MoveFile : Node fiDest = new FileInfo(dest); } + args.Logger?.ILog("Final destination: " + dest); + return dest; } } \ No newline at end of file