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

fix importing of changed models and duplicate revlog/card entries

Browse source
This commit is contained in:
Damien Elmes 2012-04-24 01:27:28 +09:00
parent dd4e85edfd
commit 92472045d7
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
anki/importing/anki2.py
View file

@ -101,6 +101,11 @@ class Anki2Importer(Importer):
# Models # Models
###################################################################### ######################################################################
# Models in the two decks may share an ID but not a schema, so we need to
# compare the field & template signature rather than just rely on ID. If
# we created a new model on a conflict then multiple imports would end up
# with lots of models however, so we store a list of "alternate versions"
# of a model in the model, so that importing a model is idempotent.
def _prepareModels(self): def _prepareModels(self):
"Prepare index of schema hashes." "Prepare index of schema hashes."
@ -129,25 +134,28 @@ class Anki2Importer(Importer):
return mid return mid
# if it does exist, do the schema match? # if it does exist, do the schema match?
dst = self.dst.models.get(mid) dst = self.dst.models.get(mid)
shash = self.src.models.scmhash(src)
dhash = self.src.models.scmhash(dst) dhash = self.src.models.scmhash(dst)
if self.src.models.scmhash(src) == dhash: if shash == dhash:
# reuse without modification # reuse without modification
self._modelMap[mid] = mid self._modelMap[mid] = mid
return mid return mid
# try any alternative versions # try any alternative versions
vers = src.get("vers") vers = dst.get("vers")
for v in vers: for v in vers:
m = self.src.models.get(v) m = self.dst.models.get(v)
if self.src.models.scmhash(m) == dhash: if self.dst.models.scmhash(m) == shash:
# valid alternate found; use that # valid alternate found; use that
self._modelMap[mid] = m['id'] self._modelMap[mid] = m['id']
return m['id'] return m['id']
# need to add a new alternate version, with new id # need to add a new alternate version, with new id
self.dst.models._add(src) self.dst.models.add(src)
if vers: if vers:
dst['vers'].append(src['id']) dst['vers'].append(src['id'])
else: else:
dst['vers'] = [src['id']] dst['vers'] = [src['id']]
self.dst.models.save(dst)
return src['id']
# Decks # Decks
###################################################################### ######################################################################
@ -231,9 +239,9 @@ class Anki2Importer(Importer):
cnt += 1 cnt += 1
# apply # apply
self.dst.db.executemany(""" self.dst.db.executemany("""
insert into cards values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)""", cards) insert or ignore into cards values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)""", cards)
self.dst.db.executemany(""" self.dst.db.executemany("""
insert into revlog values (?,?,?,?,?,?,?,?,?)""", revlog) insert or ignore into revlog values (?,?,?,?,?,?,?,?,?)""", revlog)
self.log.append(_("%d cards imported.") % cnt) self.log.append(_("%d cards imported.") % cnt)
# Media # Media