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

a few failed cards related fixes

Browse source 
- make sure cardLimit() matches on sql statements that are broken over lines
- fix logic in getCardId()
- don't increment failed count if delay1>0 and card was mature
This commit is contained in:
Damien Elmes 2010-11-13 21:39:52 +09:00
parent 7502fba5ce
commit 1f8adc791a
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
anki/deck.py
View file

@ -221,17 +221,17 @@ class Deck(object):
yids = tagIds(self.s, yes).values() yids = tagIds(self.s, yes).values()
nids = tagIds(self.s, no).values() nids = tagIds(self.s, no).values()
return sql.replace( return sql.replace(
"where ", "where",
"where +c.id in (select cardId from cardTags where " "where +c.id in (select cardId from cardTags where "
"tagId in %s and tagId not in %s) and " % ( "tagId in %s and tagId not in %s) and" % (
ids2str(yids), ids2str(yids),
ids2str(nids))) ids2str(nids)))
elif no: elif no:
nids = tagIds(self.s, no).values() nids = tagIds(self.s, no).values()
return sql.replace( return sql.replace(
"where ", "where",
"where +c.id not in (select cardId from cardTags where " "where +c.id not in (select cardId from cardTags where "
"tagId in %s) and " % ids2str(nids)) "tagId in %s) and" % ids2str(nids))
else: else:
return sql return sql
@ -618,7 +618,7 @@ limit %s""" % (self.cramOrder, self.queueLimit)))
if self.failedQueue: if self.failedQueue:
# failed card due? # failed card due?
if self.delay0: if self.delay0:
if self.failedQueue[-1][2] < time.time() + self.delay0: if self.failedQueue[-1][2] + self.delay0 < time.time():
return self.failedQueue[-1][0] return self.failedQueue[-1][0]
# failed card queue too big? # failed card queue too big?
if (self.failedCardMax and if (self.failedCardMax and
@ -779,7 +779,8 @@ where id in """
self.spaceCards(card, space) self.spaceCards(card, space)
# adjust counts for current card # adjust counts for current card
if ease == 1: if ease == 1:
self.failedSoonCount += 1 if not (oldState == "mature" and self.delay1):
self.failedSoonCount += 1
if oldQueue == 0: if oldQueue == 0:
self.failedSoonCount -= 1 self.failedSoonCount -= 1
elif oldQueue == 1: elif oldQueue == 1: