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

Revert "Follow the depth in REPORT requests"

Browse Source 
This reverts commit 9556508b2a.
This commit is contained in:
Guillaume Ayoub 2014-03-05 19:26:42 +01:00
parent 9556508b2a
commit 45f8e76643
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
radicale/__init__.py
View File

@ -568,10 +568,11 @@ class Application(object):
if not len(read_collections): if not len(read_collections):
return NOT_ALLOWED return NOT_ALLOWED
collection = read_collections[0]
headers = {"Content-Type": "text/xml"} headers = {"Content-Type": "text/xml"}
answer = xmlutils.report( answer = xmlutils.report(environ["PATH_INFO"], content, collection)
environ["PATH_INFO"], content, read_collections)
return client.MULTI_STATUS, headers, answer return client.MULTI_STATUS, headers, answer
# pylint: enable=W0612,W0613,R0201 # pylint: enable=W0612,W0613,R0201

27
radicale/xmlutils.py
View File

@ -479,7 +479,7 @@ def put(path, ical_request, collection):
collection.append(name, ical_request) collection.append(name, ical_request)
def report(path, xml_request, items): def report(path, xml_request, collection):
"""Read and answer REPORT requests. """Read and answer REPORT requests.
Read rfc3253-3.6 for info. Read rfc3253-3.6 for info.
@ -491,7 +491,7 @@ def report(path, xml_request, items):
prop_element = root.find(_tag("D", "prop")) prop_element = root.find(_tag("D", "prop"))
props = [prop.tag for prop in prop_element] props = [prop.tag for prop in prop_element]
if items: if collection:
if root.tag in (_tag("C", "calendar-multiget"), if root.tag in (_tag("C", "calendar-multiget"),
_tag("CR", "addressbook-multiget")): _tag("CR", "addressbook-multiget")):
# Read rfc4791-7.9 for info # Read rfc4791-7.9 for info
@ -515,13 +515,23 @@ def report(path, xml_request, items):
# Writing answer # Writing answer
multistatus = ET.Element(_tag("D", "multistatus")) multistatus = ET.Element(_tag("D", "multistatus"))
if items:
collection = items[0]
collection_tag = collection.tag collection_tag = collection.tag
collection_items = collection.items
collection_headers = collection.headers collection_headers = collection.headers
collection_timezones = collection.timezones collection_timezones = collection.timezones
for hreference in hreferences: for hreference in hreferences:
# Check if the reference is an item or a collection
name = name_from_path(hreference, collection)
if name:
# Reference is an item
path = "/".join(hreference.split("/")[:-1]) + "/"
items = (item for item in collection_items if item.name == name)
else:
# Reference is a collection
path = hreference
items = collection.components
for item in items: for item in items:
if tag_filters and item.tag not in tag_filters: if tag_filters and item.tag not in tag_filters:
continue continue
@ -530,11 +540,7 @@ def report(path, xml_request, items):
multistatus.append(response) multistatus.append(response)
href = ET.Element(_tag("D", "href")) href = ET.Element(_tag("D", "href"))
if isinstance(item, ical.Component): href.text = _href("%s/%s" % (path.rstrip("/"), item.name))
href.text = _href("%s/%s" % (
collection.path.rstrip("/"), item.name))
else:
href.text = _href(item.path)
response.append(href) response.append(href)
propstat = ET.Element(_tag("D", "propstat")) propstat = ET.Element(_tag("D", "propstat"))
@ -548,11 +554,8 @@ def report(path, xml_request, items):
if tag == _tag("D", "getetag"): if tag == _tag("D", "getetag"):
element.text = item.etag element.text = item.etag
elif tag == _tag("D", "getcontenttype"): elif tag == _tag("D", "getcontenttype"):
if isinstance(item, ical.Component):
element.text = "%s; component=%s" % ( element.text = "%s; component=%s" % (
item.mimetype, item.tag.lower()) item.mimetype, item.tag.lower())
else:
element.text = item.mimetype
elif tag in (_tag("C", "calendar-data"), elif tag in (_tag("C", "calendar-data"),
_tag("CR", "address-data")): _tag("CR", "address-data")):
if isinstance(item, ical.Component): if isinstance(item, ical.Component):