fix(calendar): Remove try/except in calendar API

nextcloud_mcp_server/client/calendar.py

@@ -46,7 +46,6 @@ class CalendarClient(BaseNextcloudClient):
             "Accept": "application/xml",
         }
 
-        try:
         response = await self._client.request(
             "PROPFIND", caldav_path, content=propfind_body, headers=headers
         )
@@ -93,21 +92,15 @@ class CalendarClient(BaseNextcloudClient):
             # Extract calendar properties
             displayname_elem = prop.find(".//{DAV:}displayname")
             displayname = (
-                    displayname_elem.text
+                displayname_elem.text if displayname_elem is not None else calendar_name
-                    if displayname_elem is not None
-                    else calendar_name
             )
 
             description_elem = prop.find(
                 ".//{urn:ietf:params:xml:ns:caldav}calendar-description"
             )
-                description = (
+            description = description_elem.text if description_elem is not None else ""
-                    description_elem.text if description_elem is not None else ""
-                )
 
-                color_elem = prop.find(
+            color_elem = prop.find(".//{http://calendarserver.org/ns/}calendar-color")
-                    ".//{http://calendarserver.org/ns/}calendar-color"
-                )
             color = color_elem.text if color_elem is not None else "#1976D2"
 
             calendars.append(
@@ -123,23 +116,6 @@ class CalendarClient(BaseNextcloudClient):
         logger.debug(f"Found {len(calendars)} calendars")
         return calendars
 
-        except HTTPStatusError as e:
-            if e.response.status_code == 401:
-                logger.warning(
-                    "Authentication failed for CalDAV - Calendar app may not be enabled for this user"
-                )
-                return []
-            elif e.response.status_code == 404:
-                logger.warning(
-                    "CalDAV endpoint not found - Calendar app may not be installed"
-                )
-                return []
-            logger.error(f"HTTP error listing calendars: {e}")
-            raise e
-        except Exception as e:
-            logger.error(f"Unexpected error listing calendars: {e}")
-            raise e
-
     async def get_calendar_events(
         self,
         calendar_name: str,
@@ -180,11 +156,9 @@ class CalendarClient(BaseNextcloudClient):
             "Accept": "application/xml",
         }
 
-        try:
+        response = await self._make_request(
-            response = await self._client.request(
             "REPORT", calendar_path, content=report_body, headers=headers
         )
-            response.raise_for_status()
 
         # Parse XML response and extract events
         root = ET.fromstring(response.content)
@@ -203,18 +177,14 @@ class CalendarClient(BaseNextcloudClient):
             if prop is None:
                 continue
 
-                calendar_data = prop.find(
+            calendar_data = prop.find(".//{urn:ietf:params:xml:ns:caldav}calendar-data")
-                    ".//{urn:ietf:params:xml:ns:caldav}calendar-data"
-                )
             etag_elem = prop.find(".//{DAV:}getetag")
 
             if calendar_data is not None and calendar_data.text:
                 event_data = self._parse_ical_event(calendar_data.text)
                 if event_data:
                     event_data["href"] = href.text
-                        event_data["etag"] = (
+                    event_data["etag"] = etag_elem.text if etag_elem is not None else ""
-                            etag_elem.text if etag_elem is not None else ""
-                        )
                     events.append(event_data)
 
             if len(events) >= limit:
@@ -223,13 +193,6 @@ class CalendarClient(BaseNextcloudClient):
         logger.debug(f"Found {len(events)} events")
         return events
 
-        except HTTPStatusError as e:
-            logger.error(f"HTTP error getting calendar events: {e}")
-            raise e
-        except Exception as e:
-            logger.error(f"Unexpected error getting calendar events: {e}")
-            raise e
-
     async def create_event(
         self, calendar_name: str, event_data: Dict[str, Any]
     ) -> Dict[str, Any]:
@@ -246,11 +209,9 @@ class CalendarClient(BaseNextcloudClient):
             "If-None-Match": "*",  # Ensure we're creating, not updating
         }
 
-        try:
+        response = await self._make_request(
-            response = await self._client.put(
+            "PUT", event_path, content=ical_content, headers=headers
-                event_path, content=ical_content, headers=headers
         )
-            response.raise_for_status()
 
         logger.debug(f"Created event {event_uid}")
         return {
@@ -260,13 +221,6 @@ class CalendarClient(BaseNextcloudClient):
             "status_code": response.status_code,
         }
 
-        except HTTPStatusError as e:
-            logger.error(f"HTTP error creating event: {e}")
-            raise e
-        except Exception as e:
-            logger.error(f"Unexpected error creating event: {e}")
-            raise e
-
     async def update_event(
         self,
         calendar_name: str,
@@ -303,10 +257,9 @@ class CalendarClient(BaseNextcloudClient):
             headers["If-Match"] = etag
 
         try:
-            response = await self._client.put(
+            response = await self._make_request(
-                event_path, content=ical_content, headers=headers
+                "PUT", event_path, content=ical_content, headers=headers
             )
-            response.raise_for_status()
 
             logger.debug(f"Updated event {event_uid}")
             return {
@@ -329,8 +282,7 @@ class CalendarClient(BaseNextcloudClient):
         event_path = f"{self._get_caldav_base_path()}/{calendar_name}/{event_filename}"
 
         try:
-            response = await self._client.delete(event_path)
+            response = await self._make_request("DELETE", event_path)
-            response.raise_for_status()
 
             logger.debug(f"Deleted event {event_uid}")
             return {"status_code": response.status_code}
@@ -355,8 +307,7 @@ class CalendarClient(BaseNextcloudClient):
         headers = {"Accept": "text/calendar"}
 
         try:
-            response = await self._client.get(event_path, headers=headers)
+            response = await self._make_request("GET", event_path, headers=headers)
-            response.raise_for_status()
 
             etag = response.headers.get("etag", "")
             event_data = self._parse_ical_event(response.text)
@@ -943,10 +894,9 @@ class CalendarClient(BaseNextcloudClient):
 
             headers = {"Content-Type": "application/xml", "Depth": "0"}
 
-            response = await self._client.request(
+            response = await self._make_request(
                 "MKCALENDAR", calendar_path, content=mkcol_body, headers=headers
             )
-            response.raise_for_status()
 
             logger.debug(f"Created calendar: {calendar_name}")
             return {
@@ -966,8 +916,7 @@ class CalendarClient(BaseNextcloudClient):
         try:
             calendar_path = f"{self._get_caldav_base_path()}/{calendar_name}/"
 
-            response = await self._client.delete(calendar_path)
+            response = await self._make_request("DELETE", calendar_path)
-            response.raise_for_status()
 
             logger.debug(f"Deleted calendar: {calendar_name}")
             return {"status_code": response.status_code}