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

Fix bugs in sync and add more tests

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-02-16 23:09:52 +01:00
parent cc44b85e25
commit 89aeb27afb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vdirsyncer/sync.py
View file

@ -13,8 +13,6 @@
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
''' '''
import itertools
def sync(storage_a, storage_b, status): def sync(storage_a, storage_b, status):
'''Syncronizes two storages. '''Syncronizes two storages.
@ -67,14 +65,10 @@ def sync(storage_a, storage_b, status):
del status[uid] del status[uid]
def get_actions(list_a, list_b, status): def get_actions(list_a, list_b, status):
already_handled = set()
prefetch_from_a = [] prefetch_from_a = []
prefetch_from_b = [] prefetch_from_b = []
actions = [] actions = []
for uid in itertools.chain(list_a, list_b, status): for uid in set(list_a).union(set(list_b)).union(set(status)):
if uid in already_handled:
continue
already_handled.add(uid)
if uid not in status: if uid not in status:
if uid in list_a and uid in list_b: # missing status if uid in list_a and uid in list_b: # missing status
# TODO: might need some kind of diffing too? # TODO: might need some kind of diffing too?
@ -103,5 +97,4 @@ def get_actions(list_a, list_b, status):
actions.append(('delete', uid, None, 'b')) actions.append(('delete', uid, None, 'b'))
elif uid not in list_a and uid not in list_b: # was deleted from a and b elif uid not in list_a and uid not in list_b: # was deleted from a and b
actions.append(('delete', uid, None, None)) actions.append(('delete', uid, None, None))
del status[uid]
return actions, prefetch_from_a, prefetch_from_b return actions, prefetch_from_a, prefetch_from_b

7
vdirsyncer/tests/test_sync.py
View file

@ -61,3 +61,10 @@ class SyncTests(TestCase):
assert next(b.list())[0] == '2' assert next(b.list())[0] == '2'
obj, uid, etag = b.get('2') obj, uid, etag = b.get('2')
assert obj.raw == new_item2.raw assert obj.raw == new_item2.raw
def test_irrelevant_status(self):
a = MemoryStorage()
b = MemoryStorage()
status = {'1': ('UID:1', 1234)}
sync(a, b, status)
assert not status