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

randomize if necessary on upgrade; don't add old option names

Browse source
This commit is contained in:
Damien Elmes 2011-04-19 15:52:29 +09:00
parent 82c3119c90
commit 82a3443abe
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
anki/sched.py
View file

@ -11,8 +11,6 @@ from anki.lang import _, ngettext
from anki.consts import * from anki.consts import *
from anki.hooks import runHook from anki.hooks import runHook
# fixme: on upgrade cards are ordered but order defaults to random
# revlog: # revlog:
# types: 0=lrn, 1=rev, 2=relrn, 3=cram # types: 0=lrn, 1=rev, 2=relrn, 3=cram
# positive intervals are in days (rev), negative intervals in seconds (lrn) # positive intervals are in days (rev), negative intervals in seconds (lrn)

6
anki/storage.py
View file

@ -390,9 +390,6 @@ insert or replace into deck select id, cast(created as int), :t,
"select newCardSpacing from decks") "select newCardSpacing from decks")
qconf['newOrder'] = db.scalar( qconf['newOrder'] = db.scalar(
"select newCardOrder from decks") "select newCardOrder from decks")
keys = ("newCardOrder", "newCardSpacing")
for k in keys:
qconf[k] = db.scalar("select %s from decks" % k)
qconf['newPerDay'] = db.scalar( qconf['newPerDay'] = db.scalar(
"select newCardsPerDay from decks") "select newCardsPerDay from decks")
# fetch remaining settings from decks table # fetch remaining settings from decks table
@ -560,6 +557,9 @@ update cards set due = cast(
(case when due < :stamp then 0 else 1 end) + (case when due < :stamp then 0 else 1 end) +
((due-:stamp)/86400) as int)+:today where type = 2 ((due-:stamp)/86400) as int)+:today where type = 2
""", stamp=deck.sched.dayCutoff, today=deck.sched.today) """, stamp=deck.sched.dayCutoff, today=deck.sched.today)
# possibly re-randomize
if deck.randomNew():
deck.sched.randomizeCards()
# update insertion id # update insertion id
deck.conf['nextFid'] = deck.db.scalar("select max(id) from facts")+1 deck.conf['nextFid'] = deck.db.scalar("select max(id) from facts")+1
deck.conf['nextCid'] = deck.db.scalar("select max(id) from cards")+1 deck.conf['nextCid'] = deck.db.scalar("select max(id) from cards")+1