oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-15 20:36:55 +00:00
Code Wiki Activity

Revert time_range processing

Browse source
This commit is contained in:
Georgiy 2025-07-17 09:03:55 +03:00
parent 40217a1360
commit 76188c210e
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
radicale/app/report.py
View file

@ -228,18 +228,15 @@ def xml_report(base_prefix: str, path: str, xml_request: Optional[ET.Element],
expand = root.find(".//" + xmlutils.make_clark("C:expand")) expand = root.find(".//" + xmlutils.make_clark("C:expand"))
# if we have expand prop we use "filter (except time range) -> expand -> filter (only time range)" approach # if we have expand prop we use "filter (except time range) -> expand -> filter (only time range)" approach
vevent_time_range = None time_range_element = None
main_filters = [] main_filters = []
for filter_ in filters: for filter_ in filters:
if expand is not None: # extract time-range filter for processing after main filters
for comp_filter in filter_.findall(".//" + xmlutils.make_clark("C:comp-filter")): # for expand request
if comp_filter.get("name", "").upper() == "VEVENT": time_range_element = filter_.find(".//" + xmlutils.make_clark("C:time-range"))
vevent_time_range = comp_filter.find(".//" + xmlutils.make_clark("C:time-range"))
if vevent_time_range is not None:
comp_filter.remove(vevent_time_range)
break
main_filters.append(filter_) if expand is None or time_range_element is None:
main_filters.append(filter_)
# Extract requested component types from filters # Extract requested component types from filters
requested_components = set() requested_components = set()
@ -319,8 +316,8 @@ def xml_report(base_prefix: str, path: str, xml_request: Optional[ET.Element],
time_range_start = None time_range_start = None
time_range_end = None time_range_end = None
if vevent_time_range is not None: if time_range_element is not None:
time_range_start, time_range_end = radicale_filter.parse_time_range(vevent_time_range) time_range_start, time_range_end = radicale_filter.parse_time_range(time_range_element)
(expanded_element, n_vev) = _expand( (expanded_element, n_vev) = _expand(
element=element, item=copy.copy(item), element=element, item=copy.copy(item),