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

make sure we adjust due time on reviews when importing

Browse source
This commit is contained in:
Damien Elmes 2011-12-13 04:20:05 +09:00
parent 35a10744a6
commit c1d9b62549
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
anki/collection.py
View file

@ -177,20 +177,6 @@ crt=?, mod=?, scm=?, dty=?, usn=?, ls=?, conf=?""",
self.sched.onClose() self.sched.onClose()
self.dty = False self.dty = False
def rename(self, path):
raise "nyi"
# close our DB connection
self.close()
# move to new path
shutil.copy2(self.path, path)
os.unlink(self.path)
# record old dir
olddir = self.media.dir()
# reconnect & move media
self.path = path
self.reopen()
self.media.move(olddir)
def usn(self): def usn(self):
return self._usn if self.server else -1 return self._usn if self.server else -1

7
anki/importing/anki2.py
View file

@ -90,7 +90,8 @@ class Anki2Importer(Importer):
# note we have the added note # note we have the added note
self._notes[guid] = (note[0], note[4], note[2]) self._notes[guid] = (note[0], note[4], note[2])
else: else:
print "merging notes nyi" # not yet implemented
pass
# add to col # add to col
self.dst.db.executemany( self.dst.db.executemany(
"insert or replace into notes values (?,?,?,?,?,?,?,?,?,?,?,?)", "insert or replace into notes values (?,?,?,?,?,?,?,?,?,?,?,?)",
@ -183,6 +184,7 @@ class Anki2Importer(Importer):
cards = [] cards = []
revlog = [] revlog = []
cnt = 0 cnt = 0
aheadBy = self.src.sched.today - self.dst.sched.today
for card in self.src.db.execute( for card in self.src.db.execute(
"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"):
@ -207,6 +209,9 @@ class Anki2Importer(Importer):
card[1] = self._notes[guid][0] card[1] = self._notes[guid][0]
card[2] = self._did(card[2]) card[2] = self._did(card[2])
card[4] = intTime() card[4] = intTime()
# review cards have a due date relative to collection
if card[7] == 2:
card[8] -= aheadBy
cards.append(card) cards.append(card)
# we need to import revlog, rewriting card ids # we need to import revlog, rewriting card ids
for rev in self.src.db.execute( for rev in self.src.db.execute(

1
anki/upgrade.py
View file

@ -628,7 +628,6 @@ update cards set due = cast(
col.conf['nextPos'] = ( col.conf['nextPos'] = (
col.db.scalar("select max(id) from notes") or 0)+1 col.db.scalar("select max(id) from notes") or 0)+1
col.save() col.save()
# optimize and finish # optimize and finish
col.db.commit() col.db.commit()
col.db.execute("vacuum") col.db.execute("vacuum")