X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=smart_home%2Fregistry.py;h=75fe05256cc9f51cdc06a497fe9304917a510218;hb=a38d345b8b9348bab10c3e359997aadad814a6a1;hp=ae57a735794e07723311685ca994d0a5f936d258;hpb=957c962294cde93c4c649ed18dedd16df071878d;p=python_utils.git

diff --git a/smart_home/registry.py b/smart_home/registry.py
index ae57a73..75fe052 100644
--- a/smart_home/registry.py
+++ b/smart_home/registry.py
@@ -63,7 +63,8 @@ class SmartHomeRegistry(object):
             try:
                 (mac, name, keywords) = line.split(",")
             except ValueError:
-                logger.warning(f'SH-CONFIG> {line} is malformed?!')
+                msg = f'SH-CONFIG> "{line}" is malformed?!  Skipping it.'
+                logger.warning(msg)
                 continue
             mac = mac.strip()
             name = name.strip()
@@ -165,6 +166,9 @@ class SmartHomeRegistry(object):
                         else:
                             logger.debug('    ...a TPLinkOutlet')
                             return outlets.TPLinkOutlet(name, mac, kws)
+                    elif 'meross' in kws.lower():
+                        logger.debug('    ...a MerossOutlet')
+                        return outlets.MerossOutlet(name, mac, kws)
                     elif 'goog' in kws.lower():
                         logger.debug('    ...a GoogleOutlet')
                         return outlets.GoogleOutlet(name, mac, kws)
@@ -180,11 +184,10 @@ class SmartHomeRegistry(object):
                     logger.debug('    ...an unknown device (should this be here?)')
                     return device.Device(name, mac, kws)
             except Exception as e:
-                logger.warning(
-                    f'Got exception {e} while trying to communicate with device {name}/{mac}.'
-                )
+                logger.exception(e)
                 return device.Device(name, mac, kws)
-        logger.warning(f'{mac} is not a known smart home device, returning None')
+        msg = f'{mac} is not a known smart home device, returning None'
+        logger.warning(msg)
         return None
 
     def query(self, query: str) -> List[device.Device]: