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

Merge pull request #419 from Unrud/patch-16

Browse Source 
Save all items with the same UID in the same file
This commit is contained in:
Guillaume Ayoub 2016-05-30 19:03:25 +02:00
commit f1f716b0c7
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
radicale/storage.py
View File

@ -364,17 +364,41 @@ class Collection(BaseCollection):
self.set_meta("tag", "VCALENDAR") self.set_meta("tag", "VCALENDAR")
if collection: if collection:
collection, = collection collection, = collection
items = []
for content in ("vevent", "vtodo", "vjournal"): for content in ("vevent", "vtodo", "vjournal"):
if content in collection.contents: items.extend(getattr(collection, "%s_list" % content, []))
for item in getattr(collection, "%s_list" % content): processed_uids = []
for i, item in enumerate(items):
uid = getattr(item, "uid", None)
if uid in processed_uids:
continue
new_collection = vobject.iCalendar() new_collection = vobject.iCalendar()
new_collection.add(item) new_collection.add(item)
self.upload(uuid4().hex, new_collection) if uid:
processed_uids.append(uid)
# search for items with same UID
for oitem in items[i+1:]:
if getattr(oitem, "uid", None) == uid:
new_collection.add(oitem)
if uid and is_safe_filesystem_path_component(uid.value):
href = uid.value
else:
href = uuid4().hex
if not href.lower().endswith(".ics"):
href += ".ics"
self.upload(href, 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:
self.upload(uuid4().hex, card) uid = getattr(card, "uid", None)
if uid and is_safe_filesystem_path_component(uid.value):
href = uid.value
else:
href = uuid4().hex
if not href.lower().endswith(".vcf"):
href += ".vcf"
self.upload(href, card)
return self return self
def list(self): def list(self):