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

Update PROPPATCH to new storage API

Browse Source
This commit is contained in:
Markus Unterwaditzer 2016-04-13 23:02:00 +02:00
parent 472d016d1e
commit e8c1defe6a
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/storage.py
View File

@ -353,7 +353,12 @@ class Collection:
if os.path.exists(props_path): if os.path.exists(props_path):
with open(props_path, encoding=STORAGE_ENCODING) as prop_file: with open(props_path, encoding=STORAGE_ENCODING) as prop_file:
properties.update(json.load(prop_file)) properties.update(json.load(prop_file))
properties[key] = value
if value:
properties[key] = value
else:
properties.pop(key, None)
with open(props_path, "w+", encoding=STORAGE_ENCODING) as prop_file: with open(props_path, "w+", encoding=STORAGE_ENCODING) as prop_file:
json.dump(properties, prop_file) json.dump(properties, prop_file)

20
radicale/xmlutils.py
View File

@ -442,19 +442,13 @@ def proppatch(path, xml_request, collection):
href.text = _href(path) href.text = _href(path)
response.append(href) response.append(href)
with collection.props as collection_props: for short_name, value in props_to_set.items():
for short_name, value in props_to_set.items(): collection.set_meta(short_name, value)
if short_name.split(":")[-1] == "calendar-timezone": _add_propstat_to(response, short_name, 200)
collection.replace(None, value)
collection_props[short_name] = value for short_name in props_to_remove:
_add_propstat_to(response, short_name, 200) collection.set_meta(short_name, '')
for short_name in props_to_remove: _add_propstat_to(response, short_name, 200)
try:
del collection_props[short_name]
except KeyError:
_add_propstat_to(response, short_name, 412)
else:
_add_propstat_to(response, short_name, 200)
return _pretty_xml(multistatus) return _pretty_xml(multistatus)