Add Islamic Prayer Times config flow

homeassistant/components/islamic_prayer_times/__init__.py

@@ -8,8 +8,8 @@
 
 from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.event import track_point_in_time
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.event import async_track_point_in_time
 import homeassistant.util.dt as dt_util
 
 from .const import (
@@ -61,9 +61,9 @@ async def async_setup_entry(hass, config_entry):
 async def async_unload_entry(hass, config_entry):
     """Unload Islamic Prayer entry from config_entry."""
     if hass.data[DOMAIN].event_unsub:
-        await hass.async_add_executor_job(hass.data[DOMAIN].event_unsub)
-    await hass.config_entries.async_forward_entry_unload(config_entry, "sensor")
+        hass.data[DOMAIN].event_unsub()
     hass.data.pop(DOMAIN)
+    await hass.config_entries.async_forward_entry_unload(config_entry, "sensor")
 
     return True
 
@@ -94,7 +94,7 @@ def get_new_prayer_times(self):
         )
         return calc.fetch_prayer_times()
 
-    def schedule_future_update(self):
+    async def async_schedule_future_update(self):
         """Schedule future update for sensors.
 
         Midnight is a calculated time.  The specifics of the calculation
@@ -142,29 +142,33 @@ def schedule_future_update(self):
 
         _LOGGER.info("Next update scheduled for: %s", next_update_at)
 
-        self.event_unsub = track_point_in_time(self.hass, self.update, next_update_at)
+        self.event_unsub = async_track_point_in_time(
+            self.hass, self.async_update, next_update_at
+        )
 
-    def update(self, *_):
+    async def async_update(self, *_):
         """Update sensors with new prayer times."""
         try:
-            prayer_times = self.get_new_prayer_times()
+            prayer_times = await self.hass.async_add_executor_job(
+                self.get_new_prayer_times
+            )
             self.available = True
         except (exceptions.InvalidResponseError, ConnError):
             self.available = False
             _LOGGER.debug("Error retrieving prayer times.")
-            track_point_in_time(
-                self.hass, self.update, dt_util.utcnow() + timedelta(minutes=1)
+            async_track_point_in_time(
+                self.hass, self.async_update, dt_util.utcnow() + timedelta(minutes=1)
             )
             return
 
         for prayer, time in prayer_times.items():
             self.prayer_times_info[prayer] = dt_util.parse_datetime(
                 f"{dt_util.now().date()} {time}"
             )
-        self.schedule_future_update()
+        await self.async_schedule_future_update()
 
         _LOGGER.debug("New prayer times retrieved. Updating sensors.")
-        dispatcher_send(self.hass, DATA_UPDATED)
+        async_dispatcher_send(self.hass, DATA_UPDATED)
 
     async def async_setup(self):
         """Set up the Islamic prayer client."""
@@ -175,7 +179,7 @@ async def async_setup(self):
         except (exceptions.InvalidResponseError, ConnError):
             raise ConfigEntryNotReady
 
-        await self.hass.async_add_executor_job(self.update)
+        await self.async_update()
         self.config_entry.add_update_listener(self.async_options_updated)
 
         self.hass.async_create_task(
@@ -200,5 +204,5 @@ async def async_add_options(self):
     async def async_options_updated(hass, entry):
         """Triggered by config entry options updates."""
         if hass.data[DOMAIN].event_unsub:
-            await hass.async_add_executor_job(hass.data[DOMAIN].event_unsub)
-        await hass.async_add_executor_job(hass.data[DOMAIN].update)
+            hass.data[DOMAIN].event_unsub()
+        await hass.data[DOMAIN].async_update()

homeassistant/components/islamic_prayer_times/const.py

@@ -3,13 +3,10 @@
 NAME = "Islamic Prayer Times"
 SENSOR_SUFFIX = "Prayer"
 PRAYER_TIMES_ICON = "mdi:calendar-clock"
-ATTR_TIMESTAMP = "timestamp"
-TIME_STR_FORMAT = "%H:%M"
 
 SENSOR_TYPES = ["Fajr", "Sunrise", "Dhuhr", "Asr", "Maghrib", "Isha", "Midnight"]
 
 CONF_CALC_METHOD = "calc_method"
-CONF_SENSORS = "sensors"
 
 CALC_METHODS = ["isna", "karachi", "mwl", "makkah"]
 DEFAULT_CALC_METHOD = "isna"

homeassistant/components/islamic_prayer_times/sensor.py

@@ -1,18 +1,11 @@
 """Platform to retrieve Islamic prayer times information for Home Assistant."""
 import logging
 
+from homeassistant.const import DEVICE_CLASS_TIMESTAMP
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 
-from .const import (
-    ATTR_TIMESTAMP,
-    DATA_UPDATED,
-    DOMAIN,
-    PRAYER_TIMES_ICON,
-    SENSOR_SUFFIX,
-    SENSOR_TYPES,
-    TIME_STR_FORMAT,
-)
+from .const import DATA_UPDATED, DOMAIN, PRAYER_TIMES_ICON, SENSOR_SUFFIX, SENSOR_TYPES
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -36,7 +29,6 @@ def __init__(self, sensor_type, client):
         """Initialize the Islamic prayer time sensor."""
         self.sensor_type = sensor_type
         self.client = client
-        self._state = self.client.prayer_times_info.get(self.sensor_type)
 
     @property
     def name(self):
@@ -46,7 +38,7 @@ def name(self):
     @property
     def unique_id(self):
         """Return the unique id of the entity."""
-        return f"{DOMAIN}_{self.sensor_type}"
+        return self.sensor_type
 
     @property
     def icon(self):
@@ -56,19 +48,17 @@ def icon(self):
     @property
     def state(self):
         """Return the state of the sensor."""
-        return self._state.time().strftime(TIME_STR_FORMAT) if self._state else None
+        return self.client.prayer_times_info.get(self.sensor_type).isoformat()
 
     @property
     def should_poll(self):
         """Disable polling."""
         return False
 
     @property
-    def state_attributes(self):
-        """Return datetime as attribute."""
-        if self._state:
-            return {ATTR_TIMESTAMP: self._state}
-        return None
+    def device_class(self):
+        """Return the device class."""
+        return DEVICE_CLASS_TIMESTAMP
 
     async def async_added_to_hass(self):
         """Handle entity which will be added."""

tests/components/islamic_prayer_times/test_init.py

@@ -79,7 +79,9 @@ async def test_unload_entry(hass):
     ):
         await hass.config_entries.async_setup(entry.entry_id)
 
-        assert await islamic_prayer_times.async_unload_entry(hass, entry)
+        assert await hass.config_entries.async_unload(entry.entry_id)
+        await hass.async_block_till_done()
+        assert entry.state == config_entries.ENTRY_STATE_NOT_LOADED
         assert islamic_prayer_times.DOMAIN not in hass.data
 
 

tests/components/islamic_prayer_times/test_sensor.py

@@ -21,9 +21,8 @@ async def test_islamic_prayer_times_sensors(hass):
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
-        for prayer, time in PRAYER_TIMES.items():
-            assert hass.states.get(f"sensor.{prayer}_prayer").state == time
+        for prayer in PRAYER_TIMES:
             assert (
-                hass.states.get(f"sensor.{prayer}_prayer").attributes.get("timestamp")
-                == PRAYER_TIMES_TIMESTAMPS[prayer]
+                hass.states.get(f"sensor.{prayer}_prayer").state
+                == PRAYER_TIMES_TIMESTAMPS[prayer].isoformat()
             )