From 0675328a026b7882c68ff531783a0483da05e97f Mon Sep 17 00:00:00 2001 From: Unrud Date: Mon, 8 Aug 2016 06:08:01 +0200 Subject: [PATCH 1/3] Replace collection in Collection.create_collection --- radicale/storage.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/radicale/storage.py b/radicale/storage.py index f0de7cc..2af4bac 100644 --- a/radicale/storage.py +++ b/radicale/storage.py @@ -294,6 +294,10 @@ class BaseCollection: def create_collection(cls, href, collection=None, props=None): """Create a collection. + If the collection already exists and neither ``collection`` nor + ``props`` are set, this method shouldn't do anything. Otherwise the + existing collection must be replaced. + ``collection`` is a list of vobject components. ``props`` are metadata values for the collection. @@ -551,6 +555,11 @@ class Collection(BaseCollection): for card in collection: self.upload(self._find_available_file_name(), card) + # This operation is not atomic on the filesystem level but it's + # very unlikely that one rename operations succeeds while the + # other fails or that only one gets written to disk. + if os.path.exists(filesystem_path): + os.rename(filesystem_path, os.path.join(tmp_dir, "delete")) os.rename(tmp_filesystem_path, filesystem_path) sync_directory(parent_dir) From 68286faa63c8acf34800a03e97bb9eaeaa2529a5 Mon Sep 17 00:00:00 2001 From: Unrud Date: Mon, 8 Aug 2016 06:08:52 +0200 Subject: [PATCH 2/3] Atomic replacement of whole collection by PUT --- radicale/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/radicale/__init__.py b/radicale/__init__.py index f826281..f27a172 100644 --- a/radicale/__init__.py +++ b/radicale/__init__.py @@ -574,9 +574,6 @@ class Application: tag = tags.get(content_type) if write_whole_collection: - if item: - # Delete old collection - item.delete() new_item = self.Collection.create_collection( path, items, {"tag": tag}) else: From eb15de0c5b7af580546bbd8a2be31c636f5af019 Mon Sep 17 00:00:00 2001 From: Unrud Date: Mon, 8 Aug 2016 06:09:24 +0200 Subject: [PATCH 3/3] Test PUT with whole collection --- radicale/tests/test_base.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/radicale/tests/test_base.py b/radicale/tests/test_base.py index 8d06dbc..ad061ef 100644 --- a/radicale/tests/test_base.py +++ b/radicale/tests/test_base.py @@ -119,6 +119,21 @@ class BaseRequests: assert "DTSTART;TZID=Europe/Paris:20140901T180000" in answer assert "DTEND;TZID=Europe/Paris:20140901T210000" in answer + def test_put_whole_collection(self): + """Create and overwrite a whole collection.""" + event = get_file_content("event1.ics") + status, headers, answer = self.request("PUT", "/calendar.ics/", event) + assert status == 201 + status, headers, answer = self.request( + "PUT", "/calendar.ics/event1.ics", event) + assert status == 201 + # Overwrite + status, headers, answer = self.request("PUT", "/calendar.ics/", event) + assert status == 201 + status, headers, answer = self.request( + "GET", "/calendar.ics/event1.ics") + assert status == 404 + def test_delete(self): """Delete an event.""" self.request("MKCOL", "/calendar.ics/")