Skip to content

Commit 66886c2

Browse files
edwardtfnedwardtfn
committed
Rebuild list of pending_update_list
Resolves edwardtfn/HomeAssistant-Config#15
1 parent 94c89d4 commit 66886c2

File tree

1 file changed

+45
-20
lines changed

1 file changed

+45
-20
lines changed

‎auto_update_scheduled.yaml

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -660,24 +660,49 @@ action:
660660
| first
661661
}}
662662
{% endif %}
663-
pending_updates_list: |
663+
combined_list: |
664+
{{
665+
(
666+
firmware_update_entities | default([]) | list
667+
if firmware_update_entities is sequence
668+
else [firmware_update_entities | string] if firmware_update_entities is not none else []
669+
) +
670+
(
671+
general_update_entities | default([]) | list
672+
if general_update_entities is sequence
673+
else [general_update_entities | string] if general_update_entities is not none else []
674+
) +
675+
(
676+
core_update_entity | default([]) | list
677+
if core_update_entity is sequence
678+
else [core_update_entity | string] if core_update_entity is not none else []
679+
) +
680+
(
681+
os_update_entity | default([]) | list
682+
if os_update_entity is sequence
683+
else [os_update_entity | string] if os_update_entity is not none else []
684+
) +
685+
(
686+
supervisor_update_entity | default([]) | list
687+
if supervisor_update_entity is sequence
688+
else [supervisor_update_entity | string] if supervisor_update_entity is not none else []
689+
)
690+
}}
691+
pending_update_list: |
664692
{{
665693
states.update
666694
| default([])
667695
| selectattr("state", "eq", "on")
668-
| selectattr('entity_id', 'in', [ firmware_update_entities,
669-
general_update_entities,
670-
core_update_entity,
671-
os_update_entity,
672-
supervisor_update_entity])
696+
| selectattr('entity_id', 'in', combined_list)
673697
| rejectattr('entity_id', 'in', input_update_exclusions)
674698
| map(attribute='entity_id')
675699
| list
676700
}}
677-
pending_update_count: '{{ pending_updates_list | list | count | int(0) }}'
701+
pending_update_count: '{{ pending_update_list | list | count | int(0) }}'
678702

679703
- variables:
680-
updates_list: '{{ pending_updates_list }}'
704+
update_list: '{{ pending_update_list }}'
705+
updates_list: '{{ pending_update_list }}'
681706
is_there_anything_to_update: '{{ pending_update_count > 0 }}'
682707

