Merge pull request #109 from JackJPowell/zeroconf-fixes

Improve zeroconf discovery

Author: JackJPowell

custom_components/unfoldedcircle/config_flow.py

@@ -186,8 +186,9 @@ async def async_step_zeroconf(self, discovery_info: ZeroconfServiceInfo):
 
         _LOGGER.debug("Unfolded circle remote found %s :", discovery_info)
         # Use mac address as unique id
-        if mac_address:
-            await self._async_set_unique_id_and_abort_if_already_configured(mac_address)
+        if not mac_address:
+            return self.async_abort(reason="no_mac")
+        await self._async_set_unique_id_and_abort_if_already_configured(mac_address)
 
         self.context.update(
             {
@@ -392,9 +393,9 @@ async def _async_set_unique_id_and_abort_if_already_configured(
         if index > 0:
             unique_id = unique_id[0:index]
 
-        await self.async_set_unique_id(unique_id, raise_on_progress=False)
+        await self.async_set_unique_id(unique_id)
         self._abort_if_unique_id_configured(
-            updates={CONF_MAC: self.discovery_info[CONF_MAC]},
+            updates={CONF_MAC: unique_id},
         )
 
     async def async_step_reauth(

custom_components/unfoldedcircle/helpers.py

@@ -260,7 +260,7 @@ async def device_info_from_discovery_info(discovery_info: ZeroconfServiceInfo) -
                 response = await Remote.get_version_information(endpoint)
                 device_name = response.get("device_name", None)
                 if not device_name:
-                    device_name = "Remote Three"
+                    device_name = "Remote 3"
                 mac_address = response.get("address", "").replace(":", "").lower()
             except Exception:
                 pass

custom_components/unfoldedcircle/translations/en.json

@@ -4,7 +4,8 @@
       "already_configured": "Device is already configured",
       "already_in_progress": "Device is pending setup",
       "no_mac": "This device is not recognized as a valid Unfolded Circle Remote (No MAC Address)",
-      "reauth_successful": "Reauthentication was successful"
+      "reauth_successful": "Reauthentication was successful",
+      "unique_id_required": "Device missing unique identification required for discovery."
     },
     "error": {
       "cannot_connect": "Failed to connect",