GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 15:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

remote partial syncing working; fixed mod time on finish()

Browse source
This commit is contained in:
Damien Elmes 2011-10-01 14:23:41 +09:00
parent dd5b2056fb
commit f131021c7e
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
anki/sync.py
View file

@ -169,7 +169,7 @@ select count() from facts where id not in (select distinct fid from cards)""")
def finish(self, mod=None): def finish(self, mod=None):
if not mod: if not mod:
# server side; we decide new mod time # server side; we decide new mod time
mod = intTime() mod = intTime(1000)
self.deck.ls = mod self.deck.ls = mod
self.deck._usn = self.maxUsn + 1 self.deck._usn = self.maxUsn + 1
self.deck.save(mod=mod) self.deck.save(mod=mod)
@ -420,9 +420,21 @@ class RemoteServer(Syncer):
self.hkey = cont self.hkey = cont
return cont return cont
def applyChanges(self, **kwargs): def applyChanges(self, **kw):
self.con = httplib2.Http(timeout=60) self.con = httplib2.Http(timeout=60)
return self._run("applyChanges", kwargs) return self._run("applyChanges", kw)
def chunk(self, **kw):
return self._run("chunk", kw)
def applyChunk(self, **kw):
return self._run("applyChunk", kw)
def sanityCheck(self, **kw):
return self._run("sanityCheck", kw)
def finish(self, **kw):
return self._run("finish", kw)
def _vars(self): def _vars(self):
return dict(k=self.hkey) return dict(k=self.hkey)
@ -466,9 +478,12 @@ class FullSyncer(object):
assert postData(self._con(), "upload", open(self.deck.path, "rb"), assert postData(self._con(), "upload", open(self.deck.path, "rb"),
self._vars(), comp=6) == "OK" self._vars(), comp=6) == "OK"
# Posting data as a file
######################################################################
# We don't want to post the payload as a form var, as the percent-encoding is # We don't want to post the payload as a form var, as the percent-encoding is
# costly. We could send it as a raw post, but more HTTP clients seem to # costly. We could send it as a raw post, but more HTTP clients seem to
# support file uploading, so this is the more compatible choice. # support file uploading, so this is the more compatible choice.
def postData(http, method, fobj, vars, comp=1): def postData(http, method, fobj, vars, comp=1):
bdry = "--"+MIME_BOUNDARY bdry = "--"+MIME_BOUNDARY
# write out post vars, including session key and compression flag # write out post vars, including session key and compression flag

10
tests/test_sync.py
View file

@ -299,4 +299,12 @@ def test_remoteSync():
assert client.sync() == "noChanges" assert client.sync() == "noChanges"
# bump local deck # bump local deck
client.deck.save() client.deck.save()
print client.sync() assert client.sync() == "success"
# again, no changes
assert client.sync() == "noChanges"
# downloading the remote deck should give us the same mod
lmod = client.deck.mod
f = FullSyncer(client.deck, TEST_HKEY)
f.download()
d = Deck(client.deck.path)
assert d.mod == lmod