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

break removals into separate sync step

Browse source
This commit is contained in:
Damien Elmes 2011-12-14 11:42:19 +09:00
parent 2c0b3f7c0a
commit 19435068bb
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
anki/sync.py
View file

@ -52,11 +52,15 @@ class Syncer(object):
elif lscm != rscm: elif lscm != rscm:
return "fullSync" return "fullSync"
self.lnewer = self.lmod > self.rmod self.lnewer = self.lmod > self.rmod
# step 2: deletions and small objects # step 2: deletions
runHook("sync", "meta") runHook("sync", "meta")
lrem = self.removed()
rrem = self.server.start(
minUsn=self.minUsn, lnewer=self.lnewer, graves=lrem)
self.remove(rrem)
# ...and small objects
lchg = self.changes() lchg = self.changes()
rchg = self.server.applyChanges( rchg = self.server.applyChanges(changes=lchg)
minUsn=self.minUsn, lnewer=self.lnewer, changes=lchg)
self.mergeChanges(lchg, rchg) self.mergeChanges(lchg, rchg)
# step 3: stream large tables from server # step 3: stream large tables from server
runHook("sync", "server") runHook("sync", "server")
@ -91,20 +95,15 @@ Sanity check failed. Please copy and paste the text below:\n%s\n%s""" % (c, s))
return (self.col.mod, self.col.scm, self.col._usn, intTime(), None) return (self.col.mod, self.col.scm, self.col._usn, intTime(), None)
def changes(self): def changes(self):
"Bundle up deletions and small objects, and apply if server." "Bundle up small objects."
d = dict(models=self.getModels(), d = dict(models=self.getModels(),
decks=self.getDecks(), decks=self.getDecks(),
tags=self.getTags(), tags=self.getTags())
graves=self.getGraves())
if self.lnewer: if self.lnewer:
d['conf'] = self.getConf() d['conf'] = self.getConf()
return d return d
def applyChanges(self, minUsn, lnewer, changes): def applyChanges(self, changes):
# we're the server; save info
self.maxUsn = self.col._usn
self.minUsn = minUsn
self.lnewer = not lnewer
self.rchg = changes self.rchg = changes
lchg = self.changes() lchg = self.changes()
# merge our side before returning # merge our side before returning
@ -112,8 +111,6 @@ Sanity check failed. Please copy and paste the text below:\n%s\n%s""" % (c, s))
return lchg return lchg
def mergeChanges(self, lchg, rchg): def mergeChanges(self, lchg, rchg):
# first, handle the deletions
self.mergeGraves(rchg['graves'])
# then the other objects # then the other objects
self.mergeModels(rchg['models']) self.mergeModels(rchg['models'])
self.mergeDecks(rchg['decks']) self.mergeDecks(rchg['decks'])
@ -224,7 +221,7 @@ from notes where %s""" % d)
# Deletions # Deletions
########################################################################## ##########################################################################
def getGraves(self): def removed(self):
cards = [] cards = []
notes = [] notes = []
decks = [] decks = []
@ -246,17 +243,26 @@ from notes where %s""" % d)
self.maxUsn) self.maxUsn)
return dict(cards=cards, notes=notes, decks=decks) return dict(cards=cards, notes=notes, decks=decks)
def mergeGraves(self, graves): def start(self, minUsn, lnewer, graves):
# make sure the deletions don't get a usn of -1k self.maxUsn = self.col._usn
server = self.col.server self.minUsn = minUsn
self.lnewer = not lnewer
lgraves = self.removed()
self.remove(graves)
return lgraves
def remove(self, graves):
# pretend to be the server so we don't set usn = -1
wasServer = self.col.server
self.col.server = True self.col.server = True
# notes first, so we don't end up with duplicate graves # notes first, so we don't end up with duplicate graves
self.col._remNotes(graves['notes']) self.col._remNotes(graves['notes'])
# then cards and decks # then cards
self.col.remCards(graves['cards']) self.col.remCards(graves['cards'])
# and decks
for oid in graves['decks']: for oid in graves['decks']:
self.col.decks.rem(oid) self.col.decks.rem(oid)
self.col.server = server self.col.server = wasServer
# Models # Models
########################################################################## ##########################################################################
@ -378,9 +384,9 @@ class LocalServer(Syncer):
# serialize/deserialize payload, so we don't end up sharing objects # serialize/deserialize payload, so we don't end up sharing objects
# between cols # between cols
def applyChanges(self, minUsn, lnewer, changes): def applyChanges(self, changes):
l = simplejson.loads; d = simplejson.dumps l = simplejson.loads; d = simplejson.dumps
return l(d(Syncer.applyChanges(self, minUsn, lnewer, l(d(changes))))) return l(d(Syncer.applyChanges(self, l(d(changes)))))
# HTTP syncing tools # HTTP syncing tools
########################################################################## ##########################################################################
@ -461,7 +467,7 @@ Content-Type: application/octet-stream\r\n\r\n""")
# Incremental sync over HTTP # Incremental sync over HTTP
###################################################################### ######################################################################
class RemoteServer(Syncer, HttpSyncer): class RemoteServer(HttpSyncer):
def __init__(self, hkey): def __init__(self, hkey):
HttpSyncer.__init__(self, hkey) HttpSyncer.__init__(self, hkey)
@ -489,6 +495,9 @@ class RemoteServer(Syncer, HttpSyncer):
def applyChanges(self, **kw): def applyChanges(self, **kw):
return self._run("applyChanges", kw) return self._run("applyChanges", kw)
def start(self, **kw):
return self._run("start", kw)
def chunk(self, **kw): def chunk(self, **kw):
return self._run("chunk", kw) return self._run("chunk", kw)