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

FF-1015 - fixing copy/move

Browse Source
This commit is contained in:
John Andrews
2023-07-15 11:19:44 +12:00
parent 4b28b85f54
commit ca8f845d36
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BasicNodes/File/MoveFile.cs
View File

@@ -191,9 +191,15 @@ public class MoveFile : Node
if (moveFolder) // we only want the full directory relative to the library, we don't want the original filename
{
destFolder = Path.Combine(destFolder, args.RelativeFile);
destFolder = destFolder[..destFolder.LastIndexOf(separator)];
args.Logger?.ILog("Using relative directory: " + destFolder);
args.Logger?.ILog("Relative File: " + args.RelativeFile);
string relative = args.RelativeFile.Replace("\\", separator).Replace("/", separator);
if (relative.StartsWith(separator))
relative = relative[1..];
if (relative.IndexOf(separator) > 0)
{
destFolder = destFolder + separator + relative.Substring(0, relative.LastIndexOf(separator));
args.Logger?.ILog("Using relative directory: " + destFolder);
}
}
// dest = Path.Combine(dest, argsFilename);

12
BasicNodes/Tests/MoveTests.cs
View File

@@ -91,6 +91,18 @@ public class MoveTests
Assert.AreEqual(@"D:/test/tv4a-starwarsrebels.mkv", dest);
}
[TestMethod]
public void MoveTests_MoveFolder()
{
var logger = new TestLogger();
var args = new NodeParameters(@"\\tower\downloads\downloaded\tv\The.Walking.Dead.Dead.City.S01E04\some-file.mkv", logger, false, string.Empty);
args.RelativeFile = @"The.Walking.Dead.Dead.City.S01E04\some-file.mkv";
string dest = MoveFile.GetDestinationPath(args, @"\\tower\downloads\converted\tv", null, moveFolder:true);
Assert.AreEqual(@"\\tower\downloads\converted\tv\The.Walking.Dead.Dead.City.S01E04\some-file.mkv", dest);
}
}
#endif