home_automation/HA-NerdFlows
2
0
Fork 0
Code Issues 4 Pull Requests Projects Activity

Remove unnecessary repeated definitions of the cleanup macro

Browse Source
This commit is contained in:
Tony Stork
2023-07-01 14:06:52 -04:00
parent c8568f46e3
commit 4985b28f0f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flows.json
View File

@ -771,9 +771,7 @@
"f1dbb3a206dba921" "f1dbb3a206dba921"
], ],
"x": 14, "x": 14,
"y": 719, "y": 719
"w": 1552,
"h": 642
}, },
{ {
"id": "e065b1ed4938b477", "id": "e065b1ed4938b477",
@ -847,9 +845,7 @@
"64ad1f28cd8d243f" "64ad1f28cd8d243f"
], ],
"x": 14, "x": 14,
"y": 19, "y": 19
"w": 2252,
"h": 682
}, },
{ {
"id": "5c50443a84910fb7", "id": "5c50443a84910fb7",
@ -23624,7 +23620,7 @@
"name": "", "name": "",
"server": "9e87348d.9c1c48", "server": "9e87348d.9c1c48",
"version": 0, "version": 0,
"template": "{%- macro getReport() -%}\n\n {{ states('sensor.current_conditions_detail') }}\n {{ states('sensor.tomorrow_forecast_detail') }}\n {{ states('sensor.clothing_forecast_detail') }}\n\n {% if states('sensor.weatheralerts_active_alerts') > '0' %}\n Currently there are weather alerts active. The total number of alerts is {{ states('sensor.weather_alerts_active_corrected') }}. They are as follows.\n {{ states('sensor.weather_alert_string') }}.\n {% endif %}\n\n{%- endmacro -%}\n\n\n{# a macro that removes all newline characters, empty spaces, and returns formatted text #}\n{%- macro cleanup(data) -%}\n {%- for item in data.split(\"\\n\") if item | trim != \"\" -%}\n {{ item | trim }} {% endfor -%}\n{%- endmacro -%}\n\n{# a macro to call all macros :) #}\n{%- macro mother_of_all_macros() -%}\n {{ getReport() }}\n{%- endmacro -%}\n \n{# Call the macro #}\n{{- cleanup(mother_of_all_macros()) -}}", "template": "{% from 'formatting.jinja' import cleanup %}\n\n{%- macro getReport() -%}\n\n {{ states('sensor.current_conditions_detail') }}\n {{ states('sensor.tomorrow_forecast_detail') }}\n {{ states('sensor.clothing_forecast_detail') }}\n\n {% if states('sensor.weatheralerts_active_alerts') > '0' %}\n Currently there are weather alerts active. The total number of alerts is {{ states('sensor.weather_alerts_active_corrected') }}. They are as follows.\n {{ states('sensor.weather_alert_string') }}.\n {% endif %}\n\n{%- endmacro -%}\n{{- cleanup(getReport()) -}}",
"resultsLocation": "payload", "resultsLocation": "payload",
"resultsLocationType": "msg", "resultsLocationType": "msg",
"templateLocation": "template", "templateLocation": "template",