mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-02-25 19:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

added option to copy/move nodes to also move additional files

Browse Source
This commit is contained in:
John Andrews
2022-02-12 18:29:44 +13:00
parent 939541842a
commit ade1f4a540
28 changed files with 174 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
BasicNodes/BasicNodes.csproj
View File

Binary file not shown.

12
BasicNodes/BasicNodes.en.json
View File

@@ -32,7 +32,11 @@
"DestinationFile": "Destination File",
"DestinationFile-Help": "The filename to copy the file to. If empty, the original filename will be used",
"CopyFolder": "Copy Folder",
"CopyFolder-Help": "If the relative library folder structure should be copied too"
"CopyFolder-Help": "If the relative library folder structure should be copied too",
"AdditionalFiles": "Additional Files",
"AdditionalFiles-Help": "Additional files to copy from the directory to the new directory.\nEach value can contain a combination of valid literal path and wildcard (* and ?) characters, but it doesn''t support regular expressions.",
"AdditionalFilesFromOriginal": "Original Directory",
"AdditionalFilesFromOriginal-Help": "If the additional files should be copied from the working directory or from the original directory. Turn on for original directory."
}
},
"DeleteSourceDirectory": {
@@ -180,7 +184,11 @@
"MoveFolder": "Copy Folder",
"MoveFolder-Help": "If the relative library folder structure should be copied too",
"DeleteOriginal": "Delete Original",
"DeleteOriginal-Help": "If the original file should be deleted, this will only happen if the working file is different to the original file"
"DeleteOriginal-Help": "If the original file should be deleted, this will only happen if the working file is different to the original file",
"AdditionalFiles": "Additional Files",
"AdditionalFiles-Help": "Additional files to move from the directory to the new directory.\nEach value can contain a combination of valid literal path and wildcard (* and ?) characters, but it doesn''t support regular expressions.",
"AdditionalFilesFromOriginal": "Original Directory",
"AdditionalFilesFromOriginal-Help": "If the additional files should be moved from the working directory or from the original directory. Turn on for original directory."
}
},
"OriginalFile": {

41
BasicNodes/File/CopyFile.cs
View File

@@ -31,6 +31,12 @@ namespace FileFlows.BasicNodes.File
[Boolean(3)]
public bool CopyFolder { get; set; }
[StringArray(4)]
public string[] AdditionalFiles { get; set; }
[Boolean(5)]
public bool AdditionalFilesFromOriginal { get; set; }
private bool Canceled;
public override Task Cancel()
@@ -118,12 +124,39 @@ namespace FileFlows.BasicNodes.File
args?.Logger?.ELog("Action was canceled.");
return -1;
}
else
{
args?.SetWorkingFile(dest);
return base.Execute(args!);
var srcDir = AdditionalFilesFromOriginal ? new FileInfo(args.FileName).DirectoryName : new FileInfo(args.WorkingFile).DirectoryName;
if (AdditionalFiles?.Any() == true)
{
try
{
var diSrc = new DirectoryInfo(srcDir);
foreach (var additional in AdditionalFiles)
{
foreach (var addFile in diSrc.GetFiles(additional))
{
try
{
string addFileDest = Path.Combine(destDir, addFile.Name);
System.IO.File.Copy(addFile.FullName, addFileDest, true);
args.Logger?.ILog("Copyied file: \"" + addFile.FullName + "\" to \"" + addFileDest + "\"");
}
catch (Exception ex)
{
args.Logger?.ILog("Failed copying file: \"" + addFile.FullName + "\": " + ex.Message);
}
}
}
}
catch (Exception ex)
{
args.Logger.WLog("Error copying additinoal files: " + ex.Message);
}
}
args?.SetWorkingFile(dest);
return 1;
}
}
}

37
BasicNodes/File/MoveFile.cs
View File

@@ -26,6 +26,12 @@ namespace FileFlows.BasicNodes.File
[Boolean(4)]
public bool DeleteOriginal { get; set; }
[StringArray(5)]
public string[] AdditionalFiles { get; set; }
[Boolean(6)]
public bool AdditionalFilesFromOriginal { get; set; }
public override int Execute(NodeParameters args)
{
string dest = args.ReplaceVariables(DestinationPath, true);
@@ -68,9 +74,40 @@ namespace FileFlows.BasicNodes.File
var destDir = fiDest.DirectoryName;
args.CreateDirectoryIfNotExists(destDir ?? String.Empty);
var srcDir = AdditionalFilesFromOriginal ? new FileInfo(args.FileName).DirectoryName : new FileInfo(args.WorkingFile).DirectoryName;
if (args.MoveFile(dest) == false)
return -1;
if(AdditionalFiles?.Any() == true)
{
try
{
var diSrc = new DirectoryInfo(srcDir);
foreach (var additional in AdditionalFiles)
{
foreach(var addFile in diSrc.GetFiles(additional))
{
try
{
string addFileDest = Path.Combine(destDir, addFile.Name);
System.IO.File.Move(addFile.FullName, addFileDest, true);
args.Logger?.ILog("Moved file: \"" + addFile.FullName + "\" to \"" + addFileDest + "\"");
}
catch(Exception ex)
{
args.Logger?.ILog("Failed moving file: \"" + addFile.FullName + "\": " + ex.Message);
}
}
}
}
catch(Exception ex)
{
args.Logger.WLog("Error moving additinoal files: " + ex.Message);
}
}
if (DeleteOriginal && args.FileName != args.WorkingFile)
{
args.Logger?.ILog("Deleting orginal file: " + args.FileName);