Merge pull request #7 from andrejs2/config_flow

fix: Resolve configuration and unload errors

Author: andrejs2

custom_components/arso_potresi/__init__.py

@@ -5,9 +5,14 @@
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Nastavi integracijo preko config entryja."""
+    config_entry.async_on_unload(config_entry.add_update_listener(async_reload_entry))
     await hass.config_entries.async_forward_entry_setups(config_entry, ["sensor"])
     return True
 
 async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Odstrani integracijo."""
-    return await hass.config_entries.async_forward_entry_unloads(config_entry, ["sensor"])
+    return await hass.config_entries.async_forward_entry_unload(config_entry, "sensor")
+
+async def async_reload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+    """Ponovno naloži integracijo, ko se spremenijo nastavitve."""
+    await hass.config_entries.async_reload(config_entry.entry_id)

custom_components/arso_potresi/config_flow.py

@@ -1,8 +1,9 @@
 import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.core import callback
+from homeassistant.config_entries import OptionsFlowWithConfigEntry
 
-from .const import DOMAIN, DEFAULT_SCAN_INTERVAL
+from .const import DOMAIN, DEFAULT_SCAN_INTERVAL, DEFAULT_HISTORY_DAYS
 
 class ArsoPotresiConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Config flow za ARSO Potresi integracijo."""
@@ -22,32 +23,30 @@ async def async_step_user(self, user_input=None):
 
         data_schema = vol.Schema({
             vol.Optional("scan_interval", default=DEFAULT_SCAN_INTERVAL): int,
-            vol.Optional("history_days", default=7): int,
+            vol.Optional("history_days", default=DEFAULT_HISTORY_DAYS): int,
         })
         return self.async_show_form(
             step_id="user", data_schema=data_schema, errors=errors
         )
 
-class OptionsFlowHandler(config_entries.OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Tok možnosti za ARSO Potresi integracijo."""
-    def __init__(self, config_entry):
-        self.config_entry = config_entry
 
     async def async_step_init(self, user_input=None):
         """Upravljanje možnosti."""
         if user_input is not None:
-            return self.async_create_entry(title="", data=user_input)
+            return self.async_create_entry(data=user_input)
+
+        options = self.config_entry.options or self.config_entry.data
 
-    
-        options = self.config_entry.data
         options_schema = vol.Schema({
             vol.Optional(
                 "scan_interval", 
                 default=options.get("scan_interval", DEFAULT_SCAN_INTERVAL)
             ): int,
             vol.Optional(
                 "history_days", 
-                default=options.get("history_days", 7)
+                default=options.get("history_days", DEFAULT_HISTORY_DAYS)
             ): int,
         })
 
@@ -56,6 +55,7 @@ async def async_step_init(self, user_input=None):
             data_schema=options_schema,
             description_placeholders={
                 "scan_interval": options.get("scan_interval", DEFAULT_SCAN_INTERVAL),
-                "history_days": options.get("history_days", 7),
+                "history_days": options.get("history_days", DEFAULT_HISTORY_DAYS),
             },
         )
+

custom_components/arso_potresi/const.py

@@ -1,3 +1,4 @@
 DOMAIN = "arso_potresi"
 DEFAULT_API_URL = "https://potresi.arso.gov.si/sc/potresi/public"
 DEFAULT_SCAN_INTERVAL = 5  # privzeto osveževanje vsakih 5 minut
+DEFAULT_HISTORY_DAYS = 7

custom_components/arso_potresi/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/andrejs2/arso_potresi/issues",
   "requirements": [],
-  "version": "1.2.0"
+  "version": "1.2.1"
 }

custom_components/arso_potresi/sensor.py

@@ -11,7 +11,7 @@
 from homeassistant.util.dt import parse_datetime
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN, DEFAULT_API_URL
+from .const import DOMAIN, DEFAULT_API_URL, DEFAULT_SCAN_INTERVAL, DEFAULT_HISTORY_DAYS
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -37,8 +37,9 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback
 ) -> None:
     """Nastavi ARSO Potresi senzor iz config entryja."""
-    scan_interval = config_entry.data.get("scan_interval", 5)
-    history_days = config_entry.data.get("history_days", 7) # <--- PREBEREMO NOVO POLJE
+    options = config_entry.options or config_entry.data
+    scan_interval = options.get("scan_interval", DEFAULT_SCAN_INTERVAL)
+    history_days = options.get("history_days", DEFAULT_HISTORY_DAYS)
     async_add_entities([ArsoPotresiSensor(scan_interval, history_days)], True)
 
 class ArsoPotresiSensor(Entity):
@@ -47,7 +48,7 @@ class ArsoPotresiSensor(Entity):
     def __init__(self, scan_interval, history_days):
         self._api_url = DEFAULT_API_URL
         self._scan_interval = timedelta(minutes=scan_interval)
-        self._history_days = history_days  
+        self._history_days = history_days
         self._state = None
         self._attributes = {}
         self._name = "ARSO Potresi"
@@ -98,22 +99,19 @@ async def async_update(self):
                             _LOGGER.warning("Prejeto ni bilo podatkov")
                             return
 
-                       
                         now = datetime.now(pytz.utc)
                         time_limit = now - timedelta(days=self._history_days)
 
-                       
                         filtered_earthquakes = [e for e in data if parse_datetime(e.get("TIME")).astimezone(pytz.utc) >= time_limit]
 
                         if not filtered_earthquakes:
                             _LOGGER.warning("Ni potresov v izbranem časovnem obdobju.")
                             self._state = "Ni potresov"
                             self._attributes = {}
                             return
-                        
+
                         latest = filtered_earthquakes[0]
 
-                        # Parse lokalnega časa iz TIME
                         dt_local = parse_datetime(latest.get("TIME"))
                         try:
                             dt_utc = pytz.UTC.localize(datetime.strptime(latest.get("TIME_ORIG"), "%Y-%m-%d %H:%M:%S"))
@@ -129,7 +127,6 @@ async def async_update(self):
                         intensity = latest.get("INTENZITETA") if latest.get("INTENZITETA") is not None else "-"
                         verified = "DA" if latest.get("REVISION") == 1 else "NE"
 
-                        
                         self._state = latest.get("GEOLOC", "Neznano")
                         self._attributes = {
                             "Lokalni čas potresa": format_datetime(dt_local),
@@ -143,11 +140,8 @@ async def async_update(self):
                             ATTR_ATTRIBUTION: ATTRIBUTION,
                         }
 
-                       
                         history = []
-                        
                         for earthquake in filtered_earthquakes:
-                            # Parse lokalnega časa iz TIME
                             dt_local_hist = parse_datetime(earthquake.get("TIME"))
                             try:
                                 dt_utc_hist = pytz.UTC.localize(datetime.strptime(earthquake.get("TIME_ORIG"), "%Y-%m-%d %H:%M:%S"))
@@ -176,7 +170,6 @@ async def async_update(self):
                             history.append(earthquake_data)
 
                         self._attributes["Zgodovina potresov"] = history
-                       
 
         except Exception as e:
             _LOGGER.error("Prišlo je do izjeme pri async_update: %s", e)