GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-07 13:17:12 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

better handle invalid deck list

Browse source 
deleting will fail if the problem deck is the default deck - better to
rename instead

fixes infinite recursion errors
This commit is contained in:
Damien Elmes 2018-07-26 11:34:10 +10:00
parent 377bb78b88
commit 4af6aa8584
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
anki/sched.py
View file

@ -228,19 +228,20 @@ order by due""" % self._deckLimit(),
parts = parts[:-1] parts = parts[:-1]
return "::".join(parts) return "::".join(parts)
for deck in decks: for deck in decks:
# if we've already seen the exact same deck name, remove the # if we've already seen the exact same deck name, rename the
# invalid duplicate and reload # invalid duplicate and reload
if deck['name'] in lims: if deck['name'] in lims:
self.col.decks.rem(deck['id'], cardsToo=False, childrenToo=True) deck['name'] += "1"
self.col.decks.save(deck)
return self.deckDueList() return self.deckDueList()
p = parent(deck['name']) p = parent(deck['name'])
# new # new
nlim = self._deckNewLimitSingle(deck) nlim = self._deckNewLimitSingle(deck)
if p: if p:
if p not in lims: if p not in lims:
# if parent was missing, this deck is invalid, and we # if parent was missing, this deck is invalid
# need to reload the deck list deck['name'] = "recovered"
self.col.decks.rem(deck['id'], cardsToo=False, childrenToo=True) self.col.decks.save(deck)
return self.deckDueList() return self.deckDueList()
nlim = min(nlim, lims[p][0]) nlim = min(nlim, lims[p][0])
new = self._newForDeck(deck['id'], nlim) new = self._newForDeck(deck['id'], nlim)

11
anki/schedv2.py
View file

@ -218,19 +218,20 @@ order by due""" % self._deckLimit(),
return "::".join(parts) return "::".join(parts)
childMap = self.col.decks.childMap() childMap = self.col.decks.childMap()
for deck in decks: for deck in decks:
# if we've already seen the exact same deck name, remove the # if we've already seen the exact same deck name, rename the
# invalid duplicate and reload # invalid duplicate and reload
if deck['name'] in lims: if deck['name'] in lims:
self.col.decks.rem(deck['id'], cardsToo=False, childrenToo=True) deck['name'] += "1"
self.col.decks.save(deck)
return self.deckDueList() return self.deckDueList()
p = parent(deck['name']) p = parent(deck['name'])
# new # new
nlim = self._deckNewLimitSingle(deck) nlim = self._deckNewLimitSingle(deck)
if p: if p:
if p not in lims: if p not in lims:
# if parent was missing, this deck is invalid, and we # if parent was missing, this deck is invalid
# need to reload the deck list deck['name'] = "recovered"
self.col.decks.rem(deck['id'], cardsToo=False, childrenToo=True) self.col.decks.save(deck)
return self.deckDueList() return self.deckDueList()
nlim = min(nlim, lims[p][0]) nlim = min(nlim, lims[p][0])
new = self._newForDeck(deck['id'], nlim) new = self._newForDeck(deck['id'], nlim)