Use library for calendar merging

It's functionally the same code, but could add some enhancements in future

Author: RealOrangeOne

calmerge/calendars.py

@@ -6,11 +6,14 @@
 import icalendar
 from aiocache import Cache
 from aiohttp import ClientSession
+from mergecal import merge_calendars
 
 from .config import CalendarConfig
 
 fetch_cache = Cache(Cache.MEMORY, ttl=3600)
 
+PRODID = "-//Torchbox//Calmerge//EN"
+
 
 async def fetch_calendar(session: ClientSession, url: str) -> icalendar.Calendar:
     cache_key = "calendar_" + url
@@ -25,17 +28,15 @@ async def fetch_calendar(session: ClientSession, url: str) -> icalendar.Calendar
 
 
 async def fetch_merged_calendar(calendar_config: CalendarConfig) -> icalendar.Calendar:
-    merged_calendar = icalendar.Calendar()
+    calendars = []
 
     async with ClientSession() as session:
-        calendars = [fetch_calendar(session, str(url)) for url in calendar_config.urls]
-
-        for coro in asyncio.as_completed(calendars):
-            calendar = await coro
-            for component in calendar.walk("VEVENT"):
-                merged_calendar.add_component(component)
+        for coro in asyncio.as_completed(
+            [fetch_calendar(session, str(url)) for url in calendar_config.urls]
+        ):
+            calendars.append(await coro)
 
-    return merged_calendar
+    return merge_calendars(calendars, prodid=PRODID)
 
 
 def shift_event_by_offset(event: icalendar.cal.Component, offset: timedelta) -> None:

poetry.lock

@@ -10,11 +10,12 @@ readme = "README.md"
 python = "^3.11"
 aiohttp = "^3.9.3"
 pydantic = "^2.6.4"
-icalendar = "^5.0.11"
+icalendar = "^6"
 aiocache = "^0.12.2"
 aiohttp-jinja2 = "^1.6"
 
 aiohttp-remotes = "^1.2.0"
+mergecal = "^0.3.6"
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.3.2"
 pytest = "^8.1.1"

pyproject.toml

@@ -10,7 +10,7 @@ async def test_retrieves_calendars(client: TestClient) -> None:
     assert response.status == 200
 
     calendar = icalendar.Calendar.from_ical(await response.text())
-    assert not calendar.is_broken
+    assert calendar.errors == []
 
     assert calendar["X-WR-CALNAME"] == "Python"
     assert calendar["X-WR-CALDESC"] == "Python EOL"
@@ -37,7 +37,7 @@ async def test_requires_auth(client: TestClient) -> None:
     assert response.status == 200
 
     calendar = icalendar.Calendar.from_ical(await response.text())
-    assert not calendar.is_broken
+    assert calendar.errors == []
 
 
 async def test_offset(client: TestClient) -> None:
@@ -47,8 +47,8 @@ async def test_offset(client: TestClient) -> None:
     original_response = await client.get("/python.ics")
     original_calendar = icalendar.Calendar.from_ical(await original_response.text())
 
-    assert not offset_calendar.is_broken
-    assert not original_calendar.is_broken
+    assert offset_calendar.errors == []
+    assert original_calendar.errors == []
 
     assert (
         len(offset_calendar.walk("VEVENT")) == len(original_calendar.walk("VEVENT")) * 2

tests/test_calendar_view.py

@@ -26,4 +26,4 @@ def test_write_config(tmp_path: Path, config: Config, config_path: Path) -> None
         assert calendar_path.is_file()
 
         calendar = icalendar.Calendar.from_ical(calendar_path.read_text())
-        assert not calendar.is_broken
+        assert calendar.errors == []