Merge pull request #5074 from aronasorman/cant-have-too-many-collectstatics

Preserve content pack assets from collectstatic(clear=True).

Author: rtibbles

data/version.yml

@@ -6,6 +6,7 @@
     all:
       - Tweaks to our documentation (#5067)
       - Refactor assessment item asking logic in the setup command (#5065)
+      - Properly copy over docs pages while preserving content pack assets (#5074)
     students: []
     coaches: []
     admins: []

kalite/distributed/management/commands/setup.py

@@ -482,7 +482,15 @@ def handle(self, *args, **options):
         # Now deploy the static files
         logging.info("Copying static media...")
         ensure_dir(settings.STATIC_ROOT)
-        call_command("collectstatic", interactive=False, verbosity=0, ignore_patterns=['vtt', 'html', 'srt'],
+
+        # The following file ignores have to be preserved from a
+        # collectstatic(clear=True), due to being bundled with content packs,
+        # and we thus have now way of getting them back.
+        collectstatic_ignores = [
+            "*.vtt", "*.srt",              # subtitle files come with language packs -- don't delete
+            "*/perseus/ke/exercises/*", # exercises come with language packs, and we have no way to replicate
+        ]
+        call_command("collectstatic", interactive=False, verbosity=0, ignore_patterns=collectstatic_ignores,
                      clear=True)
         call_command("collectstatic_js_reverse", interactive=False)