Merge branch 'DMOJ:master' into problem_authorship

Author: FherStk

.github/workflows/updatemessages.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install requirements
       run: |
         sudo apt-get install gettext
-        curl -O https://artifacts.crowdin.com/repo/deb/crowdin.deb
+        wget https://artifacts.crowdin.com/repo/deb/crowdin3.deb -O crowdin.deb
         sudo dpkg -i crowdin.deb
         pip install -r requirements.txt
         pip install pymysql
@@ -32,10 +32,10 @@ jobs:
         python manage.py makemessages -l en -d djangojs
     - name: Download strings from Crowdin
       env:
-        CROWDIN_API_TOKEN: ${{ secrets.CROWDIN_API_TOKEN }}
+        CROWDIN_API_TOKEN: ${{ secrets.CROWDIN_API_V2_TOKEN }}
       run: |
         cat > crowdin.yaml <<EOF
-        project_identifier: dmoj
+        project_id: 142963
 
         files:
           - source: /locale/en/LC_MESSAGES/django.po
@@ -53,7 +53,7 @@ jobs:
                 zh-TW: zh_Hant
                 sr-CS: sr_Latn
         EOF
-        echo "api_key: ${CROWDIN_API_TOKEN}" >> crowdin.yaml
+        echo "api_token: ${CROWDIN_API_TOKEN}" >> crowdin.yaml
         crowdin download
         rm crowdin.yaml
     - name: Cleanup

dmoj/settings.py

@@ -129,6 +129,9 @@
 }
 DMOJ_SELECT2_THEME = 'dmoj'
 
+DMOJ_ENABLE_COMMENTS = True
+DMOJ_ENABLE_SOCIAL = True
+
 MARKDOWN_STYLES = {}
 MARKDOWN_DEFAULT_STYLE = {}
 
@@ -398,6 +401,7 @@
     ('hr', _('Croatian')),
     ('hu', _('Hungarian')),
     ('ja', _('Japanese')),
+    ('kk', _('Kazakh')),
     ('ko', _('Korean')),
     ('pt', _('Brazilian Portuguese')),
     ('ro', _('Romanian')),

dmoj/urls.py

@@ -66,7 +66,7 @@
 
     path('2fa/', two_factor.TwoFactorLoginView.as_view(), name='login_2fa'),
     path('2fa/enable/', two_factor.TOTPEnableView.as_view(), name='enable_2fa'),
-    path('2fa/refresh/', two_factor.TOTPRefreshView.as_view(), name='refresh_2fa'),
+    path('2fa/edit/', two_factor.TOTPEditView.as_view(), name='edit_2fa'),
     path('2fa/disable/', two_factor.TOTPDisableView.as_view(), name='disable_2fa'),
     path('2fa/webauthn/attest/', two_factor.WebAuthnAttestationView.as_view(), name='webauthn_attest'),
     path('2fa/webauthn/assert/', two_factor.WebAuthnAttestView.as_view(), name='webauthn_assert'),

judge/jinja2/markdown/__init__.py

@@ -154,9 +154,9 @@ def strip_paragraphs_tags(tree):
         parent = p.getparent()
         prev = p.getprevious()
         if prev is not None:
-            prev.tail = (prev.tail or '') + p.text
+            prev.tail = (prev.tail or '') + (p.text or '')
         else:
-            parent.text = (parent.text or '') + p.text
+            parent.text = (parent.text or '') + (p.text or '')
         parent.remove(p)
 
 

judge/migrations/0145_site_data_batch_prerequisites.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.21 on 2024-01-06 04:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('judge', '0144_submission_index_cleanup'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='problemtestcase',
+            name='batch_dependencies',
+            field=models.TextField(blank=True, help_text='batch dependencies as a comma-separated list of integers', verbose_name='batch dependencies'),
+        ),
+    ]

judge/models/problem_data.py

@@ -93,4 +93,6 @@ class ProblemTestCase(models.Model):
     output_limit = models.IntegerField(verbose_name=_('output limit length'), blank=True, null=True)
     checker = models.CharField(max_length=10, verbose_name=_('checker'), choices=CHECKERS, blank=True)
     checker_args = models.TextField(verbose_name=_('checker arguments'), blank=True,
-                                    help_text=_('Checker arguments as a JSON object.'))
+                                    help_text=_('checker arguments as a JSON object'))
+    batch_dependencies = models.TextField(verbose_name=_('batch dependencies'), blank=True,
+                                          help_text=_('batch dependencies as a comma-separated list of integers'))

judge/utils/problem_data.py

@@ -57,6 +57,7 @@ def __init__(self, problem, data, cases, files):
     def make_init(self):
         cases = []
         batch = None
+        batch_count = 0
 
         def end_batch():
             if not batch['batched']:
