fix int(port)

custom_components/mega/binary_sensor.py

@@ -20,7 +20,7 @@ from homeassistant.helpers.template import Template
 from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_CUSTOM, CONF_SKIP, CONF_INVERT, CONF_RESPONSE_TEMPLATE
 from .entities import  MegaPushEntity
 from .hub import MegaD
-
+from .tools import int_ignore
 
 lg = logging.getLogger(__name__)
 
@@ -51,7 +51,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     devices = []
     customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
     for port, cfg in config_entry.data.get('binary_sensor', {}).items():
-        port = int(port)
+        port = int_ignore(port)
         c = customize.get(mid, {}).get(port, {})
         if c.get(CONF_SKIP, False):
             continue

custom_components/mega/config_flow.py

@@ -63,7 +63,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for mega."""
 
-    VERSION = 11
+    VERSION = 12
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):

custom_components/mega/hub.py

@@ -24,7 +24,7 @@ from .const import (
 )
 from .entities import set_events_off, BaseMegaEntity, MegaOutPort
 from .exceptions import CannotConnect, NoPort
-from .tools import make_ints
+from .tools import make_ints, int_ignore
 
 TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
 HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
@@ -394,7 +394,7 @@ class MegaD:
         if port == 'cmd':
             return
         try:
-            port = int(port)
+            port = int_ignore(port)
         except:
             self.lg.warning('can not process %s', msg)
             return
@@ -423,7 +423,7 @@ class MegaD:
             asyncio.run_coroutine_threadsafe(self._notify(port, value), self.loop)
 
     def subscribe(self, port, callback):
-        port = int(port)
+        port = int_ignore(port)
         self.lg.debug(
             f'subscribe %s %s', port, callback
         )

custom_components/mega/light.py

@@ -26,6 +26,7 @@ from .const import (
     CONF_CUSTOM,
     CONF_SKIP,
 )
+from .tools import int_ignore
 
 lg = logging.getLogger(__name__)
 
@@ -61,7 +62,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     devices = []
     customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
     for port, cfg in config_entry.data.get('light', {}).items():
-        port = int(port)
+        port = int_ignore(port)
         c = customize.get(mid, {}).get(port, {})
         if c.get(CONF_SKIP, False) or c.get(CONF_DOMAIN, 'light') != 'light':
             continue

custom_components/mega/manifest.json

@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v0.5.1b1"
+  "version": "v0.5.1b2"
 }

custom_components/mega/sensor.py

@@ -22,6 +22,8 @@ from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE
 from .hub import MegaD
 import re
 
+from .tools import int_ignore
+
 lg = logging.getLogger(__name__)
 TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
 HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
@@ -81,7 +83,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     hub: MegaD = hass.data['mega'][mid]
     devices = []
     for port, cfg in config_entry.data.get('sensor', {}).items():
-        port = int(port)
+        port = int_ignore(port)
         for data in cfg:
             hub.lg.debug(f'add sensor on port %s with data %s', port, data)
             sensor = Mega1WSensor(

custom_components/mega/switch.py

@@ -18,6 +18,7 @@ from homeassistant.core import HomeAssistant
 from . import hub as h
 from .entities import MegaOutPort
 from .const import CONF_DIMMER, CONF_SWITCH, DOMAIN, CONF_CUSTOM, CONF_SKIP
+from .tools import int_ignore
 
 _LOGGER = lg = logging.getLogger(__name__)
 
@@ -50,7 +51,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
 
     customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
     for port, cfg in config_entry.data.get('light', {}).items():
-        port = int(port)
+        port = int_ignore(port)
         c = customize.get(mid, {}).get(port, {})
         if c.get(CONF_SKIP, False) or c.get(CONF_DOMAIN, 'light') != 'switch':
             continue

custom_components/mega/tools.py

@@ -11,3 +11,10 @@ def make_ints(d: dict):
         d['m'] = 0
     if 'click' not in d:
         d['click'] = 0
+
+
+def int_ignore(x):
+    try:
+        return int(x)
+    except (TypeError, ValueError):
+        return x