From 477943ed3619b3567ac88bbd1da7559db8bc823a Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 24 Jan 2021 19:21:15 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A1vkov=C3=A9=20nahr=C3=A1v=C3=A1n=C3=AD=20?=
=?UTF-8?q?u=C5=BE=20um=C3=AD=20i=20nov=C3=BD=20form=C3=A1t=20jednotliv?=
=?UTF-8?q?=C3=BDch=20=C5=99e=C5=A1en=C3=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/jobs/submit.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/mo/jobs/submit.py b/mo/jobs/submit.py
index 942d4d18..656bc54c 100644
--- a/mo/jobs/submit.py
+++ b/mo/jobs/submit.py
@@ -120,7 +120,16 @@ def parse_feedback_name(name: str) -> Optional[UploadFeedback]:
)
# Formát jmen, pod kterými se ukládají jednotlivě stahovaná řešení
- m = re.match(r'(?P<task>.+)-reseni-(?P<paper_id>\d+)\.', name)
+ m = re.match(r'(?P<task>[^_]+)_(reseni|opravene)_(?P<user_id>\d+)_', name)
+ if m:
+ return UploadFeedback(
+ file_name=name,
+ task_code=m['task'],
+ user_id=int(m['user_id']),
+ )
+
+ # Formát jmen, pod kterými se dříve ukládala jednotlivě stahovaná řešení
+ m = re.match(r'(?P<task>.+)-(reseni|opravene)-(?P<paper_id>\d+)\.', name)
if m:
paper = db.get_session().query(db.Paper).get(int(m['paper_id']))
if paper:
--
GitLab