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 = 22
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):

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
@@ -93,7 +93,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
 
     @property
     def device_info(self):
-        _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
         return {
             "identifiers": {
                 # Serial numbers are unique identifiers within a specific domain
@@ -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
 

custom_components/mega/hub.py

@@ -545,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:02}'
                     if ext_cfg.ety == '1':
                         ret['light'][pt].append({})
                     elif ext_cfg.ety == '0':
@@ -557,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:02}'
+                    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')