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

Handle text-match filters

Browse Source 
Related to #33.
This commit is contained in:
Guillaume Ayoub 2016-05-18 20:21:03 +02:00
parent d063e3a370
commit 45576d7474
2 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
radicale/xmlutils.py
View File

@ -143,7 +143,7 @@ def _comp_match(item, filter_, scope="collection"):
return filter_.get("name") != tag
if filter_[0].tag == _tag("C", "time-range"):
# Point #3 of rfc4791-9.7.1
if not _time_range_match(item, filter_[0]):
if not _time_range_match(item, filter_):
return False
filter_.remove(filter_[0])
# Point #4 of rfc4791-9.7.1
@ -181,7 +181,18 @@ def _prop_match(item, filter_):
filter_.remove(filter_[0])
elif filter_[0].tag == _tag("C", "text-match"):
# Point #4 of rfc4791-9.7.2
if not _text_match(item, filter_[0]):
# TODO: collations are not supported, but the default ones needed for DAV
# servers are actually pretty useless. Texts are lowered to be
# case-insensitive, almost as the "i;ascii-casemap" value.
match = next(filter_[0].itertext()).lower()
value = vobject_item.getChildValue(filter_.get("name").lower())
if value is None:
return False
value = value.lower()
if filter_[0].get("negate-condition") == "yes":
if match in value:
return False
elif match not in value:
return False
filter_.remove(filter_[0])
return all(
@ -189,7 +200,7 @@ def _prop_match(item, filter_):
for param_filter in filter_)
def _time_range_match(item, _filter):
def _time_range_match(item, filter_):
"""Check whether the ``item`` matches the time-range ``filter_``.
See rfc4791-9.9.
@ -199,17 +210,15 @@ def _time_range_match(item, _filter):
return True
def _text_match(item, _filter):
def _text_match(vobject_item, filter_):
"""Check whether the ``item`` matches the text-match ``filter_``.
See rfc4791-9.7.3.
"""
# TODO: implement this
return True
def _param_filter_match(item, _filter):
def _param_filter_match(item, filter_):
"""Check whether the ``item`` matches the param-filter ``filter_``.
See rfc4791-9.7.3.

35
tests/test_base.py
View File

@ -216,6 +216,41 @@ class BaseRequests:
</C:comp-filter>
</C:comp-filter>"""])
def test_text_match_filter(self):
"""Report request with tag-based filter on calendar."""
assert "href>/calendar.ics/event.ics</" in self._test_filter(["""
<C:comp-filter name="VCALENDAR">
<C:comp-filter name="VEVENT">
<C:prop-filter name="SUMMARY">
<C:text-match>event</C:text-match>
</C:prop-filter>
</C:comp-filter>
</C:comp-filter>"""])
assert "href>/calendar.ics/event.ics</" not in self._test_filter(["""
<C:comp-filter name="VCALENDAR">
<C:comp-filter name="VEVENT">
<C:prop-filter name="UNKNOWN">
<C:text-match>event</C:text-match>
</C:prop-filter>
</C:comp-filter>
</C:comp-filter>"""])
assert "href>/calendar.ics/event.ics</" not in self._test_filter(["""
<C:comp-filter name="VCALENDAR">
<C:comp-filter name="VEVENT">
<C:prop-filter name="SUMMARY">
<C:text-match>unknown</C:text-match>
</C:prop-filter>
</C:comp-filter>
</C:comp-filter>"""])
assert "href>/calendar.ics/event.ics</" not in self._test_filter(["""
<C:comp-filter name="VCALENDAR">
<C:comp-filter name="VEVENT">
<C:prop-filter name="SUMMARY">
<C:text-match negate-condition="yes">event</C:text-match>
</C:prop-filter>
</C:comp-filter>
</C:comp-filter>"""])
class TestMultiFileSystem(BaseRequests, BaseTest):
"""Base class for filesystem tests."""