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

Never create collection without tag via PUT

Browse Source
This commit is contained in:
Unrud 2018-08-21 18:43:43 +02:00
parent 464e4ca920
commit aec94cc5b3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radicale/__init__.py
View File

@ -782,6 +782,11 @@ class Application:
tag = "VCALENDAR" tag = "VCALENDAR"
elif items and items[0].name in ("VCARD", "VLIST"): elif items and items[0].name in ("VCARD", "VLIST"):
tag = "VADDRESSBOOK" tag = "VADDRESSBOOK"
elif not tag and not items:
# Maybe an empty address book
tag = "VADDRESSBOOK"
elif not tag:
raise ValueError("Can't determine collection tag")
else: else:
tag = parent_item.get_meta("tag") tag = parent_item.get_meta("tag")
storage.check_and_sanitize_items( storage.check_and_sanitize_items(
@ -822,11 +827,6 @@ class Application:
href = posixpath.basename(path.strip("/")) href = posixpath.basename(path.strip("/"))
try: try:
if tag and not parent_item.get_meta("tag"):
new_props = parent_item.get_meta()
new_props["tag"] = tag
storage.check_and_sanitize_props(new_props)
parent_item.set_meta(new_props)
new_item = parent_item.upload(href, items[0]) new_item = parent_item.upload(href, items[0])
except ValueError as e: except ValueError as e:
logger.warning( logger.warning(