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

need to account for guid changes when importing cards

Browse source
This commit is contained in:
Damien Elmes 2012-10-27 21:59:31 +09:00
parent 29e93f8c1d
commit 1403d36042
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
anki/importing/anki2.py
View file

@ -86,6 +86,9 @@ class Anki2Importer(Importer):
"select id, guid, mod, mid from notes"): "select id, guid, mod, mid from notes"):
self._notes[guid] = (id, mod, mid) self._notes[guid] = (id, mod, mid)
existing[id] = True existing[id] = True
# we may need to rewrite the guid if the model schemas don't match,
# so we need to keep track of the changes for the card import stage
self._changedGuids = {}
# iterate over source collection # iterate over source collection
add = [] add = []
dirty = [] dirty = []
@ -96,11 +99,11 @@ class Anki2Importer(Importer):
# turn the db result into a mutable list # turn the db result into a mutable list
note = list(note) note = list(note)
guid, mid = note[1:3] guid, mid = note[1:3]
duplicate = False canUseExisting = False
first = True alreadyHaveGuid = False
# do we have the same guid? # do we have the same guid?
if guid in self._notes: if guid in self._notes:
first = False alreadyHaveGuid = True
# and do they share the same model id? # and do they share the same model id?
if self._notes[guid][2] == mid: if self._notes[guid][2] == mid:
# and do they share the same schema? # and do they share the same schema?
@ -108,10 +111,10 @@ class Anki2Importer(Importer):
dstM = self.dst.models.get(self._notes[guid][2]) dstM = self.dst.models.get(self._notes[guid][2])
if (self.src.models.scmhash(srcM) == if (self.src.models.scmhash(srcM) ==
self.src.models.scmhash(dstM)): self.src.models.scmhash(dstM)):
# then it's safe to treat as a duplicate # then it's safe to treat as an exact duplicate
duplicate = True canUseExisting = True
# missing from local col or divergent model? # if we can't reuse an existing one, we'll need to add new
if not duplicate: if not canUseExisting:
# get corresponding local model # get corresponding local model
lmid = self._mid(mid) lmid = self._mid(mid)
# ensure id is unique # ensure id is unique
@ -127,8 +130,9 @@ class Anki2Importer(Importer):
dirty.append(note[0]) dirty.append(note[0])
# if it was originally the same as a note in this deck but the # if it was originally the same as a note in this deck but the
# models have diverged, we need to change the guid # models have diverged, we need to change the guid
if not first: if alreadyHaveGuid:
guid = guid64() guid = guid64()
self._changedGuids[note[1]] = guid
note[1] = guid note[1] = guid
# note we have the added note # note we have the added note
self._notes[guid] = (note[0], note[3], note[2]) self._notes[guid] = (note[0], note[3], note[2])
@ -263,6 +267,8 @@ class Anki2Importer(Importer):
"select f.guid, f.mid, c.* from cards c, notes f " "select f.guid, f.mid, c.* from cards c, notes f "
"where c.nid = f.id"): "where c.nid = f.id"):
guid = card[0] guid = card[0]
if guid in self._changedGuids:
guid = self._changedGuids[guid]
# does the card's note exist in dst col? # does the card's note exist in dst col?
if guid not in self._notes: if guid not in self._notes:
continue continue

2
tests/test_importing.py
View file

@ -177,6 +177,8 @@ def test_anki2_diffmodels():
after = dst.noteCount() after = dst.noteCount()
# as the model schemas differ, should have been imported as new model # as the model schemas differ, should have been imported as new model
assert after == before + 1 assert after == before + 1
# and the new model should have both cards
assert dst.cardCount() == 3
def test_csv(): def test_csv():
deck = getEmptyDeck() deck = getEmptyDeck()