Another fix for Monitored Conditions backward compatibility (#84)

* Another fix for Monitored Conditions backward compatibility * Remove SonarCloud from readme * Clean __init__
GuyKh · Jan 29, 2024 · 93f30c2 · 93f30c2
1 parent f18b65b
commit 93f30c2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.1.23
+
+* Another Fix for Monitored Condition backward compatibility
+
 ## v0.1.22
 
 * Fix Monitored Condition backward compatibility

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 # ims-custom-component
 
-[![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg)](https://github.com/hacs/integration) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=techblog_ims-custom-component&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=techblog_ims-custom-component)
+[![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg)](https://github.com/hacs/integration)
 
 
 

diff --git a/custom_components/ims/__init__.py b/custom_components/ims/__init__.py
@@ -30,6 +30,8 @@
     IMS_PLATFORMS,
     IMS_PLATFORM,
     IMS_PREVPLATFORM,
+    DEFAULT_LANGUAGE,
+    FORECAST_MODE_HOURLY,
 )
 
 from .weather_update_coordinator import WeatherUpdateCoordinator
@@ -45,9 +47,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up IMS Weather as config entry."""
     name = entry.data[CONF_NAME]
     city = _get_config_value(entry, CONF_CITY)
-    forecast_mode = _get_config_value(entry, CONF_MODE)
+    forecast_mode = _get_config_value(entry, CONF_MODE, FORECAST_MODE_HOURLY)
     images_path = _get_config_value(entry, CONF_IMAGES_PATH)
-    language = _get_config_value(entry, CONF_LANGUAGE)
+    language = _get_config_value(entry, CONF_LANGUAGE, DEFAULT_LANGUAGE)
     ims_entity_platform = _get_config_value(entry, IMS_PLATFORM)
     ims_scan_int = entry.data[CONF_UPDATE_INTERVAL]
     conditions = _get_config_value(entry, CONF_MONITORED_CONDITIONS)
@@ -142,20 +144,20 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-def _get_config_value(config_entry: ConfigEntry, key: str) -> Any:
+def _get_config_value(config_entry: ConfigEntry, key: str, default = None) -> Any:
     if config_entry.options:
         val = config_entry.options.get(key)
         if val:
             return val
         else:
             _LOGGER.warning("Key %s is missing from config_entry.options", key)
-            return None
+            return default
     val = config_entry.data.get(key)
     if val:
         return val
     else:
         _LOGGER.warning("Key %s is missing from config_entry.data", key)
-        return None
+        return default
 
 
 

diff --git a/custom_components/ims/manifest.json b/custom_components/ims/manifest.json
@@ -7,5 +7,5 @@
     "iot_class": "cloud_polling",
     "issue_tracker": "https://github.com/t0mer/ims-custom-component/issues",
     "requirements": ["weatheril>=0.32.0"],
-    "version": "0.1.22"
+    "version": "0.1.23"
 }
diff --git a/custom_components/ims/sensor.py b/custom_components/ims/sensor.py
@@ -280,6 +280,10 @@ async def async_setup_entry(
     # Add IMS Sensors
     sensors: list[ImsSensor] = []
 
+    if conditions is None:
+        # If a problem happens - create all sensors
+        conditions = SENSOR_DESCRIPTIONS_KEYS
+
     for condition in conditions:
         description = SENSOR_DESCRIPTIONS_DICT[condition]
         sensors.append(ImsSensor(weather_coordinator, description))