From a5abae385e905578c92c1b1332387dc398039bcb Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Tue, 23 May 2023 04:18:14 +0200
Subject: [PATCH] Updated shelly scripts

---
 packages/shelly/shelly_operations.yaml | 42 +++++++++++++++++---------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/packages/shelly/shelly_operations.yaml b/packages/shelly/shelly_operations.yaml
index 0d34129c..b6b942ac 100644
--- a/packages/shelly/shelly_operations.yaml
+++ b/packages/shelly/shelly_operations.yaml
@@ -8,17 +8,24 @@ script:
   ######################################################################
   shelly_upgrade:
     alias: "Shelly: Aggiornamento Firmware Collettivo"
+    variables:
+      pending_update_list: >
+        {{ states.update
+          | selectattr('state','eq','on')
+          | selectattr('entity_id', 'in', states.group.shelly.attributes.entity_id)
+          | map(attribute='entity_id')
+          | list
+        }}
     sequence:
-      - service: mqtt.publish
-        data:
-          topic: 'shellies/command'
-          payload: 'update_fw'
-          qos: 0
-          retain: false
-    #  - service: update.install
-    #    target:
-    #      entity_id:
-    #        - group.shelly
+    #  - service: mqtt.publish
+    #    data:
+    #      topic: 'shellies/command'
+    #      payload: 'update_fw'
+    #      qos: 0
+    #      retain: false
+      - service: update.install
+        target:
+          entity_id: '{{ pending_update_list }}'
 
   ######################################################################
   # Shelly: Reboot
@@ -44,7 +51,14 @@ automation:
   # Shelly: Update Notification
   ######################################################################
   - alias: "Shelly: Update Notification"
-
+    variables:
+      pending_update_list: >
+        {{ states.update
+          | selectattr('state','eq','on')
+          | selectattr('entity_id', 'in', states.group.shelly.attributes.entity_id)
+          | map(attribute='entity_id')
+          | list
+        }}
     trigger:
       - platform: state
         entity_id: group.shelly
@@ -63,11 +77,9 @@ automation:
         data_template:
           title: "Shelly - Aggiornamento"
           message: >
-            Sono disponibili aggiornamenti per i dispositivi Shelly:
-            {%- for entity_id in states.group.shelly.attributes.entity_id -%}
-              {% if is_state(entity_id, 'on') %}
+            Sono disponibili {{pending_update_list | count }} aggiornamenti per i dispositivi Shelly:
+            {% for entity_id in pending_update_list %}
                 -> {{ state_attr(entity_id, 'friendly_name')|replace(" - Aggiornamento Firmware", "") }}: {{ state_attr(entity_id, 'latest_version') }}
-              {%- endif -%}
             {%- endfor -%}
           notification_id: "update"
           enable_persistent: true
-- 
2.47.3