sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small refactoring in sync

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-05-13 18:29:53 +02:00
parent 2656ac7a92
commit 49224c703f
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
vdirsyncer/sync.py
View file

@ -45,9 +45,10 @@ class StorageEmpty(SyncError):
def prepare_list(storage, href_to_status): def prepare_list(storage, href_to_status):
rv = {}
download = [] download = []
for href, etag in storage.list(): for href, etag in storage.list():
props = {'etag': etag} props = rv[href] = {'etag': etag}
if href in href_to_status: if href in href_to_status:
uid, old_etag = href_to_status[href] uid, old_etag = href_to_status[href]
props['uid'] = uid props['uid'] = uid
@ -55,12 +56,16 @@ def prepare_list(storage, href_to_status):
download.append(href) download.append(href)
else: else:
download.append(href) download.append(href)
yield href, props
if download: if download:
for href, item, etag in storage.get_multi(download): for href, item, etag in storage.get_multi(download):
props = {'item': item, 'uid': item.uid, 'etag': etag} props = rv[href]
yield href, props props['item'] = item
props['uid'] = item.uid
if props['etag'] != etag:
raise SyncConflict('Etag changed during sync.')
return rv
def sync(storage_a, storage_b, status, conflict_resolution=None, def sync(storage_a, storage_b, status, conflict_resolution=None,
@ -92,8 +97,8 @@ def sync(storage_a, storage_b, status, conflict_resolution=None,
for uid, (href_a, etag_a, href_b, etag_b) in iteritems(status) for uid, (href_a, etag_a, href_b, etag_b) in iteritems(status)
) )
# href => {'etag': etag, 'item': optional item, 'uid': uid} # href => {'etag': etag, 'item': optional item, 'uid': uid}
list_a = dict(prepare_list(storage_a, a_href_to_status)) list_a = prepare_list(storage_a, a_href_to_status)
list_b = dict(prepare_list(storage_b, b_href_to_status)) list_b = prepare_list(storage_b, b_href_to_status)
if bool(list_a) != bool(list_b) and status and not force_delete: if bool(list_a) != bool(list_b) and status and not force_delete:
raise StorageEmpty(storage_b if list_a else storage_a) raise StorageEmpty(storage_b if list_a else storage_a)
@ -205,10 +210,8 @@ def get_actions(storages, status):
storage_a, list_a, a_uid_to_href = storages['a'] storage_a, list_a, a_uid_to_href = storages['a']
storage_b, list_b, b_uid_to_href = storages['b'] storage_b, list_b, b_uid_to_href = storages['b']
uids_a = (x['uid'] for x in itervalues(list_a))
uids_b = (x['uid'] for x in itervalues(list_b))
handled = set() handled = set()
for uid in itertools.chain(uids_a, uids_b, status): for uid in itertools.chain(a_uid_to_href, b_uid_to_href, status):
if uid in handled: if uid in handled:
continue continue
handled.add(uid) handled.add(uid)