Optimise collection creation by avoiding nested_loop
This commit is contained in:
parent
21461ddb4e
commit
364ed3689d
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user