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

sharing/bday/trigger: disable by default, adjust fallback pattern

Browse Source
This commit is contained in:
Peter Bieringer
2026-05-29 18:05:56 +02:00
parent 7ce3459878
commit c54e41bccd
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DOCUMENTATION.md
View File

@@ -2323,7 +2323,7 @@ Supported placeholders (data used from VCARD)
* `{n:a}`: additional name (RFC6350#6.2.2) * `{n:a}`: additional name (RFC6350#6.2.2)
* `{nickname}`: nick name (RFC6350#6.2.3) * `{nickname}`: nick name (RFC6350#6.2.3)
Fallback is supported if placeholders inside `{...|...}` (first successful resolved one is used) Fallback is supported if placeholders inside `[...|...]` (first successful resolved one is used)
##### conversion_bday_description_template ##### conversion_bday_description_template

5
config
View File

@@ -357,13 +357,14 @@
#default_permissions_create_map = r #default_permissions_create_map = r
# Global template for summary of conversion "bday" # Global template for summary of conversion "bday"
#conversion_bday_summary_template = "{{n:f} {n:g} {n:a}|{fn}|{nickname}} (BDAY)" #conversion_bday_summary_template = "[{n:f} {n:g} {n:a}|{fn}|{nickname}] (BDAY)"
# Global template for description of conversion "bday" # Global template for description of conversion "bday"
#conversion_bday_description_template = "BDAY={year}-{month}-{day}" #conversion_bday_description_template = "BDAY={year}-{month}-{day}"
# Global template of alarm trigger of conversion "bday" # Global template of alarm trigger of conversion "bday"
#conversion_bday_alarm_trigger_template = "-15H;BDAY tomorrow|9H;BDAY today" # Example: "-15H;BDAY tomorrow|9H;BDAY today"
#conversion_bday_alarm_trigger_template = ""
[web] [web]

4
radicale/config.py
View File

@@ -595,7 +595,7 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
"help": "default permissions for map-based sharing", "help": "default permissions for map-based sharing",
"type": rights_permission}), "type": rights_permission}),
("conversion_bday_summary_template", { ("conversion_bday_summary_template", {
"value": "{{n:f} {n:g} {n:a}|{fn}|{nickname}} (BDAY)", "value": "[{n:f} {n:g} {n:a}|{fn}|{nickname}] (BDAY)",
"help": "conversion bday summary template", "help": "conversion bday summary template",
"type": str}), "type": str}),
("conversion_bday_description_template", { ("conversion_bday_description_template", {
@@ -603,7 +603,7 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
"help": "conversion bday description template", "help": "conversion bday description template",
"type": str}), "type": str}),
("conversion_bday_alarm_trigger_template", { ("conversion_bday_alarm_trigger_template", {
"value": "-15H;BDAY tomorrow|9H;BDAY today", "value": "",
"help": "conversion bday alarm trigger template", "help": "conversion bday alarm trigger template",
"type": str}), "type": str}),
])), ])),

10
radicale/item/__init__.py
View File

@@ -509,8 +509,8 @@ class Item:
text = text.replace(placeholder, placeholder_mapping[placeholder]) text = text.replace(placeholder, placeholder_mapping[placeholder])
# resolve {..|..} recursive # resolve {..|..} recursive
pattern = re.compile('(.*)({)([^|]+)\\|(.+)(})(.*)') pattern = re.compile('(.*)(\\[)([^|]+)\\|(.+)(\\])(.*)')
logger.trace("item/convert_vcf_to_ics: resolve {..|..} starting with: %r", text) logger.trace("item/convert_vcf_to_ics: resolve [..|..] starting with: %r", text)
while True: while True:
match = pattern.match(text) match = pattern.match(text)
if not match: if not match:
@@ -522,15 +522,15 @@ class Item:
if '|' in match[4]: if '|' in match[4]:
# further recursion required # further recursion required
text = match[1] + match[2] + match[4] + match[5] + match[6] text = match[1] + match[2] + match[4] + match[5] + match[6]
logger.trace("item/convert_vcf_to_ics: resolve {..|..} match/replace/continue result: %r", text) logger.trace("item/convert_vcf_to_ics: resolve [..|..] match/replace/continue result: %r", text)
else: else:
text = match[1] + match[4] + match[6] text = match[1] + match[4] + match[6]
logger.trace("item/convert_vcf_to_ics: resolve {..|..} match/replace/final result: %r", text) logger.trace("item/convert_vcf_to_ics: resolve [..|..] match/replace/final result: %r", text)
break break
else: else:
# resolved variable # resolved variable
text = match[1] + match[3] + match[6] text = match[1] + match[3] + match[6]
logger.trace("item/convert_vcf_to_ics: resolve {..|..} match/replace(resolved) result: %r", text) logger.trace("item/convert_vcf_to_ics: resolve [..|..] match/replace(resolved) result: %r", text)
return text return text
def trigger_to_timedelta(self, trigger) -> Union[datetime.timedelta, None]: def trigger_to_timedelta(self, trigger) -> Union[datetime.timedelta, None]: