casambi-bt-revamped 0.3.12.dev1__tar.gz → 0.3.12.dev2__tar.gz

{casambi_bt_revamped-0.3.12.dev1 → casambi_bt_revamped-0.3.12.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.12.dev1
+Version: 0.3.12.dev2
 Summary: Forked Casambi Bluetooth client library with switch event support, use original if no special need. https://github.com/lkempf/casambi-bt
 Home-page: https://github.com/rankjie/casambi-bt
 Author: rankjie

{casambi_bt_revamped-0.3.12.dev1 → casambi_bt_revamped-0.3.12.dev2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = casambi-bt-revamped
-version = 0.3.12.dev1
+version = 0.3.12.dev2
 author = rankjie
 author_email = rankjie@gmail.com
 description = Forked Casambi Bluetooth client library with switch event support, use original if no special need. https://github.com/lkempf/casambi-bt

{casambi_bt_revamped-0.3.12.dev1 → casambi_bt_revamped-0.3.12.dev2}/src/CasambiBt/_casambi.py

@@ -400,7 +400,7 @@ class Casambi:
     def _dataCallback(
         self, packetType: IncommingPacketType, data: dict[str, Any]
     ) -> None:
-        self._logger.info(f"Incomming data callback of type {packetType}")
+        self._logger.debug("Incomming data callback of type %s", packetType)
         if packetType == IncommingPacketType.UnitState:
             self._logger.debug(
                 f"Handling changed state {b2a(data['state'])} for unit {data['id']}"

{casambi_bt_revamped-0.3.12.dev1 → casambi_bt_revamped-0.3.12.dev2}/src/CasambiBt/_client.py

@@ -478,24 +478,28 @@ class CasambiClient:
             return
 
         packetType = decrypted_data[0]
-        self._logger.debug(f"Incoming data of type {packetType}: {b2a(decrypted_data)}")
+        if self._logger.isEnabledFor(logging.DEBUG):
+            self._logger.debug(
+                "Incoming data of type %d: %s", packetType, b2a(decrypted_data)
+            )
 
         if packetType == IncommingPacketType.UnitState:
             self._parseUnitStates(decrypted_data[1:])
         elif packetType == IncommingPacketType.SwitchEvent:
             # Stable logs for offline analysis: packet seq + encrypted + decrypted.
             # (Decrypted data includes the leading packet type byte.)
-            self._logger.info(
-                "[CASAMBI_RAW_PACKET] Encrypted #%s: %s",
-                device_sequence,
-                b2a(raw_encrypted_packet),
-            )
-            self._logger.info(
-                "[CASAMBI_DECRYPTED] Type=%d #%s: %s",
-                packetType,
-                device_sequence,
-                b2a(decrypted_data),
-            )
+            if self._logger.isEnabledFor(logging.DEBUG):
+                self._logger.debug(
+                    "[CASAMBI_RAW_PACKET] Encrypted #%s: %s",
+                    device_sequence,
+                    b2a(raw_encrypted_packet),
+                )
+                self._logger.debug(
+                    "[CASAMBI_DECRYPTED] Type=%d #%s: %s",
+                    packetType,
+                    device_sequence,
+                    b2a(decrypted_data),
+                )
             # Pass the device sequence as the packet sequence for consumers,
             # and still include the raw encrypted packet for diagnostics.
             seq_for_consumer = device_sequence if device_sequence is not None else self._inPacketCount
@@ -509,13 +513,14 @@ class CasambiClient:
             # In the future we might want to parse the revision and issue a warning if there is a mismatch.
             pass
         else:
-            self._logger.info(f"Packet type {packetType} not implemented. Ignoring!")
+            self._logger.debug("Packet type %d not implemented. Ignoring!", packetType)
 
     def _parseUnitStates(self, data: bytes) -> None:
         # Ground truth: casambi-android `v1.C1775b.V(Q2.h)` parses decrypted packet type=6
         # as a stream of unit state records. Records have optional bytes depending on flags.
-        self._logger.info("Parsing incoming unit states...")
-        self._logger.debug("Incoming unit state: %s", b2a(data))
+        self._logger.debug("Parsing incoming unit states...")
+        if self._logger.isEnabledFor(logging.DEBUG):
+            self._logger.debug("Incoming unit state: %s", b2a(data))
 
         pos = 0
         oldPos = 0
@@ -559,19 +564,20 @@ class CasambiClient:
                 padding = data[pos : pos + padding_len] if padding_len else b""
                 pos += padding_len
 
-                self._logger.debug(
-                    "[CASAMBI_UNITSTATE_PARSED] unit=%d flags=0x%02x prio=%d online=%s on=%s con=%s sid=%s extra_byte=%d state=%s padding=%s",
-                    unit_id,
-                    flags,
-                    prio,
-                    online,
-                    on,
-                    con,
-                    sid,
-                    extra_byte,
-                    b2a(state),
-                    b2a(padding),
-                )
+                if self._logger.isEnabledFor(logging.DEBUG):
+                    self._logger.debug(
+                        "[CASAMBI_UNITSTATE_PARSED] unit=%d flags=0x%02x prio=%d online=%s on=%s con=%s sid=%s extra_byte=%d state=%s padding=%s",
+                        unit_id,
+                        flags,
+                        prio,
+                        online,
+                        on,
+                        con,
+                        sid,
+                        extra_byte,
+                        b2a(state),
+                        b2a(padding),
+                    )
 
                 self._dataCallback(
                     IncommingPacketType.UnitState,
@@ -609,17 +615,19 @@ class CasambiClient:
         as a stream of INVOCATION frames. Switch button events are INVOCATIONs.
         """
 
-        self._logger.info(
-            "Parsing incoming switch event packet #%s... Data: %s",
-            packet_seq,
-            b2a(data),
-        )
-        self._logger.info(
-            "[CASAMBI_SWITCH_PACKET] Full data #%s: hex=%s len=%d",
-            packet_seq,
-            b2a(data),
-            len(data),
-        )
+        if self._logger.isEnabledFor(logging.DEBUG):
+            data_hex = b2a(data)
+            self._logger.debug(
+                "Parsing incoming switch event packet #%s... Data: %s",
+                packet_seq,
+                data_hex,
+            )
+            self._logger.debug(
+                "[CASAMBI_SWITCH_PACKET] Full data #%s: hex=%s len=%d",
+                packet_seq,
+                data_hex,
+                len(data),
+            )
 
         events, stats = self._switchDecoder.decode(
             data,
@@ -628,7 +636,7 @@ class CasambiClient:
             arrival_sequence=self._inPacketCount,
         )
 
-        self._logger.info(
+        self._logger.debug(
             "[CASAMBI_SWITCH_SUMMARY] packet=%s frames=%d button_frames=%d input_frames=%d ignored=%d emitted=%d suppressed_same_state=%d",
             packet_seq,
             stats.frames_total,

{casambi_bt_revamped-0.3.12.dev1 → casambi_bt_revamped-0.3.12.dev2}/src/CasambiBt/_switch_events.py

@@ -147,18 +147,19 @@ class SwitchEventStreamDecoder:
             # Stable identifier for consumers to deduplicate further if needed.
             event_id = f"invoke:{frame.origin:04x}:{frame.age:04x}:{frame.opcode:02x}:{frame.target:04x}"
 
-            self._logger.info(
-                "[CASAMBI_BUTTON_EVENT] packet=%s unit=%d button=%d event=%s opcode=0x%02x origin=0x%04x age=0x%04x flags=0x%04x payload=%s",
-                packet_seq,
-                unit_id,
-                button,
-                event,
-                frame.opcode,
-                frame.origin,
-                frame.age,
-                frame.flags,
-                b2a(frame.payload),
-            )
+            if self._logger.isEnabledFor(logging.DEBUG):
+                self._logger.debug(
+                    "[CASAMBI_BUTTON_EVENT] packet=%s unit=%d button=%d event=%s opcode=0x%02x origin=0x%04x age=0x%04x flags=0x%04x payload=%s",
+                    packet_seq,
+                    unit_id,
+                    button,
+                    event,
+                    frame.opcode,
+                    frame.origin,
+                    frame.age,
+                    frame.flags,
+                    b2a(frame.payload),
+                )
 
             return {
                 # Back-compat / existing consumers
@@ -252,19 +253,20 @@ class SwitchEventStreamDecoder:
                     return None
                 self._last_input_code[state_key] = input_code
 
-                self._logger.info(
-                    "[CASAMBI_INPUT_AS_BUTTON] packet=%s unit=%d button=%d event=%s code=0x%02x opcode=0x%02x origin=0x%04x age=0x%04x flags=0x%04x payload=%s",
-                    packet_seq,
-                    unit_id,
-                    button,
-                    mapped_event,
-                    input_code,
-                    frame.opcode,
-                    frame.origin,
-                    frame.age,
-                    frame.flags,
-                    b2a(frame.payload),
-                )
+                if self._logger.isEnabledFor(logging.DEBUG):
+                    self._logger.debug(
+                        "[CASAMBI_INPUT_AS_BUTTON] packet=%s unit=%d button=%d event=%s code=0x%02x opcode=0x%02x origin=0x%04x age=0x%04x flags=0x%04x payload=%s",
+                        packet_seq,
+                        unit_id,
+                        button,
+                        mapped_event,
+                        input_code,
+                        frame.opcode,
+                        frame.origin,
+                        frame.age,
+                        frame.flags,
+                        b2a(frame.payload),
+                    )
             event = mapped_event or "input_event"
             self._logger.debug(
                 "[CASAMBI_INPUT_EVENT] packet=%s unit=%d input=%d opcode=0x%02x origin=0x%04x age=0x%04x flags=0x%04x code=%s ch=%s val=%s payload=%s",

{casambi_bt_revamped-0.3.12.dev1 → casambi_bt_revamped-0.3.12.dev2}/src/casambi_bt_revamped.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.12.dev1
+Version: 0.3.12.dev2
 Summary: Forked Casambi Bluetooth client library with switch event support, use original if no special need. https://github.com/lkempf/casambi-bt
 Home-page: https://github.com/rankjie/casambi-bt
 Author: rankjie