Use whole-file checksummer in backup plugin

2 files changed, 9 insertions, 9 deletions

diff --git a/obnamlib/metadata.py b/obnamlib/metadata.py
index 9f2e46b4..11e3449a 100644
--- a/obnamlib/metadata.py
+++ b/obnamlib/metadata.py
@@ -34,7 +34,7 @@ metadata_verify_fields = (
 )
 metadata_fields = metadata_verify_fields + (
     'st_blocks', 'st_dev', 'st_gid', 'st_ino', 'st_atime_sec',
-    'st_atime_nsec', 'md5', 'test',
+    'st_atime_nsec', 'md5', 'whole_file_checksum', 'test',
 )
 
 
diff --git a/obnamlib/plugins/backup_plugin.py b/obnamlib/plugins/backup_plugin.py
index 29512ad3..c263483f 100644
--- a/obnamlib/plugins/backup_plugin.py
+++ b/obnamlib/plugins/backup_plugin.py
@@ -727,10 +727,8 @@ class BackupPlugin(obnamlib.ObnamPlugin):
         tracing.trace('opening file for reading')
         f = self.fs.open(filename, 'r')
 
-        if obnamlib.REPO_FILE_MD5 in self.repo.get_allowed_file_keys():
-            summer = hashlib.md5()
-        else:
-            summer = None
+        checksum_key = self.repo.get_client_checksum_key(self.client_name)
+        whole_file_summer = obnamlib.WholeFileCheckSummer(checksum_key)
 
         chunk_size = int(self.app.settings['chunk-size'])
         while True:
@@ -742,12 +740,11 @@ class BackupPlugin(obnamlib.ObnamPlugin):
                 break
             tracing.trace('got %d bytes of data' % len(data))
             self.progress.update_progress_with_scanned(len(data))
-            if summer:
-                summer.update(data)
             if not self.pretend:
                 chunk_id = self.backup_file_chunk(data)
                 self.repo.append_file_chunk_id(
                     self.new_generation, filename, chunk_id)
+                whole_file_summer.append_chunk(data, chunk_id)
             else:
                 self.progress.update_progress_with_upload(len(data))
 
@@ -762,8 +759,11 @@ class BackupPlugin(obnamlib.ObnamPlugin):
         self.app.dump_memory_profile('at end of file content backup for %s' %
                                      filename)
         tracing.trace('done backing up file contents')
-        if summer:
-            metadata.md5 = summer.digest()
+
+        if checksum_key == obnamlib.REPO_FILE_MD5:
+            metadata.md5 = whole_file_summer.get_checksum()
+        else:
+            metadata.whole_file_checksum = whole_file_summer.get_checksum()
 
     def backup_file_chunk(self, data):
         '''Back up a chunk of data by putting it into the repository.'''