Ticket #4339: override_existing_files_patch.diff

db/models/base.py

@@ -361 +361 @@
     def _get_FIELD_size(self, field):
         return os.path.getsize(self._get_FIELD_filename(field))
 
-    def _save_FIELD_file(self, field, filename, raw_contents, save=True):
+    def _save_FIELD_file(self, field, filename, raw_contents, save=True, override=False):
         directory = field.get_directory_name()
         try: # Create the date-based directory if it doesn't exist.
             os.makedirs(os.path.join(settings.MEDIA_ROOT, directory))
@@ -371 +371 @@
 
         # If the filename already exists, keep adding an underscore to the name of
         # the file until the filename doesn't exist.
-        while os.path.exists(os.path.join(settings.MEDIA_ROOT, filename)):
-            try:
-                dot_index = filename.rindex('.')
-            except ValueError: # filename has no dot
-                filename += '_'
-            else:
-                filename = filename[:dot_index] + '_' + filename[dot_index:]
+        if not override:
+            while os.path.exists(os.path.join(settings.MEDIA_ROOT, filename)):
+                try:
+                    dot_index = filename.rindex('.')
+                except ValueError: # filename has no dot
+                    filename += '_'
+                else:
+                    filename = filename[:dot_index] + '_' + filename[dot_index:]
 
         # Write the file to disk.
         setattr(self, field.attname, filename)

db/models/fields/__init__.py

@@ -638 +638 @@
         setattr(cls, 'get_%s_filename' % self.name, curry(cls._get_FIELD_filename, field=self))
         setattr(cls, 'get_%s_url' % self.name, curry(cls._get_FIELD_url, field=self))
         setattr(cls, 'get_%s_size' % self.name, curry(cls._get_FIELD_size, field=self))
-        setattr(cls, 'save_%s_file' % self.name, lambda instance, filename, raw_contents, save=True: instance._save_FIELD_file(self, filename, raw_contents, save))
+        setattr(cls, 'save_%s_file' % self.name, lambda instance, filename, raw_contents, save=True, override=False: instance._save_FIELD_file(self, filename, raw_contents, save, override))
         dispatcher.connect(self.delete_file, signal=signals.post_delete, sender=cls)
 
     def delete_file(self, instance):