Skip to content

Commit ae04323

Browse files
committed
Revert "Fix for issue #123"
This reverts commit 30f5fa4.
1 parent 30f5fa4 commit ae04323

File tree

4 files changed

+6
-27
lines changed

4 files changed

+6
-27
lines changed

oioioi/testrun/controllers.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import shutil
22
import tempfile
3+
from zipfile import is_zipfile
34

45
from django import forms
56
from django.conf import settings
@@ -208,8 +209,6 @@ def create_testrun(
208209
# pylint: disable=maybe-no-member
209210
submission.source_file.save(submit_file.name, submit_file)
210211
input_file = form_data['input']
211-
# Same method as in validate_zip
212-
submission.input_is_zip = input_file.name.upper().endswith(".ZIP")
213212
submission.input_file.save(input_file.name, input_file)
214213
if commit:
215214
submission.save()
@@ -280,7 +279,7 @@ def render_submission(self, request, submission):
280279
context={
281280
'submission': submission_template_context(request, sbm_testrun),
282281
'supported_extra_args': self.get_supported_extra_args(submission),
283-
'input_is_zip': sbm_testrun.input_is_zip,
282+
'input_is_zip': is_zipfile(sbm_testrun.input_file),
284283
},
285284
)
286285

@@ -295,7 +294,9 @@ def _render_testrun_report(
295294

296295
input_is_zip = False
297296
if testrun_report:
298-
input_is_zip = testrun_report.submission_report.submission.programsubmission.testrunprogramsubmission.input_is_zip
297+
input_is_zip = is_zipfile(
298+
testrun_report.submission_report.submission.programsubmission.testrunprogramsubmission.input_file
299+
)
299300

300301
return render_to_string(
301302
template,

oioioi/testrun/migrations/0009_testrunprogramsubmission_input_is_zip.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

oioioi/testrun/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def make_custom_input_filename(instance, filename):
2727
class TestRunProgramSubmission(ProgramSubmission):
2828
__test__ = False
2929
input_file = FileField(upload_to=make_custom_input_filename)
30-
input_is_zip = models.BooleanField(default=False)
3130

3231

3332
def make_custom_output_filename(instance, filename):

oioioi/testrun/views.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ def download_input_file_view(request, submission_id):
127127
submission = get_submission_or_error(
128128
request, submission_id, TestRunProgramSubmission
129129
)
130-
name='input.in'
131-
if submission.input_is_zip:
132-
name+='.zip'
133-
return stream_file(submission.input_file, name=name)
130+
return stream_file(submission.input_file, name='input.in')
134131

135132

136133
@enforce_condition(contest_exists & can_enter_contest)

0 commit comments

Comments
 (0)