Fix for issue #123

Make the testrun controller check whether
the input file is a zip by extension only
and saves that information in the model.

Change a downloaded zipped input file's name,
so it has a .zip extension.

Author: pixl.dt

oioioi/testrun/controllers.py

@@ -1,6 +1,5 @@
 import shutil
 import tempfile
-from zipfile import is_zipfile
 
 from django import forms
 from django.conf import settings
@@ -209,6 +208,8 @@ def create_testrun(
         # pylint: disable=maybe-no-member
         submission.source_file.save(submit_file.name, submit_file)
         input_file = form_data['input']
+        # Same method as in validate_zip
+        submission.input_is_zip = input_file.name.upper().endswith(".ZIP")
         submission.input_file.save(input_file.name, input_file)
         if commit:
             submission.save()
@@ -279,7 +280,7 @@ def render_submission(self, request, submission):
             context={
                 'submission': submission_template_context(request, sbm_testrun),
                 'supported_extra_args': self.get_supported_extra_args(submission),
-                'input_is_zip': is_zipfile(sbm_testrun.input_file),
+                'input_is_zip': sbm_testrun.input_is_zip,
             },
         )
 
@@ -294,9 +295,7 @@ def _render_testrun_report(
 
         input_is_zip = False
         if testrun_report:
-            input_is_zip = is_zipfile(
-                testrun_report.submission_report.submission.programsubmission.testrunprogramsubmission.input_file
-            )
+            input_is_zip = testrun_report.submission_report.submission.programsubmission.testrunprogramsubmission.input_is_zip
 
         return render_to_string(
             template,

oioioi/testrun/migrations/0009_testrunprogramsubmission_input_is_zip.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2022-12-20 19:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('testrun', '0008_auto_20201214_0012'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='testrunprogramsubmission',
+            name='input_is_zip',
+            field=models.BooleanField(default=False),
+        ),
+    ]

oioioi/testrun/models.py

@@ -27,6 +27,7 @@ def make_custom_input_filename(instance, filename):
 class TestRunProgramSubmission(ProgramSubmission):
     __test__ = False
     input_file = FileField(upload_to=make_custom_input_filename)
+    input_is_zip = models.BooleanField(default=False)
 
 
 def make_custom_output_filename(instance, filename):

oioioi/testrun/views.py

@@ -127,7 +127,10 @@ def download_input_file_view(request, submission_id):
     submission = get_submission_or_error(
         request, submission_id, TestRunProgramSubmission
     )
-    return stream_file(submission.input_file, name='input.in')
+    name='input.in'
+    if submission.input_is_zip:
+        name+='.zip'
+    return stream_file(submission.input_file, name=name)
 
 
 @enforce_condition(contest_exists & can_enter_contest)