Skip to content

Fix viewing testrun results (issue #123) #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 6, 2023
Merged

Fix viewing testrun results (issue #123) #124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30f5fa4
Fix for issue #123
Dec 20, 2022
ae04323
Revert "Fix for issue #123"
otargowski Mar 5, 2023
97c9369
Fix zipfile handling in testruns (issue #123)
otargowski Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions oioioi/testrun/controllers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import shutil
import tempfile
from zipfile import is_zipfile

from django import forms
from django.conf import settings
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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,
},
)

Expand All @@ -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,
Expand Down
18 changes: 18 additions & 0 deletions oioioi/testrun/migrations/0009_testrunprogramsubmission_input_is_zip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is data migration needed? if not I suggest to add some comment in the code why it can be skipped.


dependencies = [
('testrun', '0008_auto_20201214_0012'),
]

operations = [
migrations.AddField(
model_name='testrunprogramsubmission',
name='input_is_zip',
field=models.BooleanField(default=False),
),
]
1 change: 1 addition & 0 deletions oioioi/testrun/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 4 additions & 1 deletion oioioi/testrun/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this would return "input.in.zip", what about using "input.in" for regular inputs and "input.zip" for zip files?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My rationale was that that after unzipping the user should get the same filename as the one for uncompressed input, but now I see that the zipfile contains the input in a user-named file, so it's irrelevant.

While we're at it, would you agree that the filename should contain some additional information like it does for normal ins and outs (problems_1_rok1a.in/.out)?
I'd go with something like testruns_{submission_id}_{short_problem_name}.in/.zip/.out.

return stream_file(submission.input_file, name=name)


@enforce_condition(contest_exists & can_enter_contest)
Expand Down