stateengine plugin: fix unused attribute detection

smarthomeNG · Sep 20, 2023 · 98be638 · 98be638
1 parent fd34cc2
commit 98be638
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/stateengine/StateEngineItem.py b/stateengine/StateEngineItem.py
@@ -392,17 +392,24 @@ def show_issues_summary(self):
         self.__unused_attributes = filtered_dict
 
         self.__logger.info("".ljust(80, "_"))
-
+        issues = 0
         if self.__config_issues:
+            issues += 1
             self.__log_issues('config entries')
         if self.__unused_attributes:
+            issues += 1
             self.__log_issues('attributes')
         if self.__action_status:
+            issues += 1
             self.__log_issues('actions')
         if self.__state_issues:
+            issues += 1
             self.__log_issues('states')
         if self.__struct_issues:
+            issues += 1
             self.__log_issues('structs')
+        if issues == 0:
+            self.__logger.info("No configuration issues found. Congratulations ;)")
 
     def update_leave_action(self, default_instant_leaveaction):
         default_instant_leaveaction_value = default_instant_leaveaction.get()

diff --git a/stateengine/StateEngineState.py b/stateengine/StateEngineState.py
@@ -505,16 +505,16 @@ def update_action_status(action_status, actiontype):
                 if child_name == "enter" or child_name.startswith("enter_"):
                     _conditioncount += 1
                     _unused_attributes, _used_attributes = self.__conditions.update(child_name, child_item, parent_item)
-                    if _conditioncount == 1:
-                        self.__unused_attributes = copy(_unused_attributes)
-                        self.__used_attributes = copy(_used_attributes)
+                    self.__unused_attributes = copy(_unused_attributes)
+                    self.__used_attributes = copy(_used_attributes)
                     for item in self.__unused_attributes.keys():
                         if 'issue' in self.__unused_attributes[item].keys():
                             if not self.__unused_attributes[item].get('issueorigin'):
                                 self.__unused_attributes[item].update({'issueorigin': []})
                             entry = {'state': self.id, 'conditionset': child_name}
                             if entry not in self.__unused_attributes[item].get('issueorigin'):
                                 self.__unused_attributes[item]['issueorigin'].append(entry)
+                    self._abitem.update_attributes(self.__unused_attributes, self.__used_attributes)
             except ValueError as ex:
                 raise ValueError("Condition {0} error: {1}".format(child_name, ex))