GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-23 08:22:24 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

needCards/needWizard obsolete

Browse source 
We always include the cards as designed, and suggest to the user they can
customize them instead.
This commit is contained in:
Damien Elmes 2012-08-09 11:40:56 +09:00
parent b74f773d46
commit 949660288e
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
anki/importing/anki2.py
View file

@ -22,7 +22,6 @@ class Anki2Importer(Importer):
needMapper = False needMapper = False
deckPrefix = None deckPrefix = None
needCards = True
def run(self, media=None): def run(self, media=None):
self._prepareFiles() self._prepareFiles()
@ -117,8 +116,6 @@ class Anki2Importer(Importer):
if mid in self._modelMap: if mid in self._modelMap:
return self._modelMap[mid] return self._modelMap[mid]
src = self.src.models.get(mid).copy() src = self.src.models.get(mid).copy()
if not self.needCards:
src['needWizard'] = 1
# if it doesn't exist, we'll copy it over, preserving id # if it doesn't exist, we'll copy it over, preserving id
if not self.dst.models.have(mid): if not self.dst.models.have(mid):
self.dst.models.update(src) self.dst.models.update(src)
@ -190,8 +187,6 @@ class Anki2Importer(Importer):
###################################################################### ######################################################################
def _importCards(self): def _importCards(self):
if not self.needCards:
return
# build map of (guid, ord) -> cid and used id cache # build map of (guid, ord) -> cid and used id cache
self._cards = {} self._cards = {}
existing = {} existing = {}
@ -261,17 +256,7 @@ insert or ignore into revlog values (?,?,?,?,?,?,?,?,?)""", revlog)
# fixme: we could be handling new card order more elegantly on import # fixme: we could be handling new card order more elegantly on import
def _postImport(self): def _postImport(self):
if self.needCards: # make sure new position is correct
# make sure new position is correct self.dst.conf['nextPos'] = self.dst.db.scalar(
self.dst.conf['nextPos'] = self.dst.db.scalar( "select max(due)+1 from cards where type = 0") or 0
"select max(due)+1 from cards where type = 0") or 0
else:
# newly added models will have been flagged with needWizard=1; we
# need to mark reused models with needWizard=2 so the new cards
# can be generated
for mid in self._modelMap.values():
m = self.dst.models.get(mid)
if not m.get("needWizard"):
m['needWizard'] = 2
self.dst.models.save(m)
self.dst.save() self.dst.save()