don't space failed cards; make sure card type is calculated after stats update

This commit is contained in:
Damien Elmes 2010-11-03 00:29:27 +09:00
parent 46790f2e92
commit 3f3f797348

View file

@ -312,9 +312,6 @@ limit %d""" % (self.newOrder(), self.queueLimit)), lim=self.dueCutoff)
else: else:
return return
def failedNoSpaced(self):
return self.queueNotEmpty(self.failedQueue, self.fillFailedQueue)
def revNoSpaced(self): def revNoSpaced(self):
return self.queueNotEmpty(self.revQueue, self.fillRevQueue) return self.queueNotEmpty(self.revQueue, self.fillRevQueue)
@ -590,7 +587,7 @@ limit %s""" % (self.cramOrder, self.queueLimit)))
self.checkDailyStats() self.checkDailyStats()
self.fillQueues() self.fillQueues()
self.updateNewCountToday() self.updateNewCountToday()
if self.failedNoSpaced(): if self.failedQueue:
# failed card due? # failed card due?
if self.delay0 and self.failedQueue[-1][2] < time.time(): if self.delay0 and self.failedQueue[-1][2] < time.time():
return self.failedQueue[-1][0] return self.failedQueue[-1][0]
@ -761,10 +758,10 @@ where id in """
self.revCount -= 1 self.revCount -= 1
else: else:
self.newCount -= 1 self.newCount -= 1
# update type
card.type = self.cardType(card)
# card stats # card stats
anki.cards.Card.updateStats(card, ease, oldState) anki.cards.Card.updateStats(card, ease, oldState)
# update type
card.type = self.cardType(card)
# allow custom schedulers to munge the card # allow custom schedulers to munge the card
if self.answerPreSave: if self.answerPreSave:
self.answerPreSave(card, ease) self.answerPreSave(card, ease)