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

Prefetch less

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-10-10 18:55:51 +02:00
parent 2d62c8716b
commit 6280708aee
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
vdirsyncer/sync.py
View file

@ -60,21 +60,21 @@ class BothReadOnly(SyncError):
''' '''
def _prepare_idents(storage, href_to_status): def _prepare_idents(storage, other_storage, href_to_status):
rv = {} hrefs = {}
download = [] download = []
for href, etag in storage.list(): for href, etag in storage.list():
props = rv[href] = {'etag': etag, 'href': href} props = hrefs[href] = {'etag': etag, 'href': href}
if href in href_to_status: if href in href_to_status:
ident, old_etag = href_to_status[href] ident, old_etag = href_to_status[href]
props['ident'] = ident props['ident'] = ident
if etag != old_etag: if etag != old_etag and not other_storage.read_only:
download.append(href) download.append(href)
else: else:
download.append(href) download.append(href)
_prefetch(storage, rv, download) _prefetch(storage, hrefs, download)
return dict((x['ident'], x) for href, x in iteritems(rv)) return dict((x['ident'], x) for href, x in iteritems(hrefs))
def _prefetch(storage, rv, hrefs): def _prefetch(storage, rv, hrefs):
@ -125,8 +125,8 @@ def sync(storage_a, storage_b, status, conflict_resolution=None,
for ident, (href_a, etag_a, href_b, etag_b) in iteritems(status) for ident, (href_a, etag_a, href_b, etag_b) in iteritems(status)
) )
# ident => {'etag': etag, 'item': optional item, 'href': href} # ident => {'etag': etag, 'item': optional item, 'href': href}
a_idents = _prepare_idents(storage_a, a_href_to_status) a_idents = _prepare_idents(storage_a, storage_b, a_href_to_status)
b_idents = _prepare_idents(storage_b, b_href_to_status) b_idents = _prepare_idents(storage_b, storage_a, b_href_to_status)
if bool(a_idents) != bool(b_idents) and status and not force_delete: if bool(a_idents) != bool(b_idents) and status and not force_delete:
raise StorageEmpty( raise StorageEmpty(