From ba589ac8cc209912af8b4ef0206f288966ed75e4 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 4 Dec 2013 11:43:57 +0900
Subject: [PATCH] need to compare mediaList with nfd on macs

otherwise the server says we have file x and local code
doesn't notice it already exists
---
 anki/media.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/anki/media.py b/anki/media.py
index d5afa4b57..b30234665 100644
--- a/anki/media.py
+++ b/anki/media.py
@@ -2,7 +2,6 @@
 # Copyright: Damien Elmes <anki@ichi2.net>
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import os
 import re
 import urllib
 import unicodedata
@@ -505,8 +504,12 @@ create table log (fname text primary key, type int);
         need = []
         remove = []
         for f in files:
-            if self.db.scalar("select 1 from log where fname=?", f):
-                remove.append((f,))
+            if isMac:
+                name = unicodedata.normalize("NFD", f)
+            else:
+                name = f
+            if self.db.scalar("select 1 from log where fname=?", name):
+                remove.append((name,))
             else:
                 need.append(f)
         self.db.executemany("delete from log where fname=?", remove)