mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-02-04 13:48:26 -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-18 20:09:02 +12:00
parent 4ee50eeb20
commit b03bc504d9
6 changed files with 181 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BasicNodes/Functions/Matches.cs
View File

@@ -3,6 +3,7 @@ using FileFlows.Plugin.Attributes;
using System.ComponentModel.DataAnnotations;
using System.Text.RegularExpressions;
using FileFlows.BasicNodes.Helpers;
using FileFlows.Plugin.Helpers;
namespace FileFlows.BasicNodes.Functions;
@@ -83,7 +84,7 @@ public class Matches : Node
if (MathHelper.IsMathOperation(match.Value))
{
if (MathHelper.IsTrue(strValue, match.Value))
if (MathHelper.IsTrue(match.Value, strValue))
{
args.Logger?.ILog($"Match found '{match.Value}' = {strValue}");
return output;

332
BasicNodes/Helpers/MathHelper.cs
View File

@@ -1,166 +1,166 @@
using System.Globalization;
namespace FileFlows.BasicNodes.Helpers;
/// <summary>
/// Helper for math operations
/// </summary>
public class MathHelper
{
/// <summary>
/// Checks if the comparison string represents a mathematical operation.
/// </summary>
/// <param name="comparison">The comparison string to check.</param>
/// <returns>True if the comparison is a mathematical operation, otherwise false.</returns>
public static bool IsMathOperation(string comparison)
{
// Check if the comparison string starts with <=, <, >, >=, ==, or =
return new[] { "<=", "<", ">", ">=", "==", "=" }.Any(comparison.StartsWith);
}
/// <summary>
/// Tests if a math operation is true
/// </summary>
/// <param name="value">The value to apply the operation to.</param>
/// <param name="operation">The operation string representing the mathematical operation.</param>
/// <returns>True if the mathematical operation is successful, otherwise false.</returns>
public static bool IsTrue(string value, string operation)
{
// This is a basic example; you may need to handle different operators
switch (operation[..2])
{
case "<=":
return Convert.ToDouble(value) <= Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()));
case ">=":
return Convert.ToDouble(value) >= Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()));
case "==":
return Math.Abs(Convert.ToDouble(value) - Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()))) < 0.05f;
case "!=":
case "<>":
return Math.Abs(Convert.ToDouble(value) - Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()))) > 0.05f;
}
switch (operation[..1])
{
case "<":
return Convert.ToDouble(value) < Convert.ToDouble(AdjustComparisonValue(operation[1..].Trim()));
case ">":
return Convert.ToDouble(value) > Convert.ToDouble(AdjustComparisonValue(operation[1..].Trim()));
case "=":
return Math.Abs(Convert.ToDouble(value) - Convert.ToDouble(AdjustComparisonValue(operation[1..].Trim()))) < 0.05f;
}
return false;
}
/// <summary>
/// Adjusts the comparison string by handling common mistakes in units and converting them into full numbers.
/// </summary>
/// <param name="comparisonValue">The original comparison string to be adjusted.</param>
/// <returns>The adjusted comparison string with corrected units or the original comparison if no adjustments are made.</returns>
private static string AdjustComparisonValue(string comparisonValue)
{
if (string.IsNullOrWhiteSpace(comparisonValue))
return string.Empty;
string adjustedComparison = comparisonValue.ToLower().Trim();
// Handle common mistakes in units
if (adjustedComparison.EndsWith("mbps"))
{
// Make an educated guess for Mbps to kbps conversion
return adjustedComparison[..^4] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000)
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("kbps"))
{
// Make an educated guess for kbps to bps conversion
return adjustedComparison[..^4] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000)
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("kb"))
{
return adjustedComparison[..^2] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000 )
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("mb"))
{
return adjustedComparison[..^2] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000 )
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("gb"))
{
return adjustedComparison[..^2] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000_000 )
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("tb"))
{
return adjustedComparison[..^2] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000_000_000)
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("kib"))
{
return adjustedComparison[..^3] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_024 )
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("mib"))
{
return adjustedComparison[..^3] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_048_576 )
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("gib"))
{
return adjustedComparison[..^3] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_099_511_627_776 )
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
if (adjustedComparison.EndsWith("tib"))
{
return adjustedComparison[..^3] switch
{
{ } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000_000_000)
.ToString(CultureInfo.InvariantCulture),
_ => comparisonValue
};
}
return comparisonValue;
}
}
// using System.Globalization;
//
// namespace FileFlows.BasicNodes.Helpers;
//
// /// <summary>
// /// Helper for math operations
// /// </summary>
// public class MathHelper
// {
// /// <summary>
// /// Checks if the comparison string represents a mathematical operation.
// /// </summary>
// /// <param name="comparison">The comparison string to check.</param>
// /// <returns>True if the comparison is a mathematical operation, otherwise false.</returns>
// public static bool IsMathOperation(string comparison)
// {
// // Check if the comparison string starts with <=, <, >, >=, ==, or =
// return new[] { "<=", "<", ">", ">=", "==", "=" }.Any(comparison.StartsWith);
// }
//
//
// /// <summary>
// /// Tests if a math operation is true
// /// </summary>
// /// <param name="value">The value to apply the operation to.</param>
// /// <param name="operation">The operation string representing the mathematical operation.</param>
// /// <returns>True if the mathematical operation is successful, otherwise false.</returns>
// public static bool IsTrue(string value, string operation)
// {
// // This is a basic example; you may need to handle different operators
// switch (operation[..2])
// {
// case "<=":
// return Convert.ToDouble(value) <= Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()));
// case ">=":
// return Convert.ToDouble(value) >= Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()));
// case "==":
// return Math.Abs(Convert.ToDouble(value) - Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()))) < 0.05f;
// case "!=":
// case "<>":
// return Math.Abs(Convert.ToDouble(value) - Convert.ToDouble(AdjustComparisonValue(operation[2..].Trim()))) > 0.05f;
// }
//
// switch (operation[..1])
// {
// case "<":
// return Convert.ToDouble(value) < Convert.ToDouble(AdjustComparisonValue(operation[1..].Trim()));
// case ">":
// return Convert.ToDouble(value) > Convert.ToDouble(AdjustComparisonValue(operation[1..].Trim()));
// case "=":
// return Math.Abs(Convert.ToDouble(value) - Convert.ToDouble(AdjustComparisonValue(operation[1..].Trim()))) < 0.05f;
// }
//
// return false;
// }
//
// /// <summary>
// /// Adjusts the comparison string by handling common mistakes in units and converting them into full numbers.
// /// </summary>
// /// <param name="comparisonValue">The original comparison string to be adjusted.</param>
// /// <returns>The adjusted comparison string with corrected units or the original comparison if no adjustments are made.</returns>
// private static string AdjustComparisonValue(string comparisonValue)
// {
// if (string.IsNullOrWhiteSpace(comparisonValue))
// return string.Empty;
//
// string adjustedComparison = comparisonValue.ToLower().Trim();
//
// // Handle common mistakes in units
// if (adjustedComparison.EndsWith("mbps"))
// {
// // Make an educated guess for Mbps to kbps conversion
// return adjustedComparison[..^4] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000)
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("kbps"))
// {
// // Make an educated guess for kbps to bps conversion
// return adjustedComparison[..^4] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000)
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("kb"))
// {
// return adjustedComparison[..^2] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000 )
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("mb"))
// {
// return adjustedComparison[..^2] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000 )
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("gb"))
// {
// return adjustedComparison[..^2] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000_000 )
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("tb"))
// {
// return adjustedComparison[..^2] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000_000_000)
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
//
// if (adjustedComparison.EndsWith("kib"))
// {
// return adjustedComparison[..^3] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_024 )
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("mib"))
// {
// return adjustedComparison[..^3] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_048_576 )
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("gib"))
// {
// return adjustedComparison[..^3] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_099_511_627_776 )
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// if (adjustedComparison.EndsWith("tib"))
// {
// return adjustedComparison[..^3] switch
// {
// { } value when double.TryParse(value, out var numericValue) => (numericValue * 1_000_000_000_000)
// .ToString(CultureInfo.InvariantCulture),
// _ => comparisonValue
// };
// }
// return comparisonValue;
// }
//
// }

