From 2ac2cb0950028d3cd409d6624d7c9dd1728374c0 Mon Sep 17 00:00:00 2001
From: magico13 <magico1313@gmail.com>
Date: Sun, 11 Apr 2021 13:33:14 -0400
Subject: [PATCH] Fix 1s not populating. Additional logging, some temporary.

---
 custom_components/emporia_vue/__init__.py | 17 +++++++++++++----
 custom_components/emporia_vue/sensor.py   | 16 +++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/custom_components/emporia_vue/__init__.py b/custom_components/emporia_vue/__init__.py
index 1c716d5..a7243ee 100644
--- a/custom_components/emporia_vue/__init__.py
+++ b/custom_components/emporia_vue/__init__.py
@@ -69,6 +69,11 @@ async def async_setup(hass: HomeAssistant, config: dict):
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     """Set up Emporia Vue from a config entry."""
+    global device_gids
+    global device_information
+    device_gids = []
+    device_information = []
+
     entry_data = entry.data
     email = entry_data[CONF_EMAIL]
     password = entry_data[CONF_PASSWORD]
@@ -87,7 +92,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     scales_1s = []
     try:
         devices = await loop.run_in_executor(None, vue.get_devices)
-        _LOGGER.info("Found {0} Emporia devices".format(len(devices)))
+        _LOGGER.warn("Found {0} Emporia devices".format(len(devices)))
         for device in devices:
             if not device.device_gid in device_gids:
                 device_gids.append(device.device_gid)
@@ -129,9 +134,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
                 update_interval=timedelta(seconds=60),
             )
             await coordinator_1min.async_config_entry_first_refresh()
-
+            _LOGGER.warn(f"1min Update data: {coordinator_1min.data}")
         coordinator_1s = None
         if ENABLE_1S in entry_data and entry_data[ENABLE_1S]:
+            scales_1s.append(Scale.SECOND.value)
             coordinator_1s = DataUpdateCoordinator(
                 hass,
                 _LOGGER,
@@ -142,7 +148,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
                 update_interval=timedelta(seconds=1),
             )
             await coordinator_1s.async_config_entry_first_refresh()
+            _LOGGER.warn(f"1s Update data: {coordinator_1s.data}")
     except Exception as err:
+        _LOGGER.warn(f"Exception while setting up Emporia Vue. Will retry. {err}")
         raise ConfigEntryNotReady(
             f"Exception while setting up Emporia Vue. Will retry. {err}"
         )
@@ -159,7 +167,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
                 hass.config_entries.async_forward_entry_setup(entry, component)
             )
     except Exception as err:
-        raise ConfigEntryNotReady(f"Expected retry error: {err}")
+        _LOGGER.warn(f"Error setting up platforms: {err}")
+        raise ConfigEntryNotReady(f"Error setting up platforms: {err}")
 
     return True
 
@@ -186,7 +195,6 @@ async def update_sensors(vue, scales):
         # handled by the data update coordinator.
         data = {}
         loop = asyncio.get_event_loop()
-
         for scale in scales:
             channels = await loop.run_in_executor(
                 None, vue.get_devices_usage, device_gids, None, scale
@@ -227,4 +235,5 @@ async def update_sensors(vue, scales):
 
         return data
     except Exception as err:
+        _LOGGER.error(f"Error communicating with Emporia API: {err}")
         raise UpdateFailed(f"Error communicating with Emporia API: {err}")
\ No newline at end of file
diff --git a/custom_components/emporia_vue/sensor.py b/custom_components/emporia_vue/sensor.py
index 7110616..670a2da 100644
--- a/custom_components/emporia_vue/sensor.py
+++ b/custom_components/emporia_vue/sensor.py
@@ -26,10 +26,11 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
     _LOGGER.info(hass.data[DOMAIN][config_entry.entry_id])
 
-    async_add_entities(
-        CurrentVuePowerSensor(coordinator_1min, id)
-        for idx, id in enumerate(coordinator_1min.data)
-    )
+    if coordinator_1min:
+        async_add_entities(
+            CurrentVuePowerSensor(coordinator_1min, id)
+            for idx, id in enumerate(coordinator_1min.data)
+        )
 
     if coordinator_1s:
         async_add_entities(
@@ -56,10 +57,11 @@ class CurrentVuePowerSensor(CoordinatorEntity, Entity):
                     self._channel = channel
                     break
         if self._channel is None:
+            _LOGGER.warn(
+                f"No channel found for device_gid {device_gid} and channel_num {channel_num}"
+            )
             raise RuntimeError(
-                "No channel found for device_gid {0} and channel_num {1}".format(
-                    device_gid, channel_num
-                )
+                f"No channel found for device_gid {device_gid} and channel_num {channel_num}"
             )
 
         dName = self._channel.name or self._device.device_name