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

Merge branch 'master' of github.com:dae/libanki

Browse source
This commit is contained in:
Damien Elmes 2012-07-28 22:26:00 +09:00
commit 4ff3a9969b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
anki/importing/anki1.py
View file

@ -2,7 +2,7 @@
# Copyright: Damien Elmes <anki@ichi2.net> # Copyright: Damien Elmes <anki@ichi2.net>
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import traceback, os import traceback, os, re
from anki.lang import _ from anki.lang import _
from anki.upgrade import Upgrader from anki.upgrade import Upgrader
from anki.importing.anki2 import Anki2Importer from anki.importing.anki2 import Anki2Importer
@ -28,8 +28,8 @@ class Anki1Importer(Anki2Importer):
conf = deck.decks.confForDid(1) conf = deck.decks.confForDid(1)
# merge # merge
deck.close() deck.close()
mdir = self.file.replace(".anki", ".media") mdir = re.sub(r"\.anki$", ".media", self.file)
self.deckPrefix = os.path.basename(self.file).replace(".anki", "") self.deckPrefix = re.sub(r"\.anki$", "", os.path.basename(self.file))
self.file = deck.path self.file = deck.path
Anki2Importer.run(self, mdir) Anki2Importer.run(self, mdir)
# set imported deck to saved conf # set imported deck to saved conf