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

FF-1591 - Video Has Stream now uses math value for channels

Browse Source
This commit is contained in:
John Andrews
2024-06-20 07:54:39 +12:00
parent b03bc504d9
commit 4b8afa0ff9
8 changed files with 102 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
BasicNodes/File/DeleteSourceDirectory.cs
View File

@@ -52,19 +52,29 @@ public class DeleteSourceDirectory : Node
.TrimEnd('/')
.TrimEnd('\\');
args.Logger?.ILog("Library File Name: " + args.LibraryFileName);
args.Logger?.ILog("Library Path: " + libraryPath);
args.Logger?.ILog("Relative File: " + args.RelativeFile);
//args.Logger?.ILog("IsRemote: " + args.IsRemote);
int pathIndex = args.RelativeFile.IndexOfAny(new[] { '\\', '/' });
if (pathIndex < 0)
string topdir;
if (args.FileService.DirectoryExists(args.LibraryFileName))
{
args.Logger?.ILog("File is in library root, will not delete");
return base.Execute(args);
args.Logger?.ILog("Library Folder Name: " + args.LibraryFileName);
args.Logger?.ILog("Library Path: " + libraryPath);
args.Logger?.ILog("Relative Folder: " + args.RelativeFile);
topdir = args.RelativeFile;
}
else
{
args.Logger?.ILog("Library File Name: " + args.LibraryFileName);
args.Logger?.ILog("Library Path: " + libraryPath);
args.Logger?.ILog("Relative File: " + args.RelativeFile);
string topdir = args.RelativeFile.Substring(0, pathIndex);
int pathIndex = args.RelativeFile.IndexOfAny(['\\', '/']);
if (pathIndex < 0)
{
args.Logger?.ILog("File is in library root, will not delete");
return 1;
}
topdir = args.RelativeFile[..pathIndex];
}
string pathSeparator = args.FileService.PathSeparator.ToString();
@@ -72,25 +82,6 @@ public class DeleteSourceDirectory : Node
string pathToDelete = libraryPath.EndsWith(pathSeparator) ? libraryPath + topdir : libraryPath + pathSeparator + topdir;
args.Logger?.ILog("Path To Delete: " + pathToDelete);
// if (args.IsRemote)
// {
// if (args.LibraryFileName.StartsWith(pathToDelete))
// {
// args.Logger?.ILog("Deleting original file remotely: " + args.LibraryFileName);
// args.DeleteRemote(args.LibraryFileName, false,
// null); // first delete the source file since its in this directory we are deleting
// }
//
// args.Logger?.ILog("Sending request to delete remote path: " + pathToDelete);
//
// bool deleted = args.DeleteRemote(pathToDelete, IfEmpty, IncludePatterns);
// if (deleted)
// args.Logger?.ILog("Successfully deleted remote path: " + pathToDelete);
// else
// args.Logger?.WLog("Failed to delete remote path: " + pathToDelete);
// return deleted ? 1 : 2;
// }
if (IfEmpty)
{
string libFileDirectory = args.IsDirectory ? args.FileName : FileHelper.GetDirectory(args.LibraryFileName);

4
BasicNodes/Functions/Matches.cs
View File

@@ -82,9 +82,9 @@ public class Matches : Node
return output;
}
if (MathHelper.IsMathOperation(match.Value))
if (args.MathHelper.IsMathOperation(match.Value))
{
if (MathHelper.IsTrue(match.Value, strValue))
if (args.MathHelper.IsTrue(match.Value, strValue))
{
args.Logger?.ILog($"Match found '{match.Value}' = {strValue}");
return output;