From 913bc11821efec06270d3c6160ae3035f2e6d2f6 Mon Sep 17 00:00:00 2001
From: Marcel Vriend <92307684+marcelvriend@users.noreply.github.com>
Date: Wed, 18 May 2022 19:36:35 +0000
Subject: [PATCH] Fix disabled feature recognition and logging

---
 custom_components/grocy/__init__.py | 63 +++++++++++++++++------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/custom_components/grocy/__init__.py b/custom_components/grocy/__init__.py
index 898ab10..cd83a9c 100644
--- a/custom_components/grocy/__init__.py
+++ b/custom_components/grocy/__init__.py
@@ -7,7 +7,7 @@
 import asyncio
 import logging
 from datetime import timedelta
-from typing import List
+from typing import Any, List
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import Config, HomeAssistant
@@ -91,60 +91,71 @@ async def _async_update_data(self):
         """Update data via library."""
         grocy_data = GrocyData(self.hass, self.api)
         data = {}
-        features = []
-        try:
-            features = await async_supported_features(grocy_data)
-            if not features:
-                raise UpdateFailed("No features enabled")
-        except Exception as exception:
-            raise UpdateFailed(exception)
+        features = await async_supported_features(grocy_data)
+        if not features:
+            raise UpdateFailed("No features enabled")
 
         for entity in self.entities:
-            if entity.enabled and entity.entity_type in features:
-                try:
-                    data[entity.entity_type] = await grocy_data.async_update_data(
-                        entity.entity_type
-                    )
-                except Exception as exception:
-                    _LOGGER.error(
-                        f"Update of {entity.entity_type} failed with {exception}"
-                    )
-            elif entity.entity_type not in features:
-                _LOGGER.warning(
-                    f"You have enabled the entity for {entity.name}, but this feature is not enabled in Grocy",
+            if not entity.enabled:
+                continue
+            if not entity.entity_type in features:
+                _LOGGER.debug(
+                    "You have enabled the entity for '%s', but this feature is not enabled in Grocy",
+                    entity.name,
+                )
+                continue
+
+            try:
+                data[entity.entity_type] = await grocy_data.async_update_data(
+                    entity.entity_type
+                )
+            except Exception as exception:  # pylint: disable=broad-except
+                _LOGGER.error(
+                    "Update of %s failed with %s",
+                    entity.entity_type,
+                    exception,
                 )
         return data
 
 
-async def async_supported_features(grocy_data) -> List[str]:
+async def async_supported_features(grocy_data: GrocyData) -> List[str]:
     """Return a list of supported features."""
     features = []
     config = await grocy_data.async_get_config()
     if config:
-        if config["FEATURE_FLAG_STOCK"] != "0":
+        if is_enabled_grocy_feature(config, "FEATURE_FLAG_STOCK"):
             features.append(GrocyEntityType.STOCK)
             features.append(GrocyEntityType.PRODUCTS)
             features.append(GrocyEntityType.MISSING_PRODUCTS)
             features.append(GrocyEntityType.EXPIRED_PRODUCTS)
             features.append(GrocyEntityType.EXPIRING_PRODUCTS)
 
-        if config["FEATURE_FLAG_SHOPPINGLIST"] != "0":
+        if is_enabled_grocy_feature(config, "FEATURE_FLAG_SHOPPINGLIST"):
             features.append(GrocyEntityType.SHOPPING_LIST)
 
-        if config["FEATURE_FLAG_TASKS"] != "0":
+        if is_enabled_grocy_feature(config, "FEATURE_FLAG_TASKS"):
             features.append(GrocyEntityType.TASKS)
             features.append(GrocyEntityType.OVERDUE_TASKS)
 
-        if config["FEATURE_FLAG_CHORES"] != "0":
+        if is_enabled_grocy_feature(config, "FEATURE_FLAG_CHORES"):
             features.append(GrocyEntityType.CHORES)
             features.append(GrocyEntityType.OVERDUE_CHORES)
 
-        if config["FEATURE_FLAG_RECIPES"] != "0":
+        if is_enabled_grocy_feature(config, "FEATURE_FLAG_RECIPES"):
             features.append(GrocyEntityType.MEAL_PLAN)
 
     return features
 
 
+def is_enabled_grocy_feature(grocy_config: Any, feature_setting_key: str) -> bool:
+    """
+    Return whether the Grocy feature is enabled or not, default is enabled.
+    Setting value received from Grocy can be a str or bool.
+    """
+    feature_setting_value = grocy_config[feature_setting_key]
+    return feature_setting_value not in (False, "0")
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
     """Handle removal of an entry."""
     _LOGGER.debug("Unloading with state %s", entry.state)