Add_pulse_logs from sorted and pruned restored cache data

Author: bouwew

plugwise_usb/nodes/circle.py

@@ -604,7 +604,7 @@ async def _energy_log_records_load_from_cache(self) -> bool:
                 "Failed to restore energy log records from cache for node %s", self.name
             )
             return False
-        restored_logs: dict[int, list[int]] = {}
+        restored_logs: dict[int, dict[int, list[int, datetime]]] = {}
         if cache_data == "":
             _LOGGER.debug("Cache-record is empty")
             return False
@@ -617,38 +617,41 @@ async def _energy_log_records_load_from_cache(self) -> bool:
                 if len(timestamp_energy_log) == 6:
                     address = int(log_fields[0])
                     slot = int(log_fields[1])
-                    self._energy_counters.add_pulse_log(
-                        address=address,
-                        slot=slot,
-                        timestamp=datetime(
-                            year=int(timestamp_energy_log[0]),
-                            month=int(timestamp_energy_log[1]),
-                            day=int(timestamp_energy_log[2]),
-                            hour=int(timestamp_energy_log[3]),
-                            minute=int(timestamp_energy_log[4]),
-                            second=int(timestamp_energy_log[5]),
-                            tzinfo=UTC,
-                        ),
-                        pulses=int(log_fields[3]),
-                        import_only=True,
+                    pulses=int(log_fields[3])
+                    timestamp=datetime(
+                        year=int(timestamp_energy_log[0]),
+                        month=int(timestamp_energy_log[1]),
+                        day=int(timestamp_energy_log[2]),
+                        hour=int(timestamp_energy_log[3]),
+                        minute=int(timestamp_energy_log[4]),
+                        second=int(timestamp_energy_log[5]),
+                        tzinfo=UTC,
                     )
                     if restored_logs.get(address) is None:
-                        restored_logs[address] = []
-                    restored_logs[address].append(slot)
+                        restored_logs[address] = {}
+                    restored_logs[address][slot] = [pulses, timestamp]
+                    _LOGGER.debug("HOI restored_logs=%s", restored_logs)
 
         # Sort and prune the records loaded from cache
-        sorted_logs: dict[int, dict[int, PulseLogRecord]] = {}
         skip_before = datetime.now(tz=UTC) - timedelta(hours=MAX_LOG_HOURS)
-        sorted_address = sorted(restored_logs.keys(), reverse=True)
-        for address in sorted_address:
+        sorted_addresses = sorted(restored_logs.keys(), reverse=True)
+        for address in sorted_addresses:
             sorted_slots = sorted(restored_logs[address].keys(), reverse=True)
             for slot in sorted_slots:
                 if restored_logs[address][slot].timestamp > skip_before:
                     if sorted_log.get(address) is None:
                         sorted_log[address] = {}
                     sorted_log[address][slot] = restored_logs[address][slot]
 
-        restored_logs = sorted_logs
+        for address, data in sorted_log.items():
+            for slot, pulse_data in data.items():
+                self._energy_counters.add_pulse_log(
+                    address=address,
+                    slot=slot,
+                    pulses=pulse_data[0]
+                    timestamp=pulse_data[1]
+                    import_only=True,
+                )
 
         self._energy_counters.update()