GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 15:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix handling of delay1/2

Browse source
This commit is contained in:
Damien Elmes 2008-11-17 10:55:33 +09:00
parent 1b69992e8f
commit cd383174c6
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
anki/deck.py
View file

@ -44,7 +44,7 @@ decksTable = Table(
Column('created', Float, nullable=False, default=time.time), Column('created', Float, nullable=False, default=time.time),
Column('modified', Float, nullable=False, default=time.time), Column('modified', Float, nullable=False, default=time.time),
Column('description', UnicodeText, nullable=False, default=u""), Column('description', UnicodeText, nullable=False, default=u""),
Column('version', Integer, nullable=False, default=15), Column('version', Integer, nullable=False, default=16),
Column('currentModelId', Integer, ForeignKey("models.id")), Column('currentModelId', Integer, ForeignKey("models.id")),
# syncing # syncing
Column('syncName', UnicodeText), Column('syncName', UnicodeText),
@ -291,15 +291,11 @@ where factId = :fid and id != :id""", fid=card.factId, id=card.id) or 0
select type, count(type) from cards select type, count(type) from cards
where factId = :fid and isDue = 1 where factId = :fid and isDue = 1
group by type""", fid=card.factId): group by type""", fid=card.factId):
#print type, count
if type == 0: if type == 0:
#print "minus failed"
self.failedNowCount -= count self.failedNowCount -= count
elif type == 1: elif type == 1:
#print "minus old"
self.revCount -= count self.revCount -= count
else: else:
#print "minus new"
self.newCount -= count self.newCount -= count
# space other cards # space other cards
self.s.statement(""" self.s.statement("""
@ -465,7 +461,7 @@ priority in (1,2,3,4) and combinedDue < :now"""
self.s.scalar(""" self.s.scalar("""
select count(*) from cards where select count(*) from cards where
type = 0 and isDue = 0 and priority in (1,2,3,4) type = 0 and isDue = 0 and priority in (1,2,3,4)
and combinedDue <= (select max(delay0, delay1) + and combinedDue <= (select delay0 +
strftime("%s", "now")+1 from decks)""")) strftime("%s", "now")+1 from decks)"""))
# new card handling # new card handling
self.newCountToday = max(min( self.newCountToday = max(min(
@ -1749,7 +1745,7 @@ order by type, isDue, combinedDue
create view failedCardsSoon as create view failedCardsSoon as
select * from cards select * from cards
where type = 0 and +priority in (1,2,3,4) where type = 0 and +priority in (1,2,3,4)
and combinedDue <= (select max(delay0, delay1) + and combinedDue <= (select delay0 +
strftime("%s", "now")+1 from decks where id = 1) strftime("%s", "now")+1 from decks where id = 1)
order by type, isDue, combinedDue order by type, isDue, combinedDue
""") """)
@ -1928,6 +1924,9 @@ where interval < 1""")
deck.delay1 = deck.delay0 deck.delay1 = deck.delay0
deck.delay2 = 0.0 deck.delay2 = 0.0
deck.version = 15 deck.version = 15
if deck.version < 16:
DeckStorage._addViews(deck)
deck.version = 16
deck.s.commit() deck.s.commit()
return deck return deck
_upgradeDeck = staticmethod(_upgradeDeck) _upgradeDeck = staticmethod(_upgradeDeck)