From bd1fe475021462987987122697884ddd8ed389ed Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 20 Dec 2014 20:39:24 +0900
Subject: [PATCH] Can now import Kindle vocab decks

Former-commit-id: 79282c1efd08bc501505850d1613926f479a95b0
---
 yomi_base/reader.py      | 13 ++++++++++++-
 yomi_base/reader_util.py |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/yomi_base/reader.py b/yomi_base/reader.py
index a9adca0..e68b7ce 100644
--- a/yomi_base/reader.py
+++ b/yomi_base/reader.py
@@ -552,7 +552,18 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
 
 
     def importWordList(self, words):
-        pass
+        self.state.vocabDefs = list()
+        self.state.kanjiDefs = list()
+
+        for word in words:
+            if self.dockVocab.isVisible():
+                self.state.vocabDefs += self.language.dictionary.findTerm(word)
+
+            if self.dockKanji.isVisible():
+                self.state.kanjiDefs += self.language.findCharacters(word)
+
+        self.updateVocabDefs()
+        self.updateKanjiDefs()
 
 
     def setStatus(self, status):
diff --git a/yomi_base/reader_util.py b/yomi_base/reader_util.py
index 131bfc6..1cce7a6 100644
--- a/yomi_base/reader_util.py
+++ b/yomi_base/reader_util.py
@@ -174,7 +174,7 @@ def buildVocabDef(definition, index, query):
         reading = u'<span class = "reading">[{0}]<br/></span>'.format(definition['reading'])
 
     rules = unicode()
-    if len(definition['rules']) > 0:
+    if definition.get('rules'):
         rules = ' &lt; '.join(definition['rules'])
         rules = '<span class = "rules">({0})<br/></span>'.format(rules)