From 2c43c3adca3d47dda6a51174014fdd270b0d90b6 Mon Sep 17 00:00:00 2001 From: iniju Date: Sat, 28 Jul 2012 12:57:26 +0100 Subject: [PATCH] fix import deck: target correct media dir on linux. --- anki/importing/anki1.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anki/importing/anki1.py b/anki/importing/anki1.py index 63e28b896..1e54e6572 100644 --- a/anki/importing/anki1.py +++ b/anki/importing/anki1.py @@ -2,7 +2,7 @@ # Copyright: Damien Elmes # 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.upgrade import Upgrader from anki.importing.anki2 import Anki2Importer @@ -28,8 +28,8 @@ class Anki1Importer(Anki2Importer): conf = deck.decks.confForDid(1) # merge deck.close() - mdir = self.file.replace(".anki", ".media") - self.deckPrefix = os.path.basename(self.file).replace(".anki", "") + mdir = re.sub(r"\.anki$", ".media", self.file) + self.deckPrefix = re.sub(r"\.anki$", "", os.path.basename(self.file)) self.file = deck.path Anki2Importer.run(self, mdir) # set imported deck to saved conf