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

item/log: replace legacy trace log

Browse Source
This commit is contained in:
Peter Bieringer
2026-04-08 21:43:01 +02:00
parent 893970b52a
commit 41b21f081f
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
radicale/item/__init__.py
View File

@@ -27,7 +27,6 @@ Module for address books and calendar entries (see ``Item``).
import binascii import binascii
import contextlib import contextlib
import datetime import datetime
import logging
import math import math
import os import os
import re import re
@@ -506,32 +505,26 @@ class Item:
self._vobject_item = orig_vobject_item self._vobject_item = orig_vobject_item
def convert_vcf_to_ics(self) -> Union["Item", None]: def convert_vcf_to_ics(self) -> Union["Item", None]:
if logger.isEnabledFor(logging.DEBUG): logger.trace("item/convert_vcf_to_ics: convert VCF to ICS (href): %r", self.href)
logger.debug("TRACE/item/convert_vcf_to_ics: convert VCF to ICS (href): %r", self.href) logger.trace("item/convert_vcf_to_ics: convert VCF to ICS (vobject): %r", self.vobject_item)
logger.debug("TRACE/item/convert_vcf_to_ics: convert VCF to ICS (vobject): %r", self.vobject_item)
if self.vobject_item.name != "VCARD": if self.vobject_item.name != "VCARD":
if logger.isEnabledFor(logging.DEBUG): logger.trace("item/convert_vcf_to_ics: item is not a VCARD (skip): %r", self.href)
logger.debug("TRACE/item/convert_vcf_to_ics: item is not a VCARD (skip): %r", self.href)
return None return None
else: else:
if logger.isEnabledFor(logging.DEBUG): logger.trace("item/convert_vcf_to_ics: item is a VCARD (ok): %r", self.href)
logger.debug("TRACE/item/convert_vcf_to_ics: item is a VCARD (ok): %r", self.href)
if not hasattr(self.vobject_item, "bday"): if not hasattr(self.vobject_item, "bday"):
if logger.isEnabledFor(logging.DEBUG): logger.trace("item/convert_vcf_to_ics: miss bday (skip): %r", self.href)
logger.debug("TRACE/item/convert_vcf_to_ics: miss bday (skip): %r", self.href)
return None return None
else: else:
pass pass
bday = self.vobject_item.bday bday = self.vobject_item.bday
if logger.isEnabledFor(logging.DEBUG): logger.trace("item/convert_vcf_to_ics: has bday (ok): %r -> %r", self.href, bday.value)
logger.debug("TRACE/item/convert_vcf_to_ics: has bday (ok): %r -> %r", self.href, bday.value)
pattern = re.compile('^([0-9]{4})-?([0-9]{2})-?([0-9]{2})$') pattern = re.compile('^([0-9]{4})-?([0-9]{2})-?([0-9]{2})$')
match = pattern.match(bday.value) match = pattern.match(bday.value)
if not match: if not match:
if logger.isEnabledFor(logging.DEBUG): logger.trace("item/convert_vcf_to_ics: has unsupported bday: %r -> %r", self.href, bday.value)
logger.debug("TRACE/item/convert_vcf_to_ics: has unsupported bday: %r -> %r", self.href, bday.value)
return None return None
else: else:
pass pass
@@ -550,8 +543,7 @@ class Item:
elif hasattr(self.vobject_item, "nickname"): elif hasattr(self.vobject_item, "nickname"):
name = self.vobject_item.nickname.value name = self.vobject_item.nickname.value
else: else:
if logger.isEnabledFor(logging.DEBUG): logger.trace("item/convert_vcf_to_ics: has bday but neither FN or N or NICKNAME (skip): %r", self.href)
logger.debug("TRACE/item/convert_vcf_to_ics: has bday but neither FN or N or NICKNAME (skip): %r", self.href)
return None return None
# create VCALENDAR # create VCALENDAR
@@ -612,10 +604,9 @@ class Item:
href=href, href=href,
vobject_item=item_ics) vobject_item=item_ics)
if logger.isEnabledFor(logging.DEBUG): logger.trace("storage: item generated/vobject: %r", item_ics.serialize())
logger.debug("TRACE/storage: item generated/vobject: %r", item_ics.serialize()) logger.trace("storage: item orig /etag : %r", self.etag)
logger.debug("TRACE/storage: item orig /etag : %r", self.etag) logger.trace("storage: item generated/etag : %r", item_new.etag)
logger.debug("TRACE/storage: item generated/etag : %r", item_new.etag) logger.trace("storage: item generated/href : %r", item_new.href)
logger.debug("TRACE/storage: item generated/href : %r", item_new.href)
return item_new return item_new