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

random ids should start at 1

Browse source
This commit is contained in:
Damien Elmes 2011-04-19 16:27:44 +09:00
parent 82a3443abe
commit 1641256da4
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
anki/deck.py
View file

@ -233,7 +233,7 @@ qconf=?, conf=?, data=?""",
fact.flush() fact.flush()
# randomize? # randomize?
if self.randomNew(): if self.randomNew():
due = random.randrange(0, 1000000) due = random.randrange(1, 1000000)
else: else:
due = fact.id due = fact.id
# add cards # add cards

14
anki/sched.py
View file

@ -226,6 +226,10 @@ queue = 0 %s order by due limit %d""" % (self._groupLimit(),
self._updateNewCardRatio() self._updateNewCardRatio()
def _getNewCard(self): def _getNewCard(self):
# We rely on sqlite to return the cards in id order. This may not
# correspond to the 'ord' order. The alternative would be to do
# something like due = fid*100+ord, but then we have no efficient way
# of spacing siblings as we'd need to fetch the fid as well.
if self.newQueue: if self.newQueue:
(id, due) = self.newQueue.pop() (id, due) = self.newQueue.pop()
# move any siblings to the end? # move any siblings to the end?
@ -549,7 +553,7 @@ queue = 2 %s and due <= :lim order by %s limit %d""" % (
self.suspendCards([card.id]) self.suspendCards([card.id])
card.queue = -1 card.queue = -1
elif a == 2: elif a == 2:
self.resetCards([card.id]) self.forgetCards([card.id])
card.due = 1000000 card.due = 1000000
# notify UI # notify UI
runHook("leech", card) runHook("leech", card)
@ -745,6 +749,8 @@ queue = 2 %s and due <= :lim order by %s limit %d""" % (
# Resetting # Resetting
########################################################################## ##########################################################################
# fixme: order
def forgetCards(self, ids): def forgetCards(self, ids):
"Put cards back in the new queue." "Put cards back in the new queue."
sql = """ sql = """
@ -780,18 +786,17 @@ queue = 1,
type = 1, type = 1,
where id = :id""", vals) where id = :id""", vals)
# Reordering # Random<->ordered new cards
########################################################################## ##########################################################################
def randomizeCards(self, cardIds=None): def randomizeCards(self, cardIds=None):
"Randomize 'due' on all new cards."
now = intTime() now = intTime()
query = "select distinct fid from cards where type = 0" query = "select distinct fid from cards where type = 0"
if cardIds: if cardIds:
query += " and id in %s" % ids2str(cardIds) query += " and id in %s" % ids2str(cardIds)
fids = self.deck.db.list(query) fids = self.deck.db.list(query)
data = [{'fid': fid, data = [{'fid': fid,
'rand': random.randrange(0, 1000000), 'rand': random.randrange(1, 1000000),
'now': now} for fid in fids] 'now': now} for fid in fids]
self.deck.db.executemany(""" self.deck.db.executemany("""
update cards update cards
@ -801,7 +806,6 @@ where fid = :fid
and type = 0""", data) and type = 0""", data)
def orderCards(self): def orderCards(self):
"Set 'due' to card creation time."
self.deck.db.execute(""" self.deck.db.execute("""
update cards set update cards set
due = fid, due = fid,