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

Merge pull request #454 from Unrud/uniq

Browse Source 
Check if file name already exists
This commit is contained in:
Guillaume Ayoub 2016-08-02 11:12:30 +02:00 committed by GitHub
commit 880744ada7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
radicale/storage.py
View File

@ -25,6 +25,7 @@ entry.
""" """
import errno
import json import json
import os import os
import posixpath import posixpath
@ -393,6 +394,14 @@ class Collection(BaseCollection):
@classmethod @classmethod
def create_collection(cls, href, collection=None, tag=None): def create_collection(cls, href, collection=None, tag=None):
def find_available_file_name(exists_fn):
# Prevent infinite loop
for _ in range(10000):
file_name = hex(getrandbits(32))[2:]
if not exists_fn(file_name):
return file_name
raise FileExistsError(errno.EEXIST, "No usable file name found")
folder = os.path.expanduser( folder = os.path.expanduser(
cls.configuration.get("storage", "filesystem_folder")) cls.configuration.get("storage", "filesystem_folder"))
path = path_to_filesystem(folder, href) path = path_to_filesystem(folder, href)
@ -420,15 +429,14 @@ class Collection(BaseCollection):
new_collection = vobject.iCalendar() new_collection = vobject.iCalendar()
for item in items: for item in items:
new_collection.add(item) new_collection.add(item)
file_name = hex(getrandbits(32))[2:] self.upload(find_available_file_name(self.has),
self.upload(file_name, new_collection) new_collection)
elif tag == "VCARD": elif tag == "VCARD":
self.set_meta("tag", "VADDRESSBOOK") self.set_meta("tag", "VADDRESSBOOK")
if collection: if collection:
for card in collection: for card in collection:
file_name = hex(getrandbits(32))[2:] self.upload(find_available_file_name(self.has), card)
self.upload(file_name, card)
return self return self