From 364ed3689dcfc965a436bd560e6497cdeb474f8d Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Thu, 7 Jul 2016 15:45:01 +0200 Subject: [PATCH 1/2] Optimise collection creation by avoiding nested_loop --- radicale/storage.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/radicale/storage.py b/radicale/storage.py index 79d5edc..d670daf 100644 --- a/radicale/storage.py +++ b/radicale/storage.py @@ -35,7 +35,8 @@ import time from contextlib import contextmanager from hashlib import md5 from importlib import import_module -from uuid import uuid4 +from itertools import groupby +from random import getrandbits import vobject @@ -372,25 +373,26 @@ class Collection(BaseCollection): items = [] for content in ("vevent", "vtodo", "vjournal"): items.extend(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.add(item) - 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) - self.upload(uuid4().hex, new_collection) + + def get_uid(item): + return hasattr(item, 'uid') and item.uid.value + + items_by_uid = groupby( + sorted(items, key=get_uid), get_uid) + + for uid, items in items_by_uid: + for item in items: + new_collection = vobject.iCalendar() + new_collection.add(item) + file_name = hex(getrandbits(32))[2:] + self.upload(file_name, new_collection) + elif tag == "VCARD": self.set_meta("tag", "VADDRESSBOOK") if collection: for card in collection: - self.upload(uuid4().hex, card) + file_name = hex(getrandbits(32))[2:] + self.upload(file_name, card) return self def list(self): From a2d6977cd6df4430558bf36dd6a3a71f51b3d9ca Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Thu, 7 Jul 2016 17:53:35 +0200 Subject: [PATCH 2/2] Fix logic in loops --- radicale/storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radicale/storage.py b/radicale/storage.py index a0cbe6d..443e496 100644 --- a/radicale/storage.py +++ b/radicale/storage.py @@ -381,8 +381,8 @@ class Collection(BaseCollection): sorted(items, key=get_uid), get_uid) for uid, items in items_by_uid: + new_collection = vobject.iCalendar() for item in items: - new_collection = vobject.iCalendar() new_collection.add(item) file_name = hex(getrandbits(32))[2:] self.upload(file_name, new_collection)