zcc-helper 3.7.dev1__tar.gz → 3.8__tar.gz

{zcc_helper-3.7.dev1/zcc_helper.egg-info → zcc_helper-3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zcc_helper
-Version: 3.7.dev1
+Version: 3.8
 Summary: ZIMI ZCC helper module
 Author: Mark Hannon
 Author-email: mark.hannon@gmail.com

{zcc_helper-3.7.dev1 → zcc_helper-3.8}/zcc/constants.py

@@ -9,4 +9,4 @@ APP_ID = "ZvWqWJQB"
 APP_TOKEN = "3422ecbb-cf6a-404c-b3dc-2023dd213535"
 
 NAME = "zcc_helper"
-VERSION = "3.7dev1"
+VERSION = "3.8"

{zcc_helper-3.7.dev1 → zcc_helper-3.8}/zcc/controller.py

@@ -10,6 +10,9 @@ import socket
 import time
 import uuid
 from pprint import pformat
+
+# Set to True to ignore missing device states during initial fetch
+IGNORE_MISSING_STATES = True
 from typing import Dict, List
 
 from zcc.constants import LEVEL_BY_VERBOSITY, NAME, VERSION
@@ -138,6 +141,11 @@ class ControlPoint:
             filter(lambda device: device.type == "garagedoor", self.devices.values())
         )
 
+    @property
+    def warnings(self) -> List[ControlPointDevice]:
+        """Return a list of devices with empty or missing states (incomplete data)."""
+        return [device for device in self.devices.values() if not device.states]
+
     async def connect(self, fast: bool = False) -> bool:
         """Connect to ZCC, build device table and subscribe to updates"""
         self.logger.info("Connecting to ZCC %s:%d", self.host, self.port)
@@ -263,7 +271,7 @@ class ControlPoint:
         self.disconnect()
 
     def describe(self) -> str:
-        """Return a string representation of ZCC including devices"""
+        """Return a string representation of ZCC including devices and warnings."""
         header = "+" + "-" * 130 + "+"
         if self.host:
             description = header + "\n"
@@ -300,6 +308,12 @@ class ControlPoint:
                 )
             )
             description += header + "\n"
+
+            # Add warnings section if there are devices with incomplete data
+            if self.warnings:
+                description += "| WARNING: One or more devices have incomplete data.   Check for WARNINGS and upgrade firmware with Zimi app                         |\n"
+                description += "+" + "-" * 130 + "+\n"
+
             description_details = []
             for key in self.manufacture_infos:
                 description_details.append(self.manufacture_infos[key].describe())
@@ -339,7 +353,7 @@ class ControlPoint:
         try:
             await asyncio.wait_for(
                 self.manufacture_info_ready,
-                timeout=ControlPointProtocol.DEVICE_GET_TIMEOUT,
+                timeout=ControlPointProtocol.DEVICE_INFO_TIMEOUT,
             )
         except asyncio.exceptions.TimeoutError as error:
             raise ControlPointError(
@@ -390,9 +404,14 @@ class ControlPoint:
                 self.states_ready, timeout=ControlPointProtocol.DEVICE_GET_TIMEOUT
             )
         except asyncio.exceptions.TimeoutError as error:
-            raise ControlPointError(
-                "ZCC connection failed - didn't receive any states."
-            ) from error
+            if IGNORE_MISSING_STATES:
+                self.logger.info(
+                    "ZCC connection warning - timeout waiting for device states."
+                )
+            else:
+                raise ControlPointError(
+                    "ZCC connection failed - didn't receive any states."
+                ) from error
 
         await asyncio.sleep(ControlPointProtocol.STEP_TIMEOUT)
 

{zcc_helper-3.7.dev1 → zcc_helper-3.8}/zcc/device.py

@@ -64,6 +64,8 @@ class ControlPointDevice:
     @property
     def __states(self) -> str:
         """Gets a descriptive string of the device state"""
+        if self.type == "behaviourlink":
+            return ""
         description = ""
         try:
             key = list(self.states["controlState"].keys())[0]
@@ -76,9 +78,9 @@ class ControlPointDevice:
             if fan_speed:
                 description += "/" + str(fan_speed)
         except IndexError:
-            pass
+            description = "WARNING"
         except KeyError:
-            pass
+            description = "WARNING"
         return description
 
     @property

{zcc_helper-3.7.dev1 → zcc_helper-3.8}/zcc/protocol.py

@@ -16,7 +16,8 @@ class ControlPointProtocol:
     START_SESSION_FAILED = "start_session_failed"
     START_SESSION_SUCCESS = "start_session_success"
     START_SESSION_TIMEOUT = 30
-    DEVICE_GET_TIMEOUT = 10
+    DEVICE_GET_TIMEOUT = 30
+    DEVICE_INFO_TIMEOUT = 120
     CONTROLPOINT_PROPERTIES = "controlpoint_properties"
     CONTROLPOINT_STATES = "controlpoint_states"
     CONTROLPOINT_ACTIONS = "controlpoint_actions"
@@ -58,7 +59,7 @@ class ControlPointProtocol:
     @classmethod
     def discover(cls) -> str:
         """Return the discover message to be broadcast on LAN."""
-        return "ZIMI\r\n"
+        return "ZIMI"
 
     @classmethod
     def get(cls, target: str) -> str:

{zcc_helper-3.7.dev1 → zcc_helper-3.8/zcc_helper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zcc_helper
-Version: 3.7.dev1
+Version: 3.8
 Summary: ZIMI ZCC helper module
 Author: Mark Hannon
 Author-email: mark.hannon@gmail.com