GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-14 16:47:12 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

send 'continue' for multiple zips; test splitting

Browse source
This commit is contained in:
Damien Elmes 2011-10-06 13:51:44 +09:00
parent 8c1f397459
commit b4fdf1c690
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
anki/sync.py
View file

@ -547,7 +547,7 @@ class MediaSyncer(object):
while 1: while 1:
runHook("mediaSync", "stream") runHook("mediaSync", "stream")
zip = self.server.files() zip = self.server.files()
if self.addFiles(zip=zip): if self.addFiles(zip=zip) != "continue":
break break
# step 3: stream files to the server # step 3: stream files to the server
runHook("mediaSync", "client") runHook("mediaSync", "client")
@ -555,7 +555,7 @@ class MediaSyncer(object):
runHook("mediaSync", "stream") runHook("mediaSync", "stream")
zip = self.files() zip = self.files()
usn = self.server.addFiles(zip=zip) usn = self.server.addFiles(zip=zip)
if usn: if usn != "continue":
# when server has run out of files, it returns bumped usn # when server has run out of files, it returns bumped usn
break break
self.deck.media.setUsn(usn) self.deck.media.setUsn(usn)

11
tests/test_sync.py
View file

@ -358,8 +358,17 @@ def test_media():
assert server.mediatest("count") == 0 assert server.mediatest("count") == 0
# we should be able to add it again # we should be able to add it again
time.sleep(1) time.sleep(1)
p = os.path.join(deck1.media.dir(), "foo.jpg")
open(p, "wb").write("foo") open(p, "wb").write("foo")
client.sync() client.sync()
assert len(os.listdir(deck1.media.dir())) == 1 assert len(os.listdir(deck1.media.dir())) == 1
assert server.mediatest("count") == 1 assert server.mediatest("count") == 1
# if we modify it, it should get sent too. also we set the zip size very
# low here, so that we can test splitting into multiple zips
import anki.media; anki.media.SYNC_ZIP_SIZE = 1
time.sleep(1)
open(p, "wb").write("bar")
open(p+"2", "wb").write("baz")
assert len(os.listdir(deck1.media.dir())) == 2
client.sync()
assert len(os.listdir(deck1.media.dir())) == 2
assert server.mediatest("count") == 2