From b31bd5c091d54202c1a9b5a08eb3cbaf7ac755ca Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 22 Oct 2011 07:38:59 +0900
Subject: [PATCH] vacuum after import; make sure models.current() always
 returns

---
 anki/importing/anki2.py | 2 ++
 anki/models.py          | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/anki/importing/anki2.py b/anki/importing/anki2.py
index 33a2bbe6c..5541e6646 100644
--- a/anki/importing/anki2.py
+++ b/anki/importing/anki2.py
@@ -41,6 +41,8 @@ class Anki2Importer(Importer):
         self._importFacts()
         self._importCards()
         self._importMedia()
+        self.dst.db.execute("vacuum")
+        self.dst.db.execute("analyze")
 
     # Facts
     ######################################################################
diff --git a/anki/models.py b/anki/models.py
index 9208ef7f9..8e8f1009a 100644
--- a/anki/models.py
+++ b/anki/models.py
@@ -94,7 +94,9 @@ class ModelManager(object):
     def current(self):
         "Get current model."
         try:
-            return self.get(self.deck.groups.top()['curModel'])
+            m = self.get(self.deck.groups.top()['curModel'])
+            assert m
+            return m
         except:
             return self.models.values()[0]