@@ -109,14 +110,31 @@ def make_checker(case):
                 case.save(update_fields=('checker_args', 'is_pretest'))
                 (batch['batched'] if batch else cases).append(data)
             elif case.type == 'S':
+                batch_count += 1
                 if batch:
                     end_batch()
                 if case.points is None:
                     raise ProblemDataError(_('Batch start case #%d requires points.') % i)
+                dependencies = []
+                if case.batch_dependencies.strip():
+                    try:
+                        dependencies = list(map(int, case.batch_dependencies.split(',')))
+                    except ValueError:
+                        raise ProblemDataError(
+                            _('Dependencies must be a comma-separated list of integers for batch start case #%d.') % i,
+                        )
+                    for batch_number in dependencies:
+                        if batch_number >= batch_count:
+                            raise ProblemDataError(
+                                _('Dependencies must depend on previous batches for batch start case #%d.') % i,
+                            )
+                        elif batch_number < 1:
+                            raise ProblemDataError(_('Dependencies must be positive for batch start case #%d.') % i)
                 batch = {
                     'points': case.points,
                     'batched': [],
                     'is_pretest': case.is_pretest,
+                    'dependencies': dependencies,
                 }
                 if case.generator_args:
                     batch['generator_args'] = case.generator_args.splitlines()

judge/views/blog.py

@@ -107,6 +107,8 @@ def get_context_data(self, **kwargs):
                                       self.object.summary or self.object.content, 'blog')
         context['meta_description'] = metadata[0]
         context['og_image'] = self.object.og_image or metadata[1]
+        context['enable_comments'] = settings.DMOJ_ENABLE_COMMENTS
+        context['enable_social'] = settings.DMOJ_ENABLE_SOCIAL
 
         return context
 

judge/views/contests.py

@@ -293,6 +293,8 @@ def get_context_data(self, **kwargs):
                 problem_count=Count('id'),
             ),
         )
+        context['enable_comments'] = settings.DMOJ_ENABLE_COMMENTS
+        context['enable_social'] = settings.DMOJ_ENABLE_SOCIAL
         return context
 
 
@@ -677,7 +679,8 @@ def base_contest_ranking_list(contest, problems, queryset):
 def contest_ranking_list(contest, problems):
     return base_contest_ranking_list(contest, problems, contest.users.filter(virtual=0)
                                      .prefetch_related('user__organizations')
-                                     .order_by('is_disqualified', '-score', 'cumtime', 'tiebreaker'))
+                                     .annotate(submission_cnt=Count('submission'))
+                                     .order_by('is_disqualified', '-score', 'cumtime', 'tiebreaker', '-submission_cnt'))
 
 
 def get_contest_ranking_list(request, contest, participation=None, ranking_list=contest_ranking_list,

judge/views/problem.py

@@ -127,6 +127,7 @@ def get_context_data(self, **kwargs):
             raise Http404()
         context['solution'] = solution
         context['has_solved_problem'] = self.object.id in self.get_completed_problems()
+        context['enable_comments'] = settings.DMOJ_ENABLE_COMMENTS
         return context
 
     def get_comment_page(self):
@@ -201,6 +202,7 @@ def get_context_data(self, **kwargs):
                                           context['description'], 'problem')
         context['meta_description'] = self.object.summary or metadata[0]
         context['og_image'] = self.object.og_image or metadata[1]
+        context['enable_comments'] = settings.DMOJ_ENABLE_COMMENTS
 
         context['vote_perm'] = self.object.vote_permission_for_user(user)
         if context['vote_perm'].can_vote():

judge/views/problem_data.py

@@ -2,6 +2,7 @@
 import mimetypes
 import os
 from itertools import chain
+from typing import List
 from zipfile import BadZipfile, ZipFile
 
 from django.conf import settings
@@ -44,7 +45,19 @@ class ProblemDataForm(ModelForm):
     def clean_zipfile(self):
         if hasattr(self, 'zip_valid') and not self.zip_valid:
             raise ValidationError(_('Your zip file is invalid!'))
-        return self.cleaned_data['zipfile']
+
+        zipfile = self.cleaned_data['zipfile']
+        if zipfile and not zipfile.name.endswith('.zip'):
+            raise ValidationError(_("Zip files must end in '.zip'"))
+
+        return zipfile
+
+    def clean_generator(self):
+        generator = self.cleaned_data['generator']
+        if generator and generator.name == 'init.yml':
+            raise ValidationError(_('Generators must not be named init.yml.'))
+
+        return generator
 
     clean_checker_args = checker_args_cleaner
 
@@ -62,10 +75,11 @@ class ProblemCaseForm(ModelForm):
 
     class Meta:
         model = ProblemTestCase
