A bunch of changes...

[python_utils.git] / smart_home / registry.py

diff --git a/smart_home/registry.py b/smart_home/registry.py
index 2d23981d00ad9aaafef04a45c0761bd4cdefd5af..23584e119173e00f8d86dd38858126a990222f39 100644 (file)
--- a/smart_home/registry.py
+++ b/smart_home/registry.py
@@ -60,7 +60,11 @@ class SmartHomeRegistry(object):
             if line == "":
                 continue
             logger.debug(f'SH-CONFIG> {line}')
-            (mac, name, keywords) = line.split(",")
+            try:
+                (mac, name, keywords) = line.split(",")
+            except ValueError:
+                logger.warning(f'SH-CONFIG> {line} is malformed?!')
+                continue
             mac = mac.strip()
             name = name.strip()
             keywords = keywords.strip()
@@ -161,6 +165,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)