make sure deleting a version calls the file cleanup signal (bug 709648)

Andy McKay · Andy McKay · commit 02b6cfb657a1 · 2012-03-23T12:36:39.000-07:00
diff --git a/apps/files/models.py b/apps/files/models.py
@@ -501,6 +501,8 @@ def cleanup_file(sender, instance, **kw):
         except models.ObjectDoesNotExist:
             return
         if os.path.exists(filename):
+            log.info('Removing filename: %s for file: %s'
+                     % (filename, instance.pk))
             os.remove(filename)
 
 
diff --git a/apps/files/tests/test_models.py b/apps/files/tests/test_models.py
@@ -99,6 +99,11 @@ def check_delete(self, file_, filename):
             if os.path.exists(filename):
                 os.remove(filename)
 
+    def test_delete_by_version(self):
+        f = File.objects.get(pk=67442)
+        version = f.version
+        self.check_delete(version, f.file_path)
+
     def test_delete_file_path(self):
         f = File.objects.get(pk=67442)
         self.check_delete(f, f.file_path)
diff --git a/apps/versions/models.py b/apps/versions/models.py
@@ -366,6 +366,14 @@ def update_incompatible_versions(sender, instance, **kw):
     tasks.update_incompatible_appversions.delay([instance.id])
 
 
+def cleanup_version(sender, instance, **kw):
+    """On delete of the version object call the file delete and signals."""
+    if kw.get('raw'):
+        return
+    for file_ in instance.all_files:
+        file_.delete()
+
+
 version_uploaded = django.dispatch.Signal()
 models.signals.post_save.connect(update_status, sender=Version,
                                  dispatch_uid='version_update_status')
@@ -375,8 +383,11 @@ def update_incompatible_versions(sender, instance, **kw):
                                    dispatch_uid='version_update_status')
 models.signals.post_save.connect(update_incompatible_versions, sender=Version,
                                  dispatch_uid='version_update_incompat')
-models.signals.post_delete.connect(update_incompatible_versions, sender=Version,
+models.signals.post_delete.connect(update_incompatible_versions,
+                                   sender=Version,
                                    dispatch_uid='version_update_incompat')
+models.signals.pre_delete.connect(cleanup_version, sender=Version,
+                                   dispatch_uid='cleanup_version')
 
 
 class LicenseManager(amo.models.ManagerBase):
