Ticket #22557: 22557.diff

django/contrib/staticfiles/management/commands/collectstatic.py

@@ -87 +87 @@
 
         if self.clear:
             self.clear_dir('')
+            
+        if hasattr(self.storage, "on_collectstatic"):
+            self.storage.on_collectstatic(self)            
 
         if self.symlink:
             handler = self.link_file

django/contrib/staticfiles/storage.py

@@ -316 +316 @@
                                    self).post_process(*args, **kwargs)
         for post_processed in all_post_processed:
             yield post_processed
+        self.save_manifest()
+    
+    def save_manifest(self):
         payload = {'paths': self.hashed_files, 'version': self.manifest_version}
         if self.exists(self.manifest_name):
             self.delete(self.manifest_name)
         contents = json.dumps(payload).encode('utf-8')
         self._save(self.manifest_name, ContentFile(contents))
 
+    def on_collectstatic(self, command):
+        self.hashed_files = OrderedDict()
+
 
 class _MappingCache(object):
     """

tests/staticfiles_tests/tests.py

@@ -669 +669 @@
         manifest = storage.staticfiles_storage.load_manifest()
         self.assertEqual(hashed_files, manifest)
 
+    def test_manifest_on_collectstatic(self):
+        '''
+        staticfiles.json manifest doesn't persist stale/deleted records, see #22557
+        '''
+        self.assertNotIn("old_deleted_file", storage.staticfiles_storage.hashed_files)
+        storage.staticfiles_storage.hashed_files["old_deleted_file"] = "record"
+        if hasattr(storage, "save_manifest"):
+            storage.staticfiles_storage.save_manifest()
+        else:
+            #Test will run correctly without previous version of ManifestFilesMixin
+            #That did post-processing and saving in one method
+            found_files = {}
+            for p in storage.staticfiles_storage.post_process(found_files):
+                pass
+        storage.staticfiles_storage.load_manifest()
+        self.assertEqual(
+            storage.staticfiles_storage.hashed_files["old_deleted_file"], 
+            "record")
+        self.run_collectstatic()
+        self.assertNotIn("old_deleted_file", storage.staticfiles_storage.hashed_files)
+
 
 # we set DEBUG to False here since the template tag wouldn't work otherwise
 @override_settings(**dict(