Massively optimized... everything.

README.md

@@ -13,6 +13,15 @@ Installation instructions are currently a work in progress. Feel free to join [o
 
 ## Development Setup
 1. Clone the repository
+### Using Poetry (Recommended) 
+2. Run `pip install poetry`
+3. Run `poetry install`
+4. Run `poetry shell`
+5. Create a file called config.py with the contents of [Docker Setup #2](#using-docker) 
+5. Run `python manage.py migrate && python manage.py createsuperuser`
+6. To start the server, run `python manage.py runserver`
+
+### Using Docker
 2. Go to mCTF/docker_config.py, Set DEBUG to True and root to "http://localhost:28730" as well as deleting import config2.
 3. docker build -t mctf .
 4. docker run -p 28730:28730 mctf

container/gunicorn.py

@@ -1,4 +1,3 @@
 import multiprocessing
 
-
-workers = multiprocessing.cpu_count()
+workers = (2 * multiprocessing.cpu_count()) + 1

gameserver/admin.py

@@ -1,10 +1,8 @@
-import django.db
 from adminsortable2.admin import SortableInlineAdminMixin
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.flatpages.admin import FlatPageAdmin
 from django.contrib.flatpages.models import FlatPage
-from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
 from . import models
@@ -81,7 +79,9 @@ def get_readonly_fields(self, request, obj=None):
         fields = self.readonly_fields
         if request.user.is_superuser:
             return fields
-        if request.user.is_superuser or request.user.has_perm("gameserver.change_problem_visibility"):
+        if request.user.is_superuser or request.user.has_perm(
+            "gameserver.change_problem_visibility"
+        ):
             return fields
         fields += ("is_public",)
         return fields
@@ -97,7 +97,6 @@ def get_authors(self, obj):
 
 
 class SubmissionAdmin(admin.ModelAdmin):
-
     list_display = [
         "problem",
         "date_created",
@@ -114,13 +113,14 @@ class SubmissionAdmin(admin.ModelAdmin):
         "user__username",
         "user__full_name",
     ]
-    
+
     def display_firstblooded(self, obj: models.Submission):
         return obj.is_firstblood
-    
+
     display_firstblooded.short_description = "Firstblooded"
     display_firstblooded.boolean = True
-        # return obj.firstblooded
+    # return obj.firstblooded
+
 
 class OrganizationAdmin(admin.ModelAdmin):
     list_display = ["__str__", "owner", "member_count", "is_open"]
@@ -247,7 +247,9 @@ def get_queryset(self, request):
 
     def get_readonly_fields(self, request, obj=None):
         fields = self.readonly_fields
-        if request.user.is_superuser or request.user.has_perm("gameserver.change_contest_visibility"):
+        if request.user.is_superuser or request.user.has_perm(
+            "gameserver.change_contest_visibility"
+        ):
             return fields
         fields += ("is_public",)
         return fields
@@ -278,7 +280,8 @@ class UserAdmin(admin.ModelAdmin):
 
 
 admin.site.register(User, UserAdmin)
-admin.site.register(models.UserCache)
+admin.site.register(models.ContestScore)
+admin.site.register(models.UserScore)
 admin.site.register(models.Problem, ProblemAdmin)
 admin.site.register(models.Submission, SubmissionAdmin)
 admin.site.register(models.ProblemType)

gameserver/forms/contest.py

@@ -1,13 +1,8 @@
-from allauth.account.forms import SignupForm
 from django import forms
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
-from django.db.models import Q
-from django.forms import ModelForm
 
 from .. import models
-from ..models import choices
 
 User = get_user_model()
 

gameserver/forms/organization.py

@@ -1,13 +1,6 @@
-from allauth.account.forms import SignupForm
 from django import forms
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
-from django.db.models import Q
-from django.forms import ModelForm
-
-from .. import models
-from ..models import choices
 
 User = get_user_model()
 

gameserver/forms/problem.py

@@ -1,13 +1,6 @@
-from allauth.account.forms import SignupForm
 from django import forms
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
-from django.db.models import Q
-from django.forms import ModelForm
-
-from .. import models
-from ..models import choices
 
 User = get_user_model()
 

gameserver/forms/profile.py

@@ -2,7 +2,6 @@
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.forms import ModelForm
 

gameserver/forms/team.py

@@ -1,13 +1,8 @@
-from allauth.account.forms import SignupForm
 from django import forms
-from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.exceptions import ValidationError
-from django.db.models import Q
 from django.forms import ModelForm
 
 from .. import models
-from ..models import choices
 
 User = get_user_model()
 

gameserver/middleware.py

@@ -41,14 +41,19 @@ class RedirectFallbackTemporaryMiddleware(RedirectFallbackMiddleware):
 
 l = logging.getLogger(__name__)
 
+
 class ErrorLogMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
+
     def __call__(self, request):
         response = self.get_response(request)
         return response
+
     def process_exception(self, request, exception):
         if exception:
-            l.error(f'URI: {request.build_absolute_uri()}\n'
-                    f'Exception: {repr(exception)}\n'
-                    f'{traceback.format_exc()}')
+            l.error(
+                f"URI: {request.build_absolute_uri()}\n"
+                f"Exception: {repr(exception)}\n"
+                f"{traceback.format_exc()}"
+            )

gameserver/migrations/0001_initial.py

@@ -1,12 +1,12 @@
 # Generated by Django 4.0.1 on 2022-01-25 05:23
 
-from django.conf import settings
 import django.contrib.auth.models
 import django.contrib.auth.validators
 import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
 import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
 import gameserver.models.problem
 import gameserver.models.profile
 

gameserver/migrations/0003_alter_user_school_contact_alter_user_school_name_and_more.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.0.1 on 2022-01-26 23:58
 
 from django.db import migrations, models
-import gameserver.models.profile
 
 
 class Migration(migrations.Migration):

gameserver/migrations/0012_problem_opaque_id.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.0.1 on 2022-02-06 21:52
 
 from django.db import migrations, models
+
 import gameserver.models.problem
 
 

gameserver/migrations/0013_alter_problem_opaque_id.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.0.1 on 2022-02-08 02:50
 
 from django.db import migrations, models
+
 import gameserver.models.problem
 
 

gameserver/migrations/0014_regen_opaque_id.py

@@ -1,6 +1,8 @@
 from django.db import migrations
+
 import gameserver.models.problem
 
+
 def regen_opaque_id(apps, schema_editor):
     Problem = apps.get_model('gameserver', 'Problem')
     for row in Problem.objects.all():

gameserver/migrations/0015_alter_problem_opaque_id.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.0.1 on 2022-02-08 03:03
 
 from django.db import migrations, models
+
 import gameserver.models.problem
 
 

gameserver/migrations/0016_move_problem_files.py

@@ -1,8 +1,11 @@
-from django.db import migrations, models
-import gameserver.models.problem
-from shutil import move
 import os
+from shutil import move
+
 from django.conf import settings
+from django.db import migrations
+
+import gameserver.models.problem
+
 
 def move_problem_files(apps, schema_editor):
     MEDIA_ROOT = settings.MEDIA_ROOT

gameserver/migrations/0025_problem_firstblood.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.0.1 on 2022-11-28 17:20
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 def compute_firstblood(apps, schema_editor):

gameserver/migrations/0026_problem_firstblood_2.py

@@ -1,8 +1,7 @@
 # Generated by Django 4.0.1 on 2022-11-28 17:20
 
+from django.db import migrations
 from django.db.models import Q, F
-from django.db import migrations, models
-import django.db.models.deletion
 
 
 def compute_firstblood(apps, schema_editor):

gameserver/migrations/0028_alter_user_cache_flags_alter_user_cache_points_and_more.py

@@ -1,9 +1,8 @@
 # Generated by Django 4.0.1 on 2023-02-28 19:17
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
-import gameserver.models.profile
 
 
 class Migration(migrations.Migration):

gameserver/migrations/0029_alter_usercache_user_alter_usercache_unique_together.py

@@ -1,8 +1,8 @@
 # Generated by Django 4.0.1 on 2023-02-28 19:36
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

gameserver/migrations/0031_problem_log_submission_content_submission_content_and_more.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.0.1 on 2023-03-09 00:47
 
 from django.db import migrations, models
-import gameserver.models.profile
 
 
 class Migration(migrations.Migration):

gameserver/migrations/0032_alter_user_timezone_and_more.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.0.1 on 2024-03-05 02:51
 
 from django.db import migrations, models
-import gameserver.models.profile
 
 
 class Migration(migrations.Migration):

gameserver/models/abstract.py

@@ -3,7 +3,7 @@
 
 class Category(models.Model):
     name = models.CharField(max_length=30)
-    slug = models.SlugField(unique=True)
+    slug = models.SlugField(unique=True, db_index=True)
     description = models.TextField(blank=True)
 
     class Meta: