From 57f355d479200e5aaf3c1ab288948649c2b3ba9c Mon Sep 17 00:00:00 2001
From: Andrey <andvikt@gmail.com>
Date: Mon, 25 Jan 2021 16:37:48 +0300
Subject: [PATCH] fix scanning

---
 custom_components/mega/hub.py    | 16 +++++++++++++---
 custom_components/mega/sensor.py |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/custom_components/mega/hub.py b/custom_components/mega/hub.py
index b8ef49b..1dec7d9 100644
--- a/custom_components/mega/hub.py
+++ b/custom_components/mega/hub.py
@@ -125,8 +125,12 @@ class MegaD:
 
     async def get_sensors(self):
         self.lg.debug(self.sensors)
+        ports = []
         for x in self.sensors:
-            await self.get_port(x, force_http=True)
+            if x.port in ports:
+                continue
+            await self.get_port(x.port, force_http=True, http_cmd=x.http_cmd)
+            ports.append(x.port)
 
     @property
     def is_online(self):
@@ -157,6 +161,7 @@ class MegaD:
         self.lg.debug('poll')
         if self.mqtt is None:
             await self.get_all_ports()
+            await self.get_sensors()
             return
         if len(self.sensors) > 0:
             await self.get_sensors()
@@ -209,14 +214,14 @@ class MegaD:
             ret = {'value': ret}
         return ret
 
-    async def get_port(self, port, force_http=False):
+    async def get_port(self, port, force_http=False, http_cmd='get'):
         """
         Запрос состояния порта. Состояние всегда возвращается в виде объекта, всегда сохраняется в центральное
         хранилище values
         """
         self.lg.debug(f'get port %s', port)
         if self.mqtt is None or force_http:
-            ret = await self.request(pt=port, cmd='get')
+            ret = await self.request(pt=port, cmd=http_cmd)
             ret = self.parse_response(ret)
             self.values[port] = ret
             return ret
@@ -361,7 +366,11 @@ class MegaD:
                 ret['light'][port].append({'dimmer': m == '1'})
             elif pty == '3':
                 try:
+                    http_cmd = 'get'
                     values = await self.get_port(port, force_http=True)
+                    if values is None:
+                        values = await self.get_port(port, force_http=True, http_cmd='list')
+                        http_cmd = 'list'
                 except asyncio.TimeoutError:
                     self.lg.warning(f'timout on port {port}')
                     continue
@@ -382,6 +391,7 @@ class MegaD:
                         unit_of_measurement=UNITS.get(key, UNITS[TEMP]),
                         device_class=CLASSES.get(key, CLASSES[TEMP]),
                         id_suffix=key,
+                        http_cmd=http_cmd,
                     ))
         return ret
 
diff --git a/custom_components/mega/sensor.py b/custom_components/mega/sensor.py
index 950cca9..97e1b47 100644
--- a/custom_components/mega/sensor.py
+++ b/custom_components/mega/sensor.py
@@ -101,6 +101,7 @@ class Mega1WSensor(MegaPushEntity):
             unit_of_measurement,
             device_class,
             key=None,
+            http_cmd='get',
             *args,
             **kwargs
     ):
@@ -115,8 +116,7 @@ class Mega1WSensor(MegaPushEntity):
         self.key = key
         self._device_class = device_class
         self._unit_of_measurement = unit_of_measurement
-        if self.port not in self.mega.sensors:
-            self.mega.sensors.append(self.port)
+        self.mega.sensors.append(self)
 
     @property
     def unit_of_measurement(self):