From d0fa667717037c7a436610c66754d7d69d913d27 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 4 Feb 2009 22:33:49 +0900
Subject: [PATCH] don't report deletions when renamed, assert checksum on
 client

---
 anki/media.py | 2 +-
 anki/sync.py  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/anki/media.py b/anki/media.py
index 8125caa31..532240b8c 100644
--- a/anki/media.py
+++ b/anki/media.py
@@ -209,7 +209,7 @@ values (:id, strftime('%s', 'now'))""", id=id)
     deck.flushMod()
     deck.save()
     deck.finishProgress()
-    return missingFileCount, unusedFileCount
+    return missingFileCount, unusedFileCount - len(renamedFiles)
 
 def mediaRefs(string):
     "Return list of (fullMatch, filename, replacementString)."
diff --git a/anki/sync.py b/anki/sync.py
index a5ec137cc..de59ee6db 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -1103,6 +1103,8 @@ class BulkMediaSyncerProxy(HttpSyncServerProxy):
         return ret
 
     def addFile(self, fname, data):
+        oldsum = os.path.splitext(fname)[0]
+        assert oldsum == checksum(data)
         return self.runCmd("addFile", fname=fname, data=data)
 
     def runCmd(self, action, **args):