tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for bugs in VObject during filtering

Browse Source
This commit is contained in:
Unrud 2017-06-09 02:30:51 +02:00 committed by Unrud
parent db572e91f8
commit 12871fdcb3
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
radicale/storage.py
View File

@ -1034,8 +1034,19 @@ class Collection(BaseCollection):
ctext = vobject_item.serialize() ctext = vobject_item.serialize()
cetag = get_etag(ctext) cetag = get_etag(ctext)
try: try:
ctag, cstart, cend = xmlutils.find_tag_and_time_range( try:
vobject_item) ctag, cstart, cend = xmlutils.find_tag_and_time_range(
vobject_item)
except xmlutils.VObjectBugException as e:
# HACK: Extraction of metadata failed, because of bugs in
# VObject.
self.logger.warning(
"Failed to find tag and time range of item %r from %r "
"(Bug in VObject): %s", href, self.path, e,
exc_info=True)
ctag = xmlutils.find_tag(vobject_item)
cstart = xmlutils.TIMESTAMP_MIN
cend = xmlutils.TIMESTAMP_MAX
except Exception as e: except Exception as e:
raise RuntimeError("Failed to find tag and time range of item " raise RuntimeError("Failed to find tag and time range of item "
"%r from %r: %s" % (href, self.path, "%r from %r: %s" % (href, self.path,

25
radicale/xmlutils.py
View File

@ -579,6 +579,15 @@ def simplify_prefilters(filters):
return None, TIMESTAMP_MIN, TIMESTAMP_MAX, simple return None, TIMESTAMP_MIN, TIMESTAMP_MAX, simple
def find_tag(vobject_item):
"""Find tag from ``vobject_item``."""
if vobject_item.name == "VCALENDAR":
for component in vobject_item.components():
if component.name in ("VTODO", "VEVENT", "VJOURNAL"):
return component.name
return None
def find_tag_and_time_range(vobject_item): def find_tag_and_time_range(vobject_item):
"""Find tag and enclosing time range from ``vobject item``. """Find tag and enclosing time range from ``vobject item``.
@ -588,15 +597,9 @@ def find_tag_and_time_range(vobject_item):
This is intened to be used for matching against simplified prefilters. This is intened to be used for matching against simplified prefilters.
""" """
tag = "" tag = find_tag(vobject_item)
if vobject_item.name == "VCALENDAR":
for component in vobject_item.components():
if component.name in ("VTODO", "VEVENT", "VJOURNAL"):
tag = component.name
break
if not tag: if not tag:
return (None, math.floor(DATETIME_MIN.timestamp()), return (None, TIMESTAMP_MIN, TIMESTAMP_MAX)
math.ceil(DATETIME_MAX.timestamp()))
start = end = None start = end = None
def range_fn(range_start, range_end): def range_fn(range_start, range_end):
@ -1136,6 +1139,12 @@ def report(base_prefix, path, xml_request, collection):
if not all(match(item, filter_[0]) for filter_ in filters if not all(match(item, filter_[0]) for filter_ in filters
if filter_): if filter_):
continue continue
except VObjectBugException as e:
# HACK: Just return all items that can't be filtered because
# of bugs in VObject.
collection.logger.warning(
"Failed to filter item %r from %r (Bug in VObject): %s",
item.href, collection.path, e, exc_info=True)
except Exception as e: except Exception as e:
raise RuntimeError("Failed to filter item %r from %r: %s" % raise RuntimeError("Failed to filter item %r from %r: %s" %
(item.href, collection.path, e)) from e (item.href, collection.path, e)) from e