Merge pull request #70 from 2i2c-org/red

Add a redirect for content files

comptest/web/migrations/0017_alter_contentfile_slug.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.0.7 on 2024-09-23 12:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("web", "0016_alter_page_mimetype"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contentfile",
+            name="slug",
+            field=models.SlugField(
+                help_text="Slug used to refer to this image",
+                max_length=128,
+                unique=True,
+            ),
+        ),
+    ]

comptest/web/models.py

@@ -117,7 +117,7 @@ class ContentFile(models.Model):
 
     title = models.CharField(max_length=1024)
     slug = models.SlugField(
-        max_length=128, help_text="Slug used to refer to this image"
+        max_length=128, help_text="Slug used to refer to this image", unique=True
     )
     file = models.FileField(upload_to="content-files/%Y/%m/%d/")
 

comptest/web/urls.py

@@ -10,6 +10,7 @@
     path("teams/<int:id>", teams.view, name="teams-view"),
     path("teams/<int:id>/add-member", teams.add_member, name="teams-add-member"),
     path("page/<slug:slug>", pages.view, name="page-view"),
+    path("file/<slug:slug>", pages.content_file, name="content-file"),
     path("leaderboard", default.leaderboard, name="leaderboard"),
     path("", pages.home, name="home"),
 ]

comptest/web/views/pages.py

@@ -1,11 +1,11 @@
 from django.conf import settings
 from django.http import Http404, HttpRequest, HttpResponse
-from django.shortcuts import render
+from django.shortcuts import redirect, render
 from markdown_it import MarkdownIt
 from mdit_py_plugins.footnote import footnote_plugin
 from mdit_py_plugins.front_matter import front_matter_plugin
 
-from ..models import Page
+from ..models import ContentFile, Page
 
 
 def view(request: HttpRequest, slug: str) -> HttpResponse:
@@ -48,3 +48,14 @@ def home(request: HttpRequest) -> HttpResponse:
         "challenge_state": settings.CHALLENGE_STATE,
     }
     return render(request, "page/view.html", context)
+
+
+def content_file(request: HttpRequest, slug: str) -> HttpResponse:
+    """
+    Redirect to file with given slug
+    """
+    try:
+        cf = ContentFile.objects.get(slug=slug)
+    except Page.DoesNotExist:
+        return Http404()
+    return redirect(cf.file.url)