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

Refactor allprop and propname for PROPFIND requests

Browse Source
This commit is contained in:
Unrud 2017-09-17 14:04:01 +02:00
parent f72b065d8a
commit 24b5e98922
1 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
radicale/xmlutils.py
View File

@ -779,17 +779,12 @@ def propfind(base_prefix, path, xml_request, read_collections,
ET.Element(_tag("D", "allprop"))) ET.Element(_tag("D", "allprop")))
props = () props = ()
allprop = False
propname = False
if top_tag.tag == _tag("D", "allprop"): if top_tag.tag == _tag("D", "allprop"):
props = [ allprop = True
_tag("D", "getcontenttype"), elif top_tag.tag == _tag("D", "propname"):
_tag("D", "resourcetype"), propname = True
_tag("D", "displayname"),
_tag("D", "owner"),
_tag("D", "getetag"),
_tag("CS", "getctag"),
_tag("C", "supported-calendar-component-set"),
_tag("D", "supported-report-set"),
]
elif top_tag.tag == _tag("D", "prop"): elif top_tag.tag == _tag("D", "prop"):
props = [prop.tag for prop in top_tag] props = [prop.tag for prop in top_tag]
@ -805,25 +800,17 @@ def propfind(base_prefix, path, xml_request, read_collections,
collections = [] collections = []
for collection in write_collections: for collection in write_collections:
collections.append(collection) collections.append(collection)
if top_tag.tag == _tag("D", "propname"): response = _propfind_response(
response = _propfind_response( base_prefix, path, collection, props, user, write=True,
base_prefix, path, collection, (), user, write=True, allprop=allprop, propname=propname)
propnames=True)
else:
response = _propfind_response(
base_prefix, path, collection, props, user, write=True)
if response: if response:
multistatus.append(response) multistatus.append(response)
for collection in read_collections: for collection in read_collections:
if collection in collections: if collection in collections:
continue continue
if top_tag.tag == _tag("D", "propname"): response = _propfind_response(
response = _propfind_response( base_prefix, path, collection, props, user, write=False,
base_prefix, path, collection, (), user, write=False, allprop=allprop, propname=propname)
propnames=True)
else:
response = _propfind_response(
base_prefix, path, collection, props, user, write=False)
if response: if response:
multistatus.append(response) multistatus.append(response)
@ -831,8 +818,10 @@ def propfind(base_prefix, path, xml_request, read_collections,
def _propfind_response(base_prefix, path, item, props, user, write=False, def _propfind_response(base_prefix, path, item, props, user, write=False,
propnames=False): propname=False, allprop=False):
"""Build and return a PROPFIND response.""" """Build and return a PROPFIND response."""
if propname and allprop or (props and (propname or allprop)):
raise ValueError("Only use one of props, propname and allprops")
is_collection = isinstance(item, storage.BaseCollection) is_collection = isinstance(item, storage.BaseCollection)
if is_collection: if is_collection:
is_leaf = item.get_meta("tag") in ("VADDRESSBOOK", "VCALENDAR") is_leaf = item.get_meta("tag") in ("VADDRESSBOOK", "VCALENDAR")
@ -862,33 +851,48 @@ def _propfind_response(base_prefix, path, item, props, user, write=False,
prop404 = ET.Element(_tag("D", "prop")) prop404 = ET.Element(_tag("D", "prop"))
propstat404.append(prop404) propstat404.append(prop404)
if propnames: if propname or allprop:
props = []
# Should list all properties that can be retrieved by the code below # Should list all properties that can be retrieved by the code below
prop200.append(ET.Element(_tag("D", "getetag"))) props.append(_tag("D", "principal-collection-set"))
prop200.append(ET.Element(_tag("D", "principal-URL"))) props.append(_tag("D", "current-user-principal"))
prop200.append(ET.Element(_tag("D", "principal-collection-set"))) props.append(_tag("D", "current-user-privilege-set"))
prop200.append(ET.Element(_tag("C", "calendar-user-address-set"))) props.append(_tag("D", "supported-report-set"))
prop200.append(ET.Element(_tag("CR", "addressbook-home-set"))) props.append(_tag("D", "resourcetype"))
prop200.append(ET.Element(_tag("C", "calendar-home-set"))) props.append(_tag("D", "owner"))
prop200.append(ET.Element(
_tag("C", "supported-calendar-component-set"))) if is_collection and collection.is_principal:
prop200.append(ET.Element(_tag("D", "current-user-privilege-set"))) props.append(_tag("C", "calendar-user-address-set"))
prop200.append(ET.Element(_tag("D", "supported-report-set"))) props.append(_tag("D", "principal-URL"))
prop200.append(ET.Element(_tag("D", "getcontenttype"))) props.append(_tag("CR", "addressbook-home-set"))
prop200.append(ET.Element(_tag("D", "resourcetype"))) props.append(_tag("C", "calendar-home-set"))
if not is_collection or is_leaf:
props.append(_tag("D", "getetag"))
props.append(_tag("D", "getlastmodified"))
props.append(_tag("D", "getcontenttype"))
props.append(_tag("D", "getcontentlength"))
if is_collection: if is_collection:
prop200.append(ET.Element(_tag("CS", "getctag")))
prop200.append(ET.Element(_tag("D", "sync-token")))
prop200.append(ET.Element(_tag("D", "displayname")))
prop200.append(ET.Element(_tag("D", "owner")))
if is_leaf: if is_leaf:
meta = item.get_meta() props.append(_tag("D", "displayname"))
for tag in meta: props.append(_tag("D", "sync-token"))
clark_tag = _tag_from_human(tag) if collection.get_meta("tag") == "VCALENDAR":
if prop200.find(clark_tag) is None: props.append(_tag("CS", "getctag"))
prop200.append(ET.Element(clark_tag)) props.append(_tag("C", "supported-calendar-component-set"))
meta = item.get_meta()
for tag in meta:
if tag == "tag":
continue
clark_tag = _tag_from_human(tag)
if clark_tag not in props:
props.append(clark_tag)
if propname:
for tag in props:
prop200.append(ET.Element(tag))
props = ()
for tag in props: for tag in props:
element = ET.Element(tag) element = ET.Element(tag)