From 0a9c498cbd55eacd6ff38c51757aa69893da9b99 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 14 Jan 2011 22:49:37 +0900
Subject: [PATCH] fix media db check on non-unicode dir

---
 anki/media.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/anki/media.py b/anki/media.py
index 9c35efcb8..0d77a1187 100644
--- a/anki/media.py
+++ b/anki/media.py
@@ -143,11 +143,15 @@ def rebuildMediaDir(deck, delete=False, dirty=True):
     deck.s.statement("update media set size = 0")
     # look through cards for media references
     refs = {}
+    def norm(s):
+        if isinstance(s, unicode):
+            return unicodedata.normalize('NFD', s)
+        return s
     for (question, answer) in deck.s.all(
         "select question, answer from cards"):
         for txt in (question, answer):
             for f in mediaFiles(txt):
-                f = unicodedata.normalize('NFD', f)
+                f = norm(f)
                 if f in refs:
                     refs[f] += 1
                 else:
@@ -162,7 +166,7 @@ def rebuildMediaDir(deck, delete=False, dirty=True):
         if not os.path.isfile(path):
             # ignore directories
             continue
-        file = unicodedata.normalize('NFD', file)
+        file = norm(file)
         if file not in refs:
             unused.append(file)
     # optionally delete