Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add: [report] max_expand_occurrence option to separate from max_freebusy_occurrence

Browse Source
This commit is contained in:
Peter Bieringer
2026-08-01 18:52:08 +02:00
parent 6cdf0e75b4
commit 4a4e571cce
6 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
radicale/app/report.py
View File

@@ -895,9 +895,9 @@ class ApplicationPartReport(ApplicationBase):
assert item.collection is not None
collection = item.collection
max_occurrence = self.configuration.get("reporting", "max_freebusy_occurrence")
if xml_content is not None and \
xml_content.tag == xmlutils.make_clark("C:free-busy-query"):
max_occurrence = self.configuration.get("reporting", "max_freebusy_occurrence")
try:
status, body = free_busy_report(
base_prefix, path, xml_content, collection, self._encoding,
@@ -909,6 +909,7 @@ class ApplicationPartReport(ApplicationBase):
headers = {"Content-Type": "text/calendar; charset=%s" % self._encoding}
return status, headers, str(body), xmlutils.pretty_xml(xml_content)
else:
max_occurrence = self.configuration.get("reporting", "max_expand_occurrence")
try:
status, xml_answer = xml_report(
base_prefix, path, xml_content, collection, self._encoding,

6
radicale/config.py
View File

@@ -813,9 +813,13 @@ This is an automated message. Please do not reply.""",
("headers", OrderedDict([
("_allow_extra", str)])),
("reporting", OrderedDict([
("max_expand_occurrence", {
"value": "10000",
"help": "number of expand occurrences per event when reporting",
"type": positive_int}),
("max_freebusy_occurrence", {
"value": "10000",
"help": "number of occurrences per event when reporting",
"help": "number of free-busy occurrences per event when reporting",
"type": positive_int})]))
])

4
radicale/tests/test_expand.py
View File

@@ -326,7 +326,7 @@ permissions: RrWw""")
def test_report_with_expand_property_max_occur(self) -> None:
"""Test report with expand property too many vevents"""
self.configure({"reporting": {"max_freebusy_occurrence": 100}})
self.configure({"reporting": {"max_expand_occurrence": 100}})
self._test_expand_max(
"event_daily_rrule_forever",
"20060103T000000Z",
@@ -336,7 +336,7 @@ permissions: RrWw""")
def test_report_with_max_occur(self) -> None:
"""Test report with too many vevents"""
self.configure({"reporting": {"max_freebusy_occurrence": 10}})
self.configure({"reporting": {"max_expand_occurrence": 10}})
uid = "event_multiple_too_many"
start = "20130901T000000Z"