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

Support replacing in MOVE method

Browse Source
This commit is contained in:
Unrud 2016-08-06 04:45:44 +02:00
parent 89ac2fb397
commit 17ff22cae4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
radicale/__init__.py
View File

@ -486,13 +486,20 @@ class Application:
return client.CONFLICT, {}, None return client.CONFLICT, {}, None
to_item = next(self.Collection.discover(to_path), None) to_item = next(self.Collection.discover(to_path), None)
if (isinstance(to_item, self.Collection) or
to_item and environ.get("HTTP_OVERWRITE", "F") != "T"):
return client.CONFLICT, {}, None
to_parent_path = storage.sanitize_path( to_parent_path = storage.sanitize_path(
"/%s/" % posixpath.dirname(to_path.strip("/"))) "/%s/" % posixpath.dirname(to_path.strip("/")))
to_collection = next( to_collection = next(
self.Collection.discover(to_parent_path), None) self.Collection.discover(to_parent_path), None)
if not to_collection or to_item: if not to_collection:
return client.CONFLICT, {}, None return client.CONFLICT, {}, None
to_href = posixpath.basename(to_path.strip("/")) to_href = posixpath.basename(to_path.strip("/"))
if path.strip("/") != to_path.strip("/"):
if to_item:
to_collection.update(to_href, item.item)
else:
to_collection.upload(to_href, item.item) to_collection.upload(to_href, item.item)
item.collection.delete(item.href) item.collection.delete(item.href)
return client.CREATED, {}, None return client.CREATED, {}, None