OEKZident.de/ovdashboard
2
0
Fork 0
Code Releases 1 Packages Activity

refac: deprecation fix

Browse source
This commit is contained in:
Jörn-Michael Miehe 2023-10-26 18:50:04 +02:00
parent 9551ee7729
commit 0a5f84eee5
2 changed files with 12 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
api/ovdashboard_api/core/caldav.py
View file

@ -3,8 +3,7 @@ from datetime import datetime, timedelta
from asyncify import asyncify from asyncify import asyncify
from cache import AsyncTTL from cache import AsyncTTL
from caldav import Calendar, DAVClient, Principal from caldav import Calendar, DAVClient, Event, Principal
from caldav.lib.error import ReportError
from vobject.base import Component from vobject.base import Component
from .calevent import CalEvent from .calevent import CalEvent
@ -28,7 +27,6 @@ class CalDAV:
Gets the `Principal` object of the main CalDAV client. Gets the `Principal` object of the main CalDAV client.
""" """
_logger.debug("principal")
return cls._caldav_client.principal() return cls._caldav_client.principal()
@classmethod @classmethod
@ -83,22 +81,13 @@ class CalDAV:
dt_start = datetime.combine(date_start, time_min) dt_start = datetime.combine(date_start, time_min)
dt_end = dt_start + search_span dt_end = dt_start + search_span
try: search_result = calendar.search(
search_result = calendar.date_search( start=dt_start,
start=dt_start, end=dt_end,
end=dt_end, expand=True,
expand=True, comp_class=Event,
verify_expand=True, split_expanded=False,
) )
except ReportError:
_logger.warning("CalDAV server does not support expanded search")
search_result = calendar.date_search(
start=dt_start,
end=dt_end,
expand=False,
)
vevents = [] vevents = []
for event in search_result: for event in search_result:

16
api/ovdashboard_api/routers/v1/_list_manager.py
View file

@ -7,9 +7,7 @@ from fastapi import Depends, HTTPException, params, status
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
_RESPONSE_OK = { _RESPONSE_OK = {
status.HTTP_200_OK: { status.HTTP_200_OK: {"description": "Operation successful"},
"description": "Operation successful",
},
} }
Params = ParamSpec("Params") Params = ParamSpec("Params")
@ -39,7 +37,7 @@ class ListManager:
if isinstance(names, params.Depends): if isinstance(names, params.Depends):
names = await lister.func() names = await lister.func()
_logger.debug("filter %s from %s", repr(prefix), repr(names)) # _logger.debug("filter %s from %s", repr(prefix), repr(names))
return [item for item in names if item.lower().startswith(prefix.lower())] return [item for item in names if item.lower().startswith(prefix.lower())]
@ -69,14 +67,8 @@ class ListManager:
func=_getter_fn, func=_getter_fn,
responses={ responses={
**_RESPONSE_OK, **_RESPONSE_OK,
status.HTTP_404_NOT_FOUND: { status.HTTP_404_NOT_FOUND: {"description": "Prefix not found"},
"description": "Prefix not found", status.HTTP_409_CONFLICT: {"description": "Ambiguous prefix"},
"content": None,
},
status.HTTP_409_CONFLICT: {
"description": "Ambiguous prefix",
"content": None,
},
}, },
), ),
) )