-        fields = ('order', 'type', 'input_file', 'output_file', 'points',
-                  'is_pretest', 'output_limit', 'output_prefix', 'checker', 'checker_args', 'generator_args')
+        fields = ('order', 'type', 'input_file', 'output_file', 'points', 'is_pretest', 'output_limit',
+                  'output_prefix', 'checker', 'checker_args', 'generator_args', 'batch_dependencies')
         widgets = {
             'generator_args': HiddenInput,
+            'batch_dependencies': HiddenInput,
             'type': Select(attrs={'style': 'width: 100%'}),
             'points': NumberInput(attrs={'style': 'width: 4em'}),
             'output_prefix': NumberInput(attrs={'style': 'width: 4.5em'}),
@@ -157,7 +171,7 @@ def get_case_formset(self, files, post=False):
         return ProblemCaseFormSet(data=self.request.POST if post else None, prefix='cases', valid_files=files,
                                   queryset=ProblemTestCase.objects.filter(dataset_id=self.object.pk).order_by('order'))
 
-    def get_valid_files(self, data, post=False):
+    def get_valid_files(self, data, post=False) -> List[str]:
         try:
             if post and 'problem-data-zipfile-clear' in self.request.POST:
                 return []
@@ -166,26 +180,35 @@ def get_valid_files(self, data, post=False):
             elif data.zipfile:
                 return ZipFile(data.zipfile.path).namelist()
         except BadZipfile:
-            return []
+            raise
         return []
 
     def get_context_data(self, **kwargs):
         context = super(ProblemDataView, self).get_context_data(**kwargs)
+        valid_files = []
         if 'data_form' not in context:
             context['data_form'] = self.get_data_form()
-            valid_files = context['valid_files'] = self.get_valid_files(context['data_form'].instance)
-            context['data_form'].zip_valid = valid_files is not False
-            context['cases_formset'] = self.get_case_formset(valid_files)
-        context['valid_files_json'] = mark_safe(json.dumps(context['valid_files']))
-        context['valid_files'] = set(context['valid_files'])
+            try:
+                valid_files = self.get_valid_files(context['data_form'].instance)
+            except BadZipfile:
+                pass
+        context['valid_files'] = set(valid_files)
+        context['valid_files_json'] = mark_safe(json.dumps(valid_files))
+
+        context['cases_formset'] = self.get_case_formset(valid_files)
         context['all_case_forms'] = chain(context['cases_formset'], [context['cases_formset'].empty_form])
         return context
 
     def post(self, request, *args, **kwargs):
         self.object = problem = self.get_object()
         data_form = self.get_data_form(post=True)
-        valid_files = self.get_valid_files(data_form.instance, post=True)
-        data_form.zip_valid = valid_files is not False
+        try:
+            valid_files = self.get_valid_files(data_form.instance, post=True)
+            data_form.zip_valid = True
+        except BadZipfile:
+            valid_files = []
+            data_form.zip_valid = False
+
         cases_formset = self.get_case_formset(valid_files, post=True)
         if data_form.is_valid() and cases_formset.is_valid():
             data = data_form.save()

judge/views/two_factor.py

@@ -50,7 +50,7 @@ class TOTPEnableView(TOTPView):
     title = gettext_lazy('Enable Two-factor Authentication')
     form_class = TOTPEnableForm
     template_name = 'registration/totp_enable.html'
-    is_refresh = False
+    is_edit = False
 
     def get(self, request, *args, **kwargs):
         profile = self.profile
@@ -76,9 +76,9 @@ def post(self, request, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super(TOTPEnableView, self).get_context_data(**kwargs)
         context['totp_key'] = self.request.session['totp_enable_key']
-        context['scratch_codes'] = [] if self.is_refresh else json.loads(self.profile.scratch_codes)
+        context['scratch_codes'] = [] if self.is_edit else json.loads(self.profile.scratch_codes)
         context['qr_code'] = self.render_qr_code(self.request.user.username, context['totp_key'])
-        context['is_refresh'] = self.is_refresh
+        context['is_edit'] = self.is_edit
         context['is_hardcore'] = settings.DMOJ_2FA_HARDCORE
         return context
 
@@ -106,9 +106,9 @@ def render_qr_code(cls, username, key):
         return 'data:image/png;base64,' + base64.b64encode(buf.getvalue()).decode('ascii')
 
 
-class TOTPRefreshView(TOTPEnableView):
-    title = gettext_lazy('Refresh Two-factor Authentication')
-    is_refresh = True
+class TOTPEditView(TOTPEnableView):
+    title = gettext_lazy('Edit Two-factor Authentication')
+    is_edit = True
 
     def check_skip(self):
         return not self.profile.is_totp_enabled