-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from zubir2k/beta
0.2.0
- Loading branch information
Showing
6 changed files
with
395 additions
and
142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| ## ⌚ Dynamic Prayer Time Card | ||
|
|
||
|  | ||
|
|
||
| 1. Edit your current dashboard. | ||
| 2. Add a new Markdown card.  | ||
| 3. Copy below markdown. | ||
| 4. Save | ||
|
|
||
| ```markdown | ||
| > Today is</b><br /><font size=7>{{ now().strftime('%I:%M %p') }}<br />{{ now().strftime('%A') }}</font> | ||
| <font size=2>{{ now().strftime('%d %B %Y') }} | {{ state_attr('sensor.esolatnow','hijri') }}</font> | ||
| {% set esolat = namespace(array=state_attr('sensor.esolatnow', 'array')) %} | ||
| {% for person in states.person | selectattr('name', 'eq', user) %} | ||
| {% set userid = person.entity_id | replace('person.', '') | replace(' ', '_') %} | ||
| {% set esolat_sensor = 'sensor.esolat_' ~ userid %} | ||
| {% if states(esolat_sensor) == 'unknown' or not esolat.array.get(userid) or person.state == 'home' %} | ||
| <ha-alert alert-type="info"><b>Waktu Sekarang: </b>{{ esolat.array.get('home').current }} - {{ as_timestamp(esolat.array.get('home').datetime) | timestamp_custom('%I:%M %p') }}<br /><b>Waktu Berikutnya: </b>{{ esolat.array.get('home').next }}</ha-alert> | ||
| <table align=center width=100%> | ||
| <tr align=center> | ||
| <td>Subuh</td> | ||
| <td>Zohor</td> | ||
| <td>Asar</td> | ||
| <td>Maghrib</td> | ||
| <td>Isyak</td> | ||
| </tr> | ||
| <tr align=center> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| </tr> | ||
| <tr align=center> | ||
| <td>{{ state_attr('sensor.esolat_home', 'subuh_12h') }}</td> | ||
| <td>{{ state_attr('sensor.esolat_home', 'zohor_12h') }}</td> | ||
| <td>{{ state_attr('sensor.esolat_home', 'asar_12h') }}</td> | ||
| <td>{{ state_attr('sensor.esolat_home', 'maghrib_12h') }}</td> | ||
| <td>{{ state_attr('sensor.esolat_home', 'isyak_12h') }}</td> | ||
| </tr> | ||
| <tr><ha-alert alert-type="info">Location: <b>Home</b> 🏠</ha-alert></tr> | ||
| {% else %} | ||
| <ha-alert alert-type="info"><b>Waktu Sekarang: </b>{{ esolat.array.get(userid).current }} - {{ as_timestamp(esolat.array.get(userid).datetime) | timestamp_custom('%I:%M %p') }}<br /><b>Waktu Berikutnya: </b>{{ esolat.array.get(userid).next }}</ha-alert> | ||
| <table align=center width=100%> | ||
| <tr align=center> | ||
| <td>Subuh</td> | ||
| <td>Zohor</td> | ||
| <td>Asar</td> | ||
| <td>Maghrib</td> | ||
| <td>Isyak</td> | ||
| </tr> | ||
| <tr align=center> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| <td><ha-icon icon="mdi:star-crescent"></ha-icon></td> | ||
| </tr> | ||
| <tr align=center> | ||
| <td>{{ state_attr(esolat_sensor, 'subuh_12h') }}</td> | ||
| <td>{{ state_attr(esolat_sensor, 'zohor_12h') }}</td> | ||
| <td>{{ state_attr(esolat_sensor, 'asar_12h') }}</td> | ||
| <td>{{ state_attr(esolat_sensor, 'maghrib_12h') }}</td> | ||
| <td>{{ state_attr(esolat_sensor, 'isyak_12h') }}</td> | ||
| </tr> | ||
| <tr><ha-alert alert-type="info"><b>Location: </b>{{ userid }}</ha-alert></tr> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </table> | ||
|
|
||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| import logging | ||
| import aiohttp | ||
| from datetime import datetime, timedelta | ||
| from zoneinfo import ZoneInfo | ||
| from homeassistant.helpers.update_coordinator import DataUpdateCoordinator | ||
| from homeassistant.core import HomeAssistant | ||
| from homeassistant.config_entries import ConfigEntry | ||
| from homeassistant.helpers import entity_registry | ||
| from .const import PRAYER_NAMES | ||
|
|
||
| _LOGGER = logging.getLogger(__name__) | ||
|
|
||
| class EsolatGPSCoordinator(DataUpdateCoordinator): | ||
| def __init__(self, hass: HomeAssistant, entry: ConfigEntry): | ||
| """Initialize the coordinator with the user-configured scan interval.""" | ||
| super().__init__( | ||
| hass, | ||
| _LOGGER, | ||
| name="eSolat GPS", | ||
| update_interval=timedelta(minutes=entry.data.get("scan_interval", 15)), | ||
| ) | ||
| self.url = "https://mpt.i906.my/api/prayer/" | ||
| self.geo = "https://nominatim.openstreetmap.org/reverse?format=json&" | ||
| self._tracked_entities = set() | ||
|
|
||
| async def _async_update_data(self): | ||
| """Fetch data from API.""" | ||
| async with aiohttp.ClientSession() as session: | ||
| data = {} | ||
| current_entities = set() | ||
|
|
||
| for entity_id in self.hass.states.async_entity_ids("person"): | ||
| entity = self.hass.states.get(entity_id) | ||
| latitude = entity.attributes.get("latitude") | ||
| longitude = entity.attributes.get("longitude") | ||
| if latitude and longitude: | ||
| current_entities.add(entity_id) | ||
| data[entity_id] = await self._fetch_prayer_times(session, latitude, longitude, entity_id) | ||
| else: | ||
| _LOGGER.info(f"Skipping {entity_id} as it lacks GPS coordinates.") | ||
|
|
||
| # Home zone processing | ||
| home = self.hass.states.get("zone.home") | ||
| home_latitude = home.attributes.get("latitude") | ||
| home_longitude = home.attributes.get("longitude") | ||
| data["zone.home"] = await self._fetch_prayer_times(session, home_latitude, home_longitude, "zone.home") | ||
| current_entities.add("zone.home") | ||
|
|
||
| # Cleanup stale entities | ||
| entities_to_remove = self._tracked_entities - current_entities | ||
| self._tracked_entities = current_entities | ||
|
|
||
| if entities_to_remove: | ||
| self.hass.async_create_task(self._remove_stale_entities(entities_to_remove)) | ||
|
|
||
| return data | ||
|
|
||
| async def fetch_hijri_date(self): | ||
| """Fetch Hijri date from API.""" | ||
| url = "https://www.e-solat.gov.my/index.php" | ||
| params = { | ||
| "r": "esolatApi/tarikhtakwim", | ||
| "period": "today", | ||
| "datetype": "miladi" | ||
| } | ||
|
|
||
| try: | ||
| async with aiohttp.ClientSession() as session: | ||
| async with session.get(url, params=params) as response: | ||
| if response.status == 200: | ||
| data = await response.json() | ||
| hijri_date = next(iter(data["takwim"].values())) | ||
| parts = hijri_date.split('-') | ||
| day = parts[2] | ||
| month_number = int(parts[1]) - 1 | ||
| year = parts[0] | ||
|
|
||
| months = [ | ||
| "Muharram", "Safar", "Rabi'ul Awwal", "Rabi'ul Akhir", | ||
| "Jamadil Awwal", "Jamadil Akhir", "Rejab", "Sha'aban", | ||
| "Ramadhan", "Syawal", "Zulkaedah", "Zulhijjah" | ||
| ] | ||
|
|
||
| return f"{day} {months[month_number]} {year}" | ||
| else: | ||
| _LOGGER.error(f"Failed to fetch Hijri date: HTTP {response.status}") | ||
| return "unavailable" | ||
| except aiohttp.ClientError as e: | ||
| _LOGGER.error(f"Client error fetching Hijri date: {e}") | ||
| return "unavailable" | ||
| except Exception as e: | ||
| _LOGGER.error(f"Unexpected error fetching Hijri date: {e}") | ||
| return "unavailable" | ||
|
|
||
| async def _remove_stale_entities(self, entities_to_remove): | ||
| """Remove entities that no longer have GPS coordinates.""" | ||
| ent_reg = entity_registry.async_get(self.hass) | ||
| for entity_id in entities_to_remove: | ||
| entity_name = entity_id.split('.')[1] | ||
| sensor_id = f"sensor.esolat_{entity_name}" | ||
| if ent_reg.async_get(sensor_id): # Check if entity exists before removing | ||
| _LOGGER.info(f"Removing stale entity {sensor_id} due to missing GPS coordinates") | ||
| ent_reg.async_remove(sensor_id) | ||
|
|
||
| async def _fetch_prayer_times(self, session, latitude, longitude, entity_id): | ||
| """Fetch prayer times from the API and handle out-of-country cases.""" | ||
| today = datetime.now(ZoneInfo("Asia/Kuala_Lumpur")).date() | ||
| day_index = 0 if today.day == 1 else today.day - 1 | ||
|
|
||
| try: | ||
| async with session.get(f"{self.url}{latitude},{longitude}") as response: | ||
| if response.status == 404: | ||
| async with session.get(f"{self.geo}lat={latitude}&lon={longitude}") as geo_response: | ||
| geodata = await geo_response.json() | ||
| geostate = geodata["address"]["state"] | ||
| geocountry = geodata["address"]["country_code"].upper() | ||
| return { | ||
| "state": "Outside Malaysia", | ||
| "attributes": { | ||
| "location": f"{geostate}, {geocountry}", | ||
| "gps": f"{latitude},{longitude}" | ||
| } | ||
| } | ||
| elif response.status == 200: | ||
| data = await response.json() | ||
| prayer_times_data = data["data"]["times"][day_index] | ||
| prayer_times = {} | ||
|
|
||
| for i, prayer_name in enumerate(PRAYER_NAMES): | ||
| prayer_time = prayer_times_data[i] | ||
| utc_prayer_time = self.timestamp_to_utc(prayer_time).astimezone(ZoneInfo("UTC")) | ||
| prayer_times[prayer_name.lower()] = utc_prayer_time.isoformat() | ||
| prayer_times[f"{prayer_name.lower()}_12h"] = self.convert_to_local_12time(prayer_time) | ||
| prayer_times[f"{prayer_name.lower()}_24h"] = self.convert_to_local_24time(prayer_time) | ||
|
|
||
| # Additional times: Imsak, Isyraq, Dhuha | ||
| if prayer_name.lower() == "subuh": | ||
| imsak_time = utc_prayer_time - timedelta(minutes=10) | ||
| prayer_times["imsak"] = imsak_time.isoformat() | ||
| prayer_times["imsak_12h"] = self.convert_to_local_12time(imsak_time.timestamp()) | ||
| prayer_times["imsak_24h"] = self.convert_to_local_24time(imsak_time.timestamp()) | ||
|
|
||
| if prayer_name.lower() == "syuruk": | ||
| isyraq_time = utc_prayer_time + timedelta(minutes=12) | ||
| dhuha_time = utc_prayer_time + timedelta(minutes=15) | ||
| prayer_times["isyraq"] = isyraq_time.isoformat() | ||
| prayer_times["isyraq_12h"] = self.convert_to_local_12time(isyraq_time.timestamp()) | ||
| prayer_times["isyraq_24h"] = self.convert_to_local_24time(isyraq_time.timestamp()) | ||
| prayer_times["dhuha"] = dhuha_time.isoformat() | ||
| prayer_times["dhuha_12h"] = self.convert_to_local_12time(dhuha_time.timestamp()) | ||
| prayer_times["dhuha_24h"] = self.convert_to_local_24time(dhuha_time.timestamp()) | ||
|
|
||
| return { | ||
| "state": data["data"]["place"], | ||
| "attributes": {"gps": f"{latitude},{longitude}", **prayer_times} | ||
| } | ||
| else: | ||
| _LOGGER.error(f"Error retrieving prayer times for {entity_id}: Status {response.status}") | ||
| return { | ||
| "state": "unavailable", | ||
| "attributes": { | ||
| "location": f"ERROR CODE:{response.status}", | ||
| "gps": f"{latitude},{longitude}" | ||
| } | ||
| } | ||
| except aiohttp.ClientError as e: | ||
| _LOGGER.error(f"Client error retrieving prayer times for {entity_id}: {e}") | ||
| return { | ||
| "state": "unavailable", | ||
| "attributes": { | ||
| "location": "Client error", | ||
| "gps": f"{latitude},{longitude}" | ||
| } | ||
| } | ||
| except Exception as e: | ||
| _LOGGER.error(f"Unexpected error retrieving prayer times for {entity_id}: {e}") | ||
| return { | ||
| "state": "unavailable", | ||
| "attributes": { | ||
| "location": "Unexpected error", | ||
| "gps": f"{latitude},{longitude}" | ||
| } | ||
| } | ||
|
|
||
| @staticmethod | ||
| def timestamp_to_utc(timestamp): | ||
| return datetime.fromtimestamp(timestamp, ZoneInfo("UTC")) | ||
|
|
||
| @staticmethod | ||
| def convert_to_local_12time(time): | ||
| dt = datetime.fromtimestamp(time, ZoneInfo("Asia/Kuala_Lumpur")) | ||
| return dt.strftime("%-I:%M %p") | ||
|
|
||
| @staticmethod | ||
| def convert_to_local_24time(time): | ||
| dt = datetime.fromtimestamp(time, ZoneInfo("Asia/Kuala_Lumpur")) | ||
| return dt.strftime("%H:%M:%S") | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.