From fa6aac42934bc0b20b42cb5655ad4fe1b7fd989c Mon Sep 17 00:00:00 2001 From: John Andrews Date: Fri, 6 Dec 2024 08:54:57 +1300 Subject: [PATCH] tweaking variables exist --- BasicNodes/File/VariableExists.cs | 10 +++------- BasicNodes/i18n/de.json | 24 ++++++++++++------------ BasicNodes/i18n/en.json | 22 +++++++++++----------- BasicNodes/i18n/es.json | 24 ++++++++++++------------ BasicNodes/i18n/fr.json | 24 ++++++++++++------------ BasicNodes/i18n/it.json | 24 ++++++++++++------------ BasicNodes/i18n/ja.json | 24 ++++++++++++------------ BasicNodes/i18n/ko.json | 24 ++++++++++++------------ BasicNodes/i18n/nl.json | 24 ++++++++++++------------ BasicNodes/i18n/pt.json | 24 ++++++++++++------------ BasicNodes/i18n/ru.json | 24 ++++++++++++------------ BasicNodes/i18n/sv.json | 24 ++++++++++++------------ BasicNodes/i18n/zh.json | 24 ++++++++++++------------ BasicNodes/i18n/zht.json | 24 ++++++++++++------------ 14 files changed, 158 insertions(+), 162 deletions(-) diff --git a/BasicNodes/File/VariableExists.cs b/BasicNodes/File/VariableExists.cs index 8e26f76f..ce0a9815 100644 --- a/BasicNodes/File/VariableExists.cs +++ b/BasicNodes/File/VariableExists.cs @@ -39,18 +39,14 @@ public class VariableExists: Node return -1; } - if (args.Variables.TryGetValue(variable, out var value) == false) + var value = VariablesHelper.ResolveVariable(args.Variables, variable); + if (value == null) { args.Logger?.ILog($"Variable '{variable}' does not exist"); return 2; } - if (value == null) - { - args.Logger?.ILog($"Variable '{variable}' exists but is null"); - return 2; - } - args.Logger?.ILog($"Variable '{variable}' exists and is not null"); + args.Logger?.ILog($"Variable '{variable}' exists"); return 1; } } \ No newline at end of file diff --git a/BasicNodes/i18n/de.json b/BasicNodes/i18n/de.json index 492862c5..94150f33 100644 --- a/BasicNodes/i18n/de.json +++ b/BasicNodes/i18n/de.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Protokolliert alle Variablen im Ablauf zur Fehlersuche in der Protokolldatei.", - "Label": "Variablen protokollieren", - "Fields": { - "Recursive": "Detailliertes Protokoll", - "Recursive-Help": "Wenn aktiviert, werden komplexe Variablen mit all ihren verschachtelten Eigenschaften protokolliert." - }, - "Outputs": { - "1": "Variablen wurden erfolgreich protokolliert." - } - }, - + "Parts": { "BatchScript": { "Description": "Ermöglicht das Ausführen eines Batch (.bat) Skripts in einer Windows-Umgebung.", "Label": "Batch-Skript (.bat)", @@ -452,6 +441,17 @@ "2": "Bild konnte nicht protokolliert werden" } }, + "LogVariables": { + "Description": "Protokolliert alle Variablen im Ablauf zur Fehlersuche in der Protokolldatei.", + "Label": "Variablen protokollieren", + "Fields": { + "Recursive": "Detailliertes Protokoll", + "Recursive-Help": "Wenn aktiviert, werden komplexe Variablen mit all ihren verschachtelten Eigenschaften protokolliert." + }, + "Outputs": { + "1": "Variablen wurden erfolgreich protokolliert." + } + }, "Matches": { "Description": "Vergleicht eine Menge von Werten und prüft die Bedingungen, um zu sehen, welche Ausgabe aufgerufen werden soll.", "Label": "Übereinstimmungen", diff --git a/BasicNodes/i18n/en.json b/BasicNodes/i18n/en.json index 83350988..266112e5 100644 --- a/BasicNodes/i18n/en.json +++ b/BasicNodes/i18n/en.json @@ -9,17 +9,6 @@ }, "Flow": { "Parts": { - "LogVariables": { - "Description": "Logs all the variables in the flow to the file log for debugging purposes.", - "Label": "Log Variables", - "Fields": { - "Recursive": "Detailed Logging", - "Recursive-Help": "When enabled, complex variables will include all their nested properties in the log." - }, - "Outputs": { - "1": "Variables have been logged successfully." - } - }, "BatchScript": { "Description": "Allows you to execute a batch (.bat) script in a Windows environment.", "Label": "Batch Script (.bat)", @@ -452,6 +441,17 @@ "2": "Image failed to be logged" } }, + "LogVariables": { + "Description": "Logs all the variables in the flow to the file log for debugging purposes.", + "Label": "Log Variables", + "Fields": { + "Recursive": "Detailed Logging", + "Recursive-Help": "When enabled, complex variables will include all their nested properties in the log." + }, + "Outputs": { + "1": "Variables have been logged successfully." + } + }, "Matches": { "Description": "Compares a set of values and matches conditions to see which output should be called", "Label": "Matches", diff --git a/BasicNodes/i18n/es.json b/BasicNodes/i18n/es.json index 836cafb5..b3bd19ef 100644 --- a/BasicNodes/i18n/es.json +++ b/BasicNodes/i18n/es.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Registra todas las variables del flujo en el archivo de registro para depuración.", - "Label": "Registrar Variables", - "Fields": { - "Recursive": "Registro Detallado", - "Recursive-Help": "Si está habilitado, las variables complejas incluirán todas sus propiedades anidadas en el registro." - }, - "Outputs": { - "1": "Las variables se han registrado con éxito." - } - }, - + "Parts": { "BatchScript": { "Description": "Te permite ejecutar un script por lotes (.bat) en un entorno de Windows.", "Label": "Script por lotes (.bat)", @@ -452,6 +441,17 @@ "2": "La imagen no se pudo registrar" } }, + "LogVariables": { + "Description": "Registra todas las variables del flujo en el archivo de registro para depuración.", + "Label": "Registrar Variables", + "Fields": { + "Recursive": "Registro Detallado", + "Recursive-Help": "Si está habilitado, las variables complejas incluirán todas sus propiedades anidadas en el registro." + }, + "Outputs": { + "1": "Las variables se han registrado con éxito." + } + }, "Matches": { "Description": "Compara un conjunto de valores y condiciones de coincidencia para ver qué salida debe ser llamada", "Label": "Coincidencias", diff --git a/BasicNodes/i18n/fr.json b/BasicNodes/i18n/fr.json index 3ba6416b..e8b72986 100644 --- a/BasicNodes/i18n/fr.json +++ b/BasicNodes/i18n/fr.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Enregistre toutes les variables du flux dans le fichier journal pour le débogage.", - "Label": "Enregistrer les Variables", - "Fields": { - "Recursive": "Journalisation Détaillée", - "Recursive-Help": "Lorsqu'elle est activée, les variables complexes incluront toutes leurs propriétés imbriquées dans le journal." - }, - "Outputs": { - "1": "Les variables ont été enregistrées avec succès." - } - }, - + "Parts": { "BatchScript": { "Description": "Vous permet d'exécuter un script par lots (.bat) dans un environnement Windows.", "Label": "Script par lots (.bat)", @@ -452,6 +441,17 @@ "2": "Échec de l'enregistrement de l'image" } }, + "LogVariables": { + "Description": "Enregistre toutes les variables du flux dans le fichier journal pour le débogage.", + "Label": "Enregistrer les Variables", + "Fields": { + "Recursive": "Journalisation Détaillée", + "Recursive-Help": "Lorsqu'elle est activée, les variables complexes incluront toutes leurs propriétés imbriquées dans le journal." + }, + "Outputs": { + "1": "Les variables ont été enregistrées avec succès." + } + }, "Matches": { "Description": "Compare un ensemble de valeurs et des conditions de correspondance pour voir quelle sortie doit être appelée", "Label": "Correspondances", diff --git a/BasicNodes/i18n/it.json b/BasicNodes/i18n/it.json index 09248161..0a742402 100644 --- a/BasicNodes/i18n/it.json +++ b/BasicNodes/i18n/it.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Registra tutte le variabili del flusso nel file di log per il debug.", - "Label": "Registra Variabili", - "Fields": { - "Recursive": "Registrazione Dettagliata", - "Recursive-Help": "Se abilitato, le variabili complesse includeranno tutte le loro proprietà nidificate nel log." - }, - "Outputs": { - "1": "Le variabili sono state registrate con successo." - } - }, - + "Parts": { "BatchScript": { "Description": "Ti consente di eseguire uno script batch (.bat) in un ambiente Windows.", "Label": "Script Batch (.bat)", @@ -452,6 +441,17 @@ "2": "Impossibile registrare l'immagine" } }, + "LogVariables": { + "Description": "Registra tutte le variabili del flusso nel file di log per il debug.", + "Label": "Registra Variabili", + "Fields": { + "Recursive": "Registrazione Dettagliata", + "Recursive-Help": "Se abilitato, le variabili complesse includeranno tutte le loro proprietà nidificate nel log." + }, + "Outputs": { + "1": "Le variabili sono state registrate con successo." + } + }, "Matches": { "Description": "Confronta un insieme di valori e abbina le condizioni per vedere quale output dovrebbe essere chiamato", "Label": "Corrispondenze", diff --git a/BasicNodes/i18n/ja.json b/BasicNodes/i18n/ja.json index dc5f3009..0261cf47 100644 --- a/BasicNodes/i18n/ja.json +++ b/BasicNodes/i18n/ja.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "デバッグのために、フロー内のすべての変数をログファイルに記録します。", - "Label": "変数をログに記録", - "Fields": { - "Recursive": "詳細ログ", - "Recursive-Help": "有効にすると、複雑な変数のすべてのネストされたプロパティがログに含まれます。" - }, - "Outputs": { - "1": "変数が正常に記録されました。" - } - }, - + "Parts": { "BatchScript": { "Description": "Windows環境でバッチ(.bat)スクリプトを実行できます。", "Label": "バッチスクリプト(.bat)", @@ -452,6 +441,17 @@ "2": "画像の記録に失敗しました" } }, + "LogVariables": { + "Description": "デバッグのために、フロー内のすべての変数をログファイルに記録します。", + "Label": "変数をログに記録", + "Fields": { + "Recursive": "詳細ログ", + "Recursive-Help": "有効にすると、複雑な変数のすべてのネストされたプロパティがログに含まれます。" + }, + "Outputs": { + "1": "変数が正常に記録されました。" + } + }, "Matches": { "Description": "値のセットを比較し、条件が一致するかを確認して、どの出力を呼び出すべきかを判断します", "Label": "一致", diff --git a/BasicNodes/i18n/ko.json b/BasicNodes/i18n/ko.json index e30a2ea8..7419344f 100644 --- a/BasicNodes/i18n/ko.json +++ b/BasicNodes/i18n/ko.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "디버깅을 위해 흐름의 모든 변수를 로그 파일에 기록합니다.", - "Label": "변수 로그 기록", - "Fields": { - "Recursive": "상세 로그", - "Recursive-Help": "활성화되면 복잡한 변수의 모든 중첩된 속성이 로그에 포함됩니다." - }, - "Outputs": { - "1": "변수가 성공적으로 기록되었습니다." - } - }, - + "Parts": { "BatchScript": { "Description": "Windows 환경에서 배치(.bat) 스크립트를 실행할 수 있습니다.", "Label": "배치 스크립트 (.bat)", @@ -452,6 +441,17 @@ "2": "이미지 기록에 실패했습니다" } }, + "LogVariables": { + "Description": "디버깅을 위해 흐름의 모든 변수를 로그 파일에 기록합니다.", + "Label": "변수 로그 기록", + "Fields": { + "Recursive": "상세 로그", + "Recursive-Help": "활성화되면 복잡한 변수의 모든 중첩된 속성이 로그에 포함됩니다." + }, + "Outputs": { + "1": "변수가 성공적으로 기록되었습니다." + } + }, "Matches": { "Description": "값 집합을 비교하고 조건을 일치시켜 어떤 출력을 호출할지 결정합니다.", "Label": "일치", diff --git a/BasicNodes/i18n/nl.json b/BasicNodes/i18n/nl.json index f50a9559..8b1859d2 100644 --- a/BasicNodes/i18n/nl.json +++ b/BasicNodes/i18n/nl.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Logt alle variabelen in de flow naar het logbestand voor foutopsporing.", - "Label": "Log Variabelen", - "Fields": { - "Recursive": "Gedetailleerd Loggen", - "Recursive-Help": "Als ingeschakeld, worden complexe variabelen met al hun geneste eigenschappen in het logbestand opgenomen." - }, - "Outputs": { - "1": "Variabelen zijn succesvol gelogd." - } - }, - + "Parts": { "BatchScript": { "Description": "Staat je toe om een batch (.bat) script uit te voeren in een Windows omgeving.", "Label": "Batch Script (.bat)", @@ -452,6 +441,17 @@ "2": "Afbeelding kon niet worden gelogd" } }, + "LogVariables": { + "Description": "Logt alle variabelen in de flow naar het logbestand voor foutopsporing.", + "Label": "Log Variabelen", + "Fields": { + "Recursive": "Gedetailleerd Loggen", + "Recursive-Help": "Als ingeschakeld, worden complexe variabelen met al hun geneste eigenschappen in het logbestand opgenomen." + }, + "Outputs": { + "1": "Variabelen zijn succesvol gelogd." + } + }, "Matches": { "Description": "Vergelijkt een set waarden en matcht voorwaarden om te zien welke output moet worden aangeroepen", "Label": "Matches", diff --git a/BasicNodes/i18n/pt.json b/BasicNodes/i18n/pt.json index a188574f..2f1d861e 100644 --- a/BasicNodes/i18n/pt.json +++ b/BasicNodes/i18n/pt.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Registra todas as variáveis do fluxo no arquivo de log para depuração.", - "Label": "Registrar Variáveis", - "Fields": { - "Recursive": "Registro Detalhado", - "Recursive-Help": "Quando ativado, as variáveis complexas incluirão todas as suas propriedades aninhadas no log." - }, - "Outputs": { - "1": "As variáveis foram registradas com sucesso." - } - }, - + "Parts": { "BatchScript": { "Description": "Permite que você execute um script em lote (.bat) em um ambiente Windows.", "Label": "Script em lote (.bat)", @@ -452,6 +441,17 @@ "2": "Falha ao registrar a imagem" } }, + "LogVariables": { + "Description": "Registra todas as variáveis do fluxo no arquivo de log para depuração.", + "Label": "Registrar Variáveis", + "Fields": { + "Recursive": "Registro Detalhado", + "Recursive-Help": "Quando ativado, as variáveis complexas incluirão todas as suas propriedades aninhadas no log." + }, + "Outputs": { + "1": "As variáveis foram registradas com sucesso." + } + }, "Matches": { "Description": "Compara um conjunto de valores e condições de correspondência para ver qual saída deve ser chamada", "Label": "Corresponde", diff --git a/BasicNodes/i18n/ru.json b/BasicNodes/i18n/ru.json index 2b1b1603..9b7ab98e 100644 --- a/BasicNodes/i18n/ru.json +++ b/BasicNodes/i18n/ru.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Логирует все переменные в потоке в файл журнала для отладки.", - "Label": "Логировать Переменные", - "Fields": { - "Recursive": "Детализированный Лог", - "Recursive-Help": "Если включено, сложные переменные будут включать все их вложенные свойства в журнал." - }, - "Outputs": { - "1": "Переменные успешно записаны в журнал." - } - }, - + "Parts": { "BatchScript": { "Description": "Позволяет выполнять пакетный (.bat) скрипт в среде Windows.", "Label": "Пакетный скрипт (.bat)", @@ -452,6 +441,17 @@ "2": "Не удалось записать изображение в журнал" } }, + "LogVariables": { + "Description": "Логирует все переменные в потоке в файл журнала для отладки.", + "Label": "Логировать Переменные", + "Fields": { + "Recursive": "Детализированный Лог", + "Recursive-Help": "Если включено, сложные переменные будут включать все их вложенные свойства в журнал." + }, + "Outputs": { + "1": "Переменные успешно записаны в журнал." + } + }, "Matches": { "Description": "Сравнивает набор значений и сопоставляет условия, чтобы увидеть, какой вывод следует вызвать", "Label": "Соответствует", diff --git a/BasicNodes/i18n/sv.json b/BasicNodes/i18n/sv.json index 5d326586..dd3cf9b0 100644 --- a/BasicNodes/i18n/sv.json +++ b/BasicNodes/i18n/sv.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "Loggar alla variabler i flödet till loggfilen för felsökning.", - "Label": "Logga Variabler", - "Fields": { - "Recursive": "Detaljerad Loggning", - "Recursive-Help": "Om aktiverat kommer komplexa variabler att inkludera alla sina inbäddade egenskaper i loggen." - }, - "Outputs": { - "1": "Variabler har loggats framgångsrikt." - } - }, - + "Parts": { "BatchScript": { "Description": "Tillåter dig att köra ett batch (.bat) skript i en Windows-miljö.", "Label": "Batch-skript (.bat)", @@ -452,6 +441,17 @@ "2": "Kunde inte logga bilden" } }, + "LogVariables": { + "Description": "Loggar alla variabler i flödet till loggfilen för felsökning.", + "Label": "Logga Variabler", + "Fields": { + "Recursive": "Detaljerad Loggning", + "Recursive-Help": "Om aktiverat kommer komplexa variabler att inkludera alla sina inbäddade egenskaper i loggen." + }, + "Outputs": { + "1": "Variabler har loggats framgångsrikt." + } + }, "Matches": { "Description": "Jämför en uppsättning värden och matchar villkor för att se vilken utdata som ska anropas", "Label": "Matcher", diff --git a/BasicNodes/i18n/zh.json b/BasicNodes/i18n/zh.json index d1bb4896..265e742a 100644 --- a/BasicNodes/i18n/zh.json +++ b/BasicNodes/i18n/zh.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "将流程中的所有变量记录到日志文件中以进行调试。", - "Label": "记录变量", - "Fields": { - "Recursive": "详细日志", - "Recursive-Help": "启用后，复杂变量的所有嵌套属性都将记录在日志中。" - }, - "Outputs": { - "1": "变量已成功记录。" - } - }, - + "Parts": { "BatchScript": { "Description": "允许您在 Windows 环境中执行批处理 (.bat) 脚本。", "Label": "批处理脚本 (.bat)", @@ -452,6 +441,17 @@ "2": "图像记录失败" } }, + "LogVariables": { + "Description": "将流程中的所有变量记录到日志文件中以进行调试。", + "Label": "记录变量", + "Fields": { + "Recursive": "详细日志", + "Recursive-Help": "启用后，复杂变量的所有嵌套属性都将记录在日志中。" + }, + "Outputs": { + "1": "变量已成功记录。" + } + }, "Matches": { "Description": "比较一组值并匹配条件，以查看应该调用哪个输出", "Label": "匹配", diff --git a/BasicNodes/i18n/zht.json b/BasicNodes/i18n/zht.json index 6065d050..be259f64 100644 --- a/BasicNodes/i18n/zht.json +++ b/BasicNodes/i18n/zht.json @@ -8,18 +8,7 @@ } }, "Flow": { - "Parts": {"LogVariables": { - "Description": "將流程中的所有變量記錄到日誌文件中以進行調試。", - "Label": "記錄變量", - "Fields": { - "Recursive": "詳細日誌", - "Recursive-Help": "啟用後，複雜變量的所有嵌套屬性都將記錄在日誌中。" - }, - "Outputs": { - "1": "變量已成功記錄。" - } - }, - + "Parts": { "BatchScript": { "Description": "允許您在 Windows 環境中執行批次 (.bat) 腳本。", "Label": "批次腳本 (.bat)", @@ -452,6 +441,17 @@ "2": "圖像記錄失敗" } }, + "LogVariables": { + "Description": "將流程中的所有變量記錄到日誌文件中以進行調試。", + "Label": "記錄變量", + "Fields": { + "Recursive": "詳細日誌", + "Recursive-Help": "啟用後，複雜變量的所有嵌套屬性都將記錄在日誌中。" + }, + "Outputs": { + "1": "變量已成功記錄。" + } + }, "Matches": { "Description": "比較一組值並匹配條件，以確定應該調用哪個輸出", "Label": "匹配",