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

fix problems with lastsync

Browse source
This commit is contained in:
Damien Elmes 2008-12-23 15:41:22 +09:00
parent 75dd6d4420
commit a0a6df0f8e
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
anki/sync.py
View file

@ -76,14 +76,14 @@ class SyncTools(object):
return False return False
l = self._lastSync(); r = self.server._lastSync() l = self._lastSync(); r = self.server._lastSync()
if l != r: if l != r:
self.lastSync = min(l, r) - 600 self.deck.lastSync = min(l, r) - 600
else: else:
self.lastSync = l self.deck.lastSync = l
return True return True
def summaries(self): def summaries(self):
return (self.summary(self.lastSync), return (self.summary(self.deck.lastSync),
self.server.summary(self.lastSync)) self.server.summary(self.deck.lastSync))
def genPayload(self, summaries): def genPayload(self, summaries):
(lsum, rsum) = summaries (lsum, rsum) = summaries
@ -205,6 +205,8 @@ class SyncTools(object):
def summary(self, lastSync): def summary(self, lastSync):
"Generate a full summary of modtimes for two-way syncing." "Generate a full summary of modtimes for two-way syncing."
# client may have selected an earlier sync time
self.deck.lastSync = lastSync
# ensure we're flushed first # ensure we're flushed first
self.deck.s.flush() self.deck.s.flush()
return { return {
@ -568,7 +570,7 @@ values
s['day'] = s['day'].toordinal() s['day'] = s['day'].toordinal()
del s['id'] del s['id']
return s return s
lastDay = date.fromtimestamp(max(0, self.lastSync - 60*60*24)) lastDay = date.fromtimestamp(max(0, self.deck.lastSync - 60*60*24))
ids = self.deck.s.column0( ids = self.deck.s.column0(
"select id from stats where type = 1 and day >= :day", day=lastDay) "select id from stats where type = 1 and day >= :day", day=lastDay)
stat = Stats() stat = Stats()
@ -603,7 +605,7 @@ values
select cardId, time, lastInterval, nextInterval, ease, delay, select cardId, time, lastInterval, nextInterval, ease, delay,
lastFactor, nextFactor, reps, thinkingTime, yesCount, noCount lastFactor, nextFactor, reps, thinkingTime, yesCount, noCount
from reviewHistory where time > :ls""", from reviewHistory where time > :ls""",
ls=self.lastSync)) ls=self.deck.lastSync))
def updateHistory(self, history): def updateHistory(self, history):
dlist = [{'cardId': h[0], dlist = [{'cardId': h[0],
@ -729,7 +731,7 @@ where media.id in %s""" % sids, now=time.time())
"select lastSync, syncPeriod from sources where id = :id", id=srcID) "select lastSync, syncPeriod from sources where id = :id", id=srcID)
if self.server.modified() <= lastSync: if self.server.modified() <= lastSync:
return return
self.lastSync = lastSync self.deck.lastSync = lastSync
return True return True
def genOneWayPayload(self, lastSync): def genOneWayPayload(self, lastSync):