ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sanity check

Browse Source
This commit is contained in:
Karsten Lehmann 2020-08-28 12:27:15 +02:00
parent 7eff3815a4
commit 4c09c1e248
No known key found for this signature in database
GPG Key ID: 6C34E8199743C270
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ankisyncd/sync.py
View File

@ -187,7 +187,7 @@ class Syncer(object):
self.col.crt = rchg['crt'] self.col.crt = rchg['crt']
self.prepareToChunk() self.prepareToChunk()
def sanityCheck(self): def sanityCheck(self, full):
if not self.col.basicCheck(): if not self.col.basicCheck():
return "failed basic check" return "failed basic check"
for t in "cards", "notes", "revlog", "graves": for t in "cards", "notes", "revlog", "graves":
@ -244,21 +244,24 @@ class Syncer(object):
if table == "revlog": if table == "revlog":
return self.col.db.execute(""" return self.col.db.execute("""
select id, cid, ?, ease, ivl, lastIvl, factor, time, type select id, cid, ?, ease, ivl, lastIvl, factor, time, type
from revlog where ?""", self.maxUsn, lim) from revlog where %s""" % lim, self.maxUsn)
elif table == "cards": elif table == "cards":
return self.col.db.execute(""" return self.col.db.execute("""
select id, nid, did, ord, mod, ?, type, queue, due, ivl, factor, reps, select id, nid, did, ord, mod, ?, type, queue, due, ivl, factor, reps,
lapses, left, odue, odid, flags, data from cards where ?""", self.maxUsn, lim) lapses, left, odue, odid, flags, data from cards where %s""" % lim, self.maxUsn)
else: else:
return self.col.db.execute(""" return self.col.db.execute("""
select id, guid, mid, mod, ?, tags, flds, '', '', flags, data select id, guid, mid, mod, ?, tags, flds, '', '', flags, data
from notes where ?""", self.maxUsn, lim) from notes where %s""" % lim, self.maxUsn)
def chunk(self): def chunk(self):
buf = dict(done=False) buf = dict(done=False)
while self.tablesLeft: while self.tablesLeft:
curTable = self.tablesLeft.pop() curTable = self.tablesLeft.pop()
buf[curTable] = self.queryTable(curTable) buf[curTable] = self.queryTable(curTable)
self.col.db.execute(
f"update {curTable} set usn=? where usn=-1", self.maxUsn
)
if not self.tablesLeft: if not self.tablesLeft:
buf['done'] = True buf['done'] = True
return buf return buf
@ -417,8 +420,7 @@ from notes where ?""", self.maxUsn, lim)
def mergeConf(self, conf): def mergeConf(self, conf):
newConf = ConfigManager(self.col) newConf = ConfigManager(self.col)
for key, value in conf.items(): for key, value in conf.items():
newConf[key] = value self.col.set_config(key, value)
self.col.conf = newConf
# Wrapper for requests that tracks upload/download progress # Wrapper for requests that tracks upload/download progress
########################################################################## ##########################################################################

2
src/ankisyncd/sync_app.py
View File

@ -133,7 +133,7 @@ class SyncCollectionHandler(Syncer):
return lchg return lchg
def sanityCheck2(self, client, full=None): def sanityCheck2(self, client, full=None):
server = self.sanityCheck() server = self.sanityCheck(full)
if client != server: if client != server:
logger.info( logger.info(
f"sanity check failed with server: {server} client: {client}" f"sanity check failed with server: {server} client: {client}"