Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Potential fix for issue #267 #268

Merged
merged 1 commit into from
Feb 14, 2023
Merged

Potential fix for issue #267 #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions caldav/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,16 +1058,13 @@ def search(

for o in objects:
if not o.data:
## TODO: all objects here should have data, unless the calendar server is breaking the caldav standard.
## Perhaps we should load missing data?
continue
components = o.vobject_instance.components()
for i in components:
if i.name in ("VEVENT", "VTODO"):
## Those recurrance properties should not be in the returns from the server,
## if they are present it indicates that server expand didn't work and we'll
## have to do it on the client side
recurrance_properties = ["exdate", "exrule", "rdate", "rrule"]
if any(key in recurrance_properties for key in i.contents):
o.expand_rrule(start, end)
component = o.icalendar_component
recurrance_properties = ["exdate", "exrule", "rdate", "rrule"]
if any(key in component for key in recurrance_properties):
o.expand_rrule(start, end)
if split_expanded:
objects_ = objects
objects = []
Expand Down