mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-02-06 13:18:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixing issue with DeleteSourceDirectory node not deleting from linux

Browse Source
This commit is contained in:
reven
2021-12-18 20:04:52 +13:00
parent af43da17eb
commit bae469619c
8 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
BasicNodes/BasicNodes.csproj
View File

Binary file not shown.

20
BasicNodes/File/DeleteSourceDirectory.cs
View File

@@ -21,11 +21,13 @@ namespace FileFlows.BasicNodes.File
public override int Execute(NodeParameters args)
{
string path = args.FileName.Substring(0, args.FileName.Length - args.RelativeFile.Length);
args.Logger.ILog("Library path: " + path);
int pathIndex = args.RelativeFile.IndexOf(System.IO.Path.DirectorySeparatorChar);
args.Logger?.ILog("Library path: " + path);
args.Logger?.ILog("RelativeFile: " + args.RelativeFile);
int pathIndex = args.RelativeFile.IndexOfAny(new[] { '\\', '/' });
if (pathIndex < 0)
{
args.Logger.ILog("File is in library root, will not delete");
args.Logger?.ILog("File is in library root, will not delete");
return base.Execute(args);
}
@@ -34,7 +36,7 @@ namespace FileFlows.BasicNodes.File
if (IfEmpty)
{
var files = new System.IO.DirectoryInfo(pathToDelete).GetFiles("*.*", SearchOption.AllDirectories);
var files = new DirectoryInfo(pathToDelete).GetFiles("*.*", SearchOption.AllDirectories);
if (IncludePatterns?.Any() == true)
{
var count = files.Where(x =>
@@ -54,26 +56,26 @@ namespace FileFlows.BasicNodes.File
}).Count();
if (count > 0)
{
args.Logger.ILog("Directory is not empty, cannot delete: " + pathToDelete);
args.Logger?.ILog("Directory is not empty, cannot delete: " + pathToDelete);
return 2;
}
}
else if (files.Length == 0)
{
args.Logger.ILog("Directory is not empty, cannot delete: " + pathToDelete);
args.Logger?.ILog("Directory is not empty, cannot delete: " + pathToDelete);
return 2;
}
}
args.Logger.ILog("Deleting directory: " + pathToDelete);
args.Logger?.ILog("Deleting directory: " + pathToDelete);
try
{
System.IO.Directory.Delete(pathToDelete, true);
Directory.Delete(pathToDelete, true);
}
catch (Exception ex)
{
args.Logger.ELog("Failed to delete directory: " + ex.Message);
args.Logger?.ELog("Failed to delete directory: " + ex.Message);
return -1;
}
return base.Execute(args);

BIN
Builds/BasicNodes.zip
View File

Binary file not shown.

BIN
Builds/MetaNodes.zip
View File

Binary file not shown.

BIN
Builds/VideoNodes.zip
View File

Binary file not shown.

BIN
MetaNodes/MetaNodes.csproj
View File

Binary file not shown.

BIN
VideoNodes/VideoNodes.csproj
View File

Binary file not shown.

6
plugins.json
View File

@@ -1,17 +1,17 @@
[
{
"Name": "BasicNodes",
"Version": "0.0.1.31",
"Version": "0.0.1.33",
"Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/BasicNodes.zip?raw=true"
},
{
"Name": "MetaNodes",
"Version": "0.0.1.31",
"Version": "0.0.1.33",
"Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/MetaNodes.zip?raw=true"
},
{
"Name": "VideoNodes",
"Version": "0.0.1.31",
"Version": "0.0.1.33",
"Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/VideoNodes.zip?raw=true"
}
]