fix bugs

custom_components/mega/config_flow.py

@@ -65,7 +65,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for mega."""
 
-    VERSION = 20
+    VERSION = 21
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):
@@ -133,7 +133,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
                 for x in PLATFORMS:
                     cfg.pop(x, None)
                 for x in REMOVE_CONFIG:
-                    cfg.pop(x, default=None)
+                    cfg.pop(x, None)
                 cfg.update(new)
 
             cfg['new_naming'] = new_naming

custom_components/mega/entities.py

@@ -60,7 +60,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         self._lg = None
         self._unique_id = unique_id or f"mega_{mega.id}_{port}" + \
                                        (f"_{id_suffix}" if id_suffix else "")
-        _pt = port if not mega.new_naming else f'{port:02}'
+        _pt = port if not mega.new_naming else f'{port:02}' if isinstance(port, int) else port
         self._name = name or f"{mega.id}_{_pt}" + \
                             (f"_{id_suffix}" if id_suffix else "")
         self._customize: dict = None
@@ -123,7 +123,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
     def name(self):
         c = self.customize.get(CONF_NAME)
         if not isinstance(c, str):
-            _pt = self.port if not self.mega.new_naming else f'{self.port:02}'
+            _pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
             c = self._name or f"{self.mega.id}_p{_pt}"
         return c
 
@@ -157,6 +157,8 @@ class MegaPushEntity(BaseMegaEntity):
 
     def __update(self, value: dict):
         self._update(value)
+        if self.hass is None:
+            return
         self.async_write_ha_state()
         self.lg.debug(f'state after update %s', self.state)
         if self.mega.mqtt_inputs and not _events_on:

custom_components/mega/hub.py

@@ -470,45 +470,6 @@ class MegaD:
     async def scan_port(self, port):
         data = await self.request(pt=port)
         return parse_config(data)
-        # async with self.lck:
-        #     if port in self._scanned:
-        #         return self._scanned[port]
-        #     url = f'http://{self.host}/{self.sec}/?pt={port}'
-        #     self.lg.debug(
-        #         f'scan port %s: %s', port, url
-        #     )
-        #     async with aiohttp.request('get', url) as req:
-        #         html = await req.text()
-        #         if req.status != 200:
-        #             return
-        #     tree = BeautifulSoup(html, features="lxml")
-        #     pty = tree.find('select', attrs={'name': 'pty'})
-        #     if pty is None:
-        #         return
-        #     else:
-        #         pty = pty.find(selected=True)
-        #         if pty:
-        #             pty = pty['value']
-        #         else:
-        #             return
-        #     if pty in ['0', '1']:
-        #         m = tree.find('select', attrs={'name': 'm'})
-        #         if m:
-        #             m = m.find(selected=True)['value']
-        #         self._scanned[port] = (pty, m)
-        #         return pty, m
-        #     elif pty == '3':
-        #         m = tree.find('select', attrs={'name': 'd'})
-        #         if m:
-        #             m = m.find(selected=True)['value']
-        #         self._scanned[port] = (pty, m)
-        #         return pty, m
-        #     elif pty in ('2', '4'):  # эта часть не очень проработана, тут есть i2c который может работать неправильно
-        #         m = tree.find('select', attrs={'name': 'd'})
-        #         if m:
-        #             m = m.find(selected=True)['value']
-        #         self._scanned[port] = (pty, m or '0')
-        #         return pty, m or '0'
 
     async def scan_ports(self, nports=37):
         for x in range(0, nports+1):
@@ -584,7 +545,7 @@ class MegaD:
                 for n in range(len(values)):
                     ext_page = await self.request(pt=port, ext=n)
                     ext_cfg = parse_config(ext_page)
-                    pt = f'{port}e{n}'
+                    pt = f'{port}e{n}' if not self.new_naming else f'{port:02}e{n}'
                     if ext_cfg.ety == '1':
                         ret['light'][pt].append({})
                     elif ext_cfg.ety == '0':
@@ -596,7 +557,8 @@ class MegaD:
                 values = await self.request(pt=port, cmd='get')
                 values = values.split(';')
                 for n in range(len(values)):
-                    ret['light'][f'{port}e{n}'].append({'dimmer': True, 'dimmer_scale': 16})
+                    pt = f'{port}e{n}' if not self.new_naming else f'{port:02}e{n}'
+                    ret['light'][pt].append({'dimmer': True, 'dimmer_scale': 16})
             elif cfg.pty == '4' and (cfg.gr == '0' or _cust.get(CONF_FORCE_I2C_SCAN)):
                 # i2c в режиме ANY
                 scan = cfg.src.find('a', text='I2C Scan')