load canteen calendar only if there was no exception

rine77 · Dec 17, 2024 · dcea12a · dcea12a
1 parent b9dad9b
commit dcea12a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/custom_components/homeassistantedupage/__init__.py b/custom_components/homeassistantedupage/__init__.py
@@ -95,9 +95,15 @@ async def fetch_data():
                         timetable_data_canceled[current_date] = canceled_lessons
 
                 canteen_menu_data = {}
+                canteen_calendar_enabled = True
                 for offset in range(14):
                     current_date = today + timedelta(days=offset)
-                    lunch = await edupage.get_lunches(current_date)
+                    try:
+                        lunch = await edupage.get_lunches(current_date)
+                    except Exception as e:
+                        _LOGGER.error(f"Failed to fetch lunch data for {current_date}: {e}")
+                        lunch = None
+                        canteen_calendar_enabled = False
                     meals_to_add = []
                     if lunch is not None and lunch.menus is not None and len(lunch.menus) > 0:
                         _LOGGER.debug(f"Lunch for {current_date}: {lunch}")
@@ -115,6 +121,7 @@ async def fetch_data():
                     "subjects": subjects,
                     "timetable": timetable_data,
                     "canteen_menu": canteen_menu_data,
+                    "canteen_calendar_enabled": canteen_calendar_enabled,
                     "cancelled_lessons": timetable_data_canceled,
                     "notifications": notifications,
                 }

diff --git a/custom_components/homeassistantedupage/calendar.py b/custom_components/homeassistantedupage/calendar.py
@@ -19,12 +19,16 @@ async def async_setup_entry(hass, entry, async_add_entities: AddEntitiesCallback
 
     coordinator = hass.data[DOMAIN][entry.entry_id]
 
-    edupage_canteen_calendar = EdupageCanteenCalendar(coordinator, entry.data)
-    async_add_entities([edupage_canteen_calendar])
-
     edupage_calendar = EdupageCalendar(coordinator, entry.data)
     async_add_entities([edupage_calendar])
 
+    if coordinator.data.get("canteen_calendar_enabled", {}):
+        edupage_canteen_calendar = EdupageCanteenCalendar(coordinator, entry.data)
+        async_add_entities([edupage_canteen_calendar])
+        _LOGGER.debug("Canteen calendar added")
+    else:
+        _LOGGER.debug("Canteen calendar skipped, calendar disabled due to exceptions")
+
     _LOGGER.debug("CALENDAR async_setup_entry finished.")
 
 async def async_added_to_hass(self) -> None: