zcc-helper 3.2.dev7__tar.gz → 3.2.dev9__tar.gz

{zcc-helper-3.2.dev7 → zcc-helper-3.2.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zcc-helper
-Version: 3.2.dev7
+Version: 3.2.dev9
 Summary: ZIMI ZCC helper module
 Home-page: UNKNOWN
 Author: Mark Hannon

{zcc-helper-3.2.dev7 → zcc-helper-3.2.dev9}/zcc/__main__.py

@@ -81,28 +81,28 @@ async def main(args):
 
             if device:
                 if 'CloseDoor' in options.action:
-                    device.close_door()
+                    await device.close_door()
                 elif 'OpenDoor' in options.action:
-                    device.open_door()
+                    await device.open_door()
                 elif 'TurnOn' in options.action:
-                    device.turn_on()
+                    await device.turn_on()
                 elif 'TurnOff' in options.action:
-                    device.turn_off()
+                    await device.turn_off()
                 elif 'OpenToPercentage' in options.action:
                     if options.value:
-                        device.open_to_percentage(options.value)
+                        await device.open_to_percentage(options.value)
                     else:
                         raise ControlPointError(
                             'OpenToPercentage requires --value')
                 elif 'SetBrightness' in options.action:
                     if options.value:
-                        device.set_brightness(options.value)
+                        await device.set_brightness(options.value)
                     else:
                         raise ControlPointError(
                             'SetBrightness requires --value')
                 elif 'SetFanSpeed' in options.action:
                     if options.value:
-                        device.set_fanspeed(options.value)
+                        await device.set_fanspeed(options.value)
                     else:
                         raise ControlPointError(
                             'SetFanSpeed requires --value')

{zcc-helper-3.2.dev7 → zcc-helper-3.2.dev9}/zcc/constants.py

@@ -9,4 +9,4 @@ APP_ID = 'ZvWqWJQB'
 APP_TOKEN = '3422ecbb-cf6a-404c-b3dc-2023dd213535'
 
 NAME = 'zcc-helper'
-VERSION = '3.2dev7'
+VERSION = '3.2dev9'

{zcc-helper-3.2.dev7 → zcc-helper-3.2.dev9}/zcc/controller.py

@@ -318,13 +318,17 @@ class ControlPoint:
                 ControlPointProtocol.GATEWAY_PROPERTIES, None))
         if response.get(ControlPointProtocol.ZCC_STATUS, None):
             self.logger.error("ZCC status message\n%s", pformat(response))
+            await self.re_connect(reset=True)
 
-    async def re_connect(self):
+    async def re_connect(self, reset: bool = False):
         '''Re-connect to a new socket and resend any queued messages.'''
 
-        self.logger.error('Existing socket closed')
+        if reset:
+            self.logger.error('Initiating new socket after existing socket reset')
+        else:
+            self.logger.error('Existing socket closed')
 
-        self.socket.unsubscribe()
+        self.socket.unsubscribe(self)
         self.socket.close()
         
         self.closed_socket = self.socket

{zcc-helper-3.2.dev7 → zcc-helper-3.2.dev9}/zcc_helper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zcc-helper
-Version: 3.2.dev7
+Version: 3.2.dev9
 Summary: ZIMI ZCC helper module
 Home-page: UNKNOWN
 Author: Mark Hannon