GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

cont should be checked befoer any further processing

Browse source
This commit is contained in:
Damien Elmes 2014-11-06 16:56:16 +09:00
parent 6e7e08ebd0
commit e294469521
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
anki/sync.py
View file

@ -111,6 +111,13 @@ class Syncer(object):
self.col.log("rmeta", meta) self.col.log("rmeta", meta)
if not meta: if not meta:
return "badAuth" return "badAuth"
# server requested abort?
if not meta['cont']:
return "serverAbort"
else:
# don't abort, but if 'msg' is not blank, gui should show 'msg'
# after sync finishes and wait for confirmation before hiding
pass
rscm = meta['scm'] rscm = meta['scm']
rts = meta['ts'] rts = meta['ts']
self.rmod = meta['mod'] self.rmod = meta['mod']
@ -121,13 +128,6 @@ class Syncer(object):
# forgetting which email address they've used - it will be removed # forgetting which email address they've used - it will be removed
# when enough time has passed # when enough time has passed
self.uname = meta.get("uname", "") self.uname = meta.get("uname", "")
# server requested abort?
if not meta['cont']:
return "serverAbort"
else:
# don't abort, but ui should show message after sync finishes
# and require confirmation if it's non-empty
pass
meta = self.meta() meta = self.meta()
self.col.log("lmeta", meta) self.col.log("lmeta", meta)
self.lmod = meta['mod'] self.lmod = meta['mod']