FF-1012 - fixing issue with move folder

This commit is contained in:
John Andrews
2023-07-08 09:33:18 +12:00
parent 7afa36f0c6
commit abdd8611ec

View File

@@ -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;
}
}