683708
- alias: Preparation # Inform logbook and telegram which update automation is running
@@ -857,7 +882,7 @@ action:
857882
value_template: >
858883
{{ ( states.update
859884
| selectattr('state', 'eq', 'on')
860-
| selectattr('entity_id', 'in', pending_updates_list)
885+
| selectattr('entity_id', 'in', pending_update_list)
861886
| rejectattr('entity_id', 'in', core_update_entity)
862887
| rejectattr('entity_id', 'in', os_update_entity)
863888
| rejectattr('entity_id', 'in', firmware_update_entities)
@@ -873,7 +898,7 @@ action:
873898
pending_update_list: >
874899
{{ states.update
875900
| selectattr('state', 'eq', 'on')
876-
| selectattr('entity_id', 'in', pending_updates_list)
901+
| selectattr('entity_id', 'in', pending_update_list)
877902
| rejectattr('entity_id', 'in', core_update_entity)
878903
| rejectattr('entity_id', 'in', os_update_entity)
879904
| rejectattr('entity_id', 'in', firmware_update_entities)
@@ -920,7 +945,7 @@ action:
920945
value_template: >
921946
{{ ( states.update
922947
| selectattr('state', 'eq', 'on')
923-
| selectattr('entity_id', 'in', pending_updates_list)
948+
| selectattr('entity_id', 'in', pending_update_list)
924949
| rejectattr('entity_id', 'in', core_update_entity)
925950
| rejectattr('entity_id', 'in', os_update_entity)
926951
| selectattr('entity_id', 'in', firmware_update_entities)
@@ -938,7 +963,7 @@ action:
938963
pending_update_list: >
939964
{{ states.update
940965
| selectattr('state', 'eq', 'on')
941-
| selectattr('entity_id', 'in', pending_updates_list)
966+
| selectattr('entity_id', 'in', pending_update_list)
942967
| rejectattr('entity_id', 'in', core_update_entity)
943968
| rejectattr('entity_id', 'in', os_update_entity)
944969
| selectattr('entity_id', 'in', firmware_update_entities)
@@ -971,7 +996,7 @@ action:
971996
value_template: >
972997
{{ ( states.update
973998
| selectattr('state', 'eq', 'on')
974-
| selectattr('entity_id', 'in', pending_updates_list)
999+
| selectattr('entity_id', 'in', pending_update_list)
9751000
| selectattr('entity_id', 'in', core_update_entity)
9761001
| rejectattr('entity_id', 'in', os_update_entity)
9771002
| rejectattr('entity_id', 'in', firmware_update_entities)
@@ -989,7 +1014,7 @@ action:
9891014
pending_update_list: >
9901015
{{ states.update
9911016
| selectattr('state', 'eq', 'on')
992-
| selectattr('entity_id', 'in', pending_updates_list)
1017+
| selectattr('entity_id', 'in', pending_update_list)
9931018
| selectattr('entity_id', 'in', core_update_entity)
9941019
| rejectattr('entity_id', 'in', os_update_entity)
9951020
| rejectattr('entity_id', 'in', firmware_update_entities)
@@ -1023,7 +1048,7 @@ action:
10231048
value_template: >
10241049
{{ ( states.update
10251050
| selectattr('state', 'eq', 'on')
1026-
| selectattr('entity_id', 'in', pending_updates_list)
1051+
| selectattr('entity_id', 'in', pending_update_list)
10271052
| rejectattr('entity_id', 'in', core_update_entity)
10281053
| selectattr('entity_id', 'in', os_update_entity)
10291054
| rejectattr('entity_id', 'in', firmware_update_entities)
@@ -1041,7 +1066,7 @@ action:
10411066
pending_update_list: >
10421067
{{ states.update
10431068
| selectattr('state', 'eq', 'on')
1044-
| selectattr('entity_id', 'in', pending_updates_list)
1069+
| selectattr('entity_id', 'in', pending_update_list)
10451070
| rejectattr('entity_id', 'in', core_update_entity)
10461071
| selectattr('entity_id', 'in', os_update_entity)
10471072
| rejectattr('entity_id', 'in', firmware_update_entities)
@@ -1078,7 +1103,7 @@ action:
10781103
entity_id: >-
10791104
{{ states.update
10801105
| selectattr('state', 'eq', 'on')
1081-
| selectattr('entity_id', 'in', pending_updates_list)
1106+
| selectattr('entity_id', 'in', pending_update_list)
10821107
| rejectattr('entity_id', 'in', input_update_exclusions)
10831108
| map(attribute='entity_id')
10841109
| list
@@ -1090,7 +1115,7 @@ action:
10901115
(
10911116
states.update
10921117
| selectattr('state', 'eq', 'on')
1093-
| selectattr('entity_id', 'in', pending_updates_list)
1118+
| selectattr('entity_id', 'in', pending_update_list)
10941119
| rejectattr('entity_id', 'in', input_update_exclusions)
10951120
| list
10961121
| count
@@ -1113,14 +1138,14 @@ action:
11131138
Remaining updates:
11141139
{{ '- ' + states.update
11151140
| selectattr('state', 'eq', 'on')
1116-
| selectattr('entity_id', 'in', pending_updates_list)
1141+
| selectattr('entity_id', 'in', pending_update_list)
11171142
| rejectattr('entity_id', 'in', input_update_exclusions)
11181143
| map(attribute='name') | list | join('
11191144
11201145
- ') if
11211146
states.update
11221147
| selectattr('state', 'eq', 'on')
1123-
| selectattr('entity_id', 'in', pending_updates_list)
1148+
| selectattr('entity_id', 'in', pending_update_list)
11241149
| rejectattr('entity_id', 'in', input_update_exclusions)
11251150
| map(attribute='name') | list | count | int(0) > 0
11261151
else 'None remaining'

0 commit comments

Comments
 (0)