BIN
FileFlows.Plugin.dll
View File

Binary file not shown.

BIN
FileFlows.Plugin.pdb
View File

Binary file not shown.

1
VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioConverter.cs
View File

@@ -15,7 +15,6 @@ public class FfmpegBuilderAudioConverter : FfmpegBuilderNode
/// <inheritdoc />
public override int Outputs => 2;
/// <summary>
/// Gets or sets the codec to use
/// </summary>

17
VideoNodes/LogicalNodes/VideoHasStream.cs
View File

@@ -75,10 +75,17 @@ public class VideoHasStream : VideoNode
/// <summary>
/// Gets or sets the number of channels to look for
/// </summary>
[ConditionEquals(nameof(Stream), "Audio")]
[NumberFloat(5)]
[Obsolete]
public float Channels { get; set; }
/// <summary>
/// Gets or sets the number of channels to look for
/// This is a string so math operations can be done
/// </summary>
[ConditionEquals(nameof(Stream), "Audio")]
[MathValue(5)]
public string ChannelsValue { get; set; }
/// <summary>
/// Gets or sets if deleted tracks should also be checked
/// </summary>
@@ -124,6 +131,8 @@ public class VideoHasStream : VideoNode
return -1;
}
var channels = ChannelsValue?.EmptyAsNull() ?? (Channels > 0 ? "=" + Channels : string.Empty);
bool found = false;
string title = args.ReplaceVariables(Title, stripMissing: true);
string codec = args.ReplaceVariables(Codec, stripMissing: true);
@@ -170,7 +179,7 @@ public class VideoHasStream : VideoNode
}
else if (this.Stream == "Audio")
{
args.Logger?.ILog("Channels to match: " + Channels);
args.Logger?.ILog("Channels to match: " + channels);
var streams = ffmpegModel == null
? videoInfo.AudioStreams
: ffmpegModel.AudioStreams.Where(x => x.Deleted == false).Select(x => x.Stream).ToList();
@@ -195,7 +204,7 @@ public class VideoHasStream : VideoNode
return false;
}
if (this.Channels > 0 && Math.Abs(x.Channels - this.Channels) > 0.05f)
if (string.IsNullOrWhiteSpace(channels) == false && MathHelper.IsFalse(channels, x.Channels))
{
args.Logger.ILog("Channels does not match: " + x.Channels + ", Diff : " + Math.Abs(x.Channels - this.Channels));
return false;