Merge pull request #77 from PortableProgrammer/dev

Regressions and bug fixes

Author: PortableProgrammer

status-light/sources/collaboration/slack.py

@@ -88,7 +88,7 @@ def _parse_custom_status(self, client: WebClient,  default: enum.Status = enum.S
                 return enum.Status.UNKNOWN
 
             # Join the emoji and text with a space
-            custom_status = (user_info['profile']['status_emoji'] + ' '
+            custom_status: str = (user_info['profile']['status_emoji'] + ' '
                              + user_info['profile']['status_text']).casefold()
 
             # For each of the Slack custom statuses, check them in reverse precedence order
@@ -98,17 +98,14 @@ def _parse_custom_status(self, client: WebClient,  default: enum.Status = enum.S
 
             if self.custom_available_status and \
                     custom_status.startswith(tuple(self.custom_available_status)):
-
                 return_value = self.custom_available_status_map
 
             if self.custom_scheduled_status and \
                     custom_status.startswith(tuple(self.custom_scheduled_status)):
-
                 return_value = self.custom_scheduled_status_map
 
             if self.custom_busy_status and \
                     custom_status.startswith(tuple(self.custom_busy_status)):
-
                 return_value = self.custom_busy_status_map
 
             # Check for Huddle and Call

status-light/status-light.py

@@ -143,6 +143,8 @@ def receive_signal(signal_number, frame):
 # light.getCurrentStatus()
 
 outside_hours = False
+# Init to True so we don't panic the first time
+lastTransitionResult = True
 while shouldContinue:
     try:
         # Decide if we need to poll at this time
@@ -219,21 +221,39 @@ def receive_signal(signal_number, frame):
                                  googleStatus.name.lower())
                     currentStatus = googleStatus
 
+            statusChanged = False
             if lastStatus != currentStatus:
                 lastStatus = currentStatus
+                statusChanged = True
 
+            if statusChanged:
                 print(datetime.now().strftime('[%Y-%m-%d %H:%M:%S]'),
                       'Found new status:', currentStatus.name.lower(), flush=True)
+
+            if not lastTransitionResult:
+                print(datetime.now().strftime('[%Y-%m-%d %H:%M:%S]'),
+                      'Last attempt to set status failed. Retrying.', flush=True)
+
+            # If status changed this loop
+            # 40: or the last transition failed,
+            if statusChanged or not lastTransitionResult:
                 # 74: Log enums as names, not values
                 logger.info('Transitioning to %s', currentStatus.name.lower())
-                light.transition_status(currentStatus, localEnv)
+                lastTransitionResult = light.transition_status(currentStatus, localEnv)
 
         else:
-            if outside_hours:
-                logger.debug('Already transitioned to off, doing nothing')
-            else:
+            if not outside_hours:
+                print(datetime.now().strftime('[%Y-%m-%d %H:%M:%S]'),
+                      'Outside of active hours, transitioning to off', flush=True)
                 logger.info('Outside of active hours, transitioning to off')
-                light.turn_off()
+                lastTransitionResult = light.turn_off()
+
+            # 40: If the last transition failed, try again
+            if not lastTransitionResult:
+                print(datetime.now().strftime('[%Y-%m-%d %H:%M:%S]'),
+                      'Last attempt to turn off the light failed. Retrying.', flush=True)
+                lastTransitionResult = light.turn_off()
+
             outside_hours = True
 
         # Sleep for a few seconds

status-light/targets/tuya.py

@@ -66,7 +66,7 @@ def _set_status(self, dps: dict, retry: int = 5):
                 logger.warning('Exception sending to Tuya device: %s', ex)
                 count = count + 1
                 time.sleep(1)
-
+        
         # Still some strangeness; reusing the built-in connection in the "tuyaface" key
         #   causes a broken pipe error.
         #   Remove the "tuyaface" key to force a new connection
@@ -76,11 +76,12 @@ def _set_status(self, dps: dict, retry: int = 5):
     def get_status(self):
         return tuyaface.status(self.device)
 
-    def transition_status(self, status: enum.Status, environment: env.Environment):
+    def transition_status(self, status: enum.Status, environment: env.Environment) -> bool:
         # 43: Coalesce the statuses and only execute setState once.
         # This will still allow a single status to be in more than one list,
         # but will not cause the light to rapidly switch between states.
         color = None
+        return_value = False
 
         if status in environment.available_status:
             color = environment.available_color
@@ -92,14 +93,16 @@ def transition_status(self, status: enum.Status, environment: env.Environment):
             color = environment.busy_color
 
         if color is not None:
-            self.set_status('colour', color, environment.tuya_brightness)
+            return_value = self.set_status('colour', color, environment.tuya_brightness)
         # OffStatus has the lowest priority, so only check it if none of the others are valid
         elif status in environment.off_status:
-            self.turn_off()
+            return_value = self.turn_off()
         # In the case that we made it here without a valid state,
         # just turn the light off and warn about it
         # 74: Log enums as names, not values
         else:
             logger.warning('Called with an invalid status: %s',
                            status.name.lower())
-            self.turn_off()
+            return_value = self.turn_off()
+
+        return return_value

status-light/utility/util.py

@@ -130,23 +130,24 @@ def parse_enum_list(value_string: str, value_enum: EnumType, description: str, d
 # 66 - Support Slack custom statuses
 
 
-def parse_str_array(value_string: str, default: list[str], delimiter: str = ',', casefold: bool = False) -> list[str]:
+def parse_str_array(value_string: str | list[str], default: list[str], delimiter: str = ',', casefold: bool = False) -> list[str]:
     """Given a string containing an array of strings, attempts to parse the string into an array.
     Pass casefold=True to build an array ready for case-insensitive comparison."""
     temp_value = default
     if value_string in [None, '']:
-        return temp_value
+        value_string = temp_value
 
     try:
         # Ensure that we return a true list, since the incoming string
         # might have a single element only.
-        temp_value = []
         if not isinstance(value_string, list):
+            temp_value = []
             for value in value_string.split(delimiter):
                 if casefold:
                     value = value.casefold()
                 temp_value.append(value)
         else:
+            temp_value = []
             if casefold:
                 for value in value_string:
                     temp_value.append(value.casefold())