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

Remove checks for existence of collection

Browse Source 
They are unnecessary since the discover methods stopped returning collections that actually don't exist.
This commit is contained in:
Unrud 2016-09-04 13:13:35 +02:00
parent e7d8b4816c
commit f5650df5f7
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
radicale/storage.py
View File

@ -607,12 +607,7 @@ class Collection(BaseCollection):
cls._sync_directory(item.collection._filesystem_path) cls._sync_directory(item.collection._filesystem_path)
def list(self): def list(self):
try: for href in os.listdir(self._filesystem_path):
hrefs = os.listdir(self._filesystem_path)
except IOError:
return
for href in hrefs:
if not is_safe_filesystem_path_component(href): if not is_safe_filesystem_path_component(href):
self.logger.debug("Skipping component: %s", href) self.logger.debug("Skipping component: %s", href)
continue continue
@ -653,18 +648,17 @@ class Collection(BaseCollection):
def delete(self, href=None): def delete(self, href=None):
if href is None: if href is None:
# Delete the collection # Delete the collection
if os.path.isdir(self._filesystem_path): parent_dir = os.path.dirname(self._filesystem_path)
parent_dir = os.path.dirname(self._filesystem_path) try:
try: os.rmdir(self._filesystem_path)
os.rmdir(self._filesystem_path) except OSError:
except OSError: with TemporaryDirectory(
with TemporaryDirectory( prefix=".Radicale.tmp-", dir=parent_dir) as tmp:
prefix=".Radicale.tmp-", dir=parent_dir) as tmp: os.rename(self._filesystem_path, os.path.join(
os.rename(self._filesystem_path, os.path.join( tmp, os.path.basename(self._filesystem_path)))
tmp, os.path.basename(self._filesystem_path)))
self._sync_directory(parent_dir)
else:
self._sync_directory(parent_dir) self._sync_directory(parent_dir)
else:
self._sync_directory(parent_dir)
else: else:
# Delete an item # Delete an item
if not is_safe_filesystem_path_component(href): if not is_safe_filesystem_path_component(href):