String PID support

Author: undefined-moe

vj4/handler/contest.py

@@ -24,7 +24,7 @@
 from vj4.util import pagination
 
 
-@app.route('/contest', 'contest_main')
+@app.route('/c', 'contest_main')
 class ContestMainHandler(contest.ContestMixin, base.Handler):
   CONTESTS_PER_PAGE = 20
 
@@ -47,7 +47,7 @@ async def get(self, *, rule: int=0, page: int=1):
                 tdocs=tdocs, tsdict=tsdict)
 
 
-@app.route('/contest/{tid:\w{24}}', 'contest_detail')
+@app.route('/c/{tid:\w{24}}', 'contest_detail')
 class ContestDetailHandler(contest.ContestMixin, base.OperationHandler):
   DISCUSSIONS_PER_PAGE = 15
 
@@ -105,7 +105,7 @@ async def post_attend(self, *, tid: objectid.ObjectId):
     self.json_or_redirect(self.url)
 
 
-@app.route('/contest/{tid:\w{24}}/code', 'contest_code')
+@app.route('/c/{tid:\w{24}}/code', 'contest_code')
 class ContestCodeHandler(base.OperationHandler):
   @base.limit_rate('contest_code', 3600, 60)
   @base.route_argument
@@ -132,7 +132,7 @@ async def get(self, *, tid: objectid.ObjectId):
                       file_name='{}.zip'.format(tdoc['title']))
 
 
-@app.route('/contest/{tid}/{pid:-?\d+|\w{24}}', 'contest_detail_problem')
+@app.route('/c/{tid}/p/{pid:[a-zA-Z0-9]+}', 'contest_detail_problem')
 class ContestDetailProblemHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_CONTEST)
@@ -163,7 +163,7 @@ async def get(self, *, tid: objectid.ObjectId, pid: document.convert_doc_id):
                 page_title=pdoc['title'], path_components=path_components)
 
 
-@app.route('/contest/{tid}/{pid}/submit', 'contest_detail_problem_submit')
+@app.route('/c/{tid}/p/{pid}/submit', 'contest_detail_problem_submit')
 class ContestDetailProblemSubmitHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_CONTEST)
@@ -233,7 +233,7 @@ async def post(self, *, tid: objectid.ObjectId, pid: document.convert_doc_id,
       self.json_or_redirect(self.reverse_url('record_detail', rid=rid))
 
 
-@app.route('/contest/{tid}/scoreboard', 'contest_scoreboard')
+@app.route('/c/{tid}/scoreboard', 'contest_scoreboard')
 class ContestScoreboardHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_CONTEST)
@@ -251,7 +251,7 @@ async def get(self, *, tid: objectid.ObjectId):
                 page_title=page_title, path_components=path_components)
 
 
-@app.route('/contest/{tid}/scoreboard/download/{ext}', 'contest_scoreboard_download')
+@app.route('/c/{tid}/scoreboard/download/{ext}', 'contest_scoreboard_download')
 class ContestScoreboardDownloadHandler(contest.ContestMixin, base.Handler):
   def _export_status_as_csv(self, rows):
     # \r\n for notepad compatibility
@@ -321,7 +321,7 @@ async def post(self, *, title: str, content: str, rule: int,
     self.json_or_redirect(self.reverse_url('contest_detail', tid=tid))
 
 
-@app.route('/contest/{tid}/edit', 'contest_edit')
+@app.route('/c/{tid}/edit', 'contest_edit')
 class ContestEditHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_priv(builtin.PRIV_USER_PROFILE)

vj4/handler/homework.py

@@ -51,7 +51,7 @@ def _format_penalty_rules_yaml(penalty_rules):
   return yaml_doc
 
 
-@app.route('/homework', 'homework_main')
+@app.route('/h', 'homework_main')
 class HomeworkMainHandler(contest.ContestMixin, base.Handler):
   @base.require_perm(builtin.PERM_VIEW_HOMEWORK)
   async def get(self):
@@ -72,7 +72,7 @@ async def get(self):
     self.render('homework_main.html', tdocs=tdocs, calendar_tdocs=calendar_tdocs)
 
 
-@app.route('/homework/{tid:\w{24}}', 'homework_detail')
+@app.route('/h/{tid:\w{24}}', 'homework_detail')
 class HomeworkDetailHandler(contest.ContestMixin, base.OperationHandler):
   DISCUSSIONS_PER_PAGE = 15
 
@@ -130,7 +130,7 @@ async def post_attend(self, *, tid: objectid.ObjectId):
     self.json_or_redirect(self.url)
 
 
-@app.route('/homework/{tid:\w{24}}/code', 'homework_code')
+@app.route('/h/{tid:\w{24}}/code', 'homework_code')
 class HomeworkCodeHandler(base.OperationHandler):
   @base.limit_rate('homework_code', 3600, 60)
   @base.route_argument
@@ -157,7 +157,7 @@ async def get(self, *, tid: objectid.ObjectId):
                       file_name='{}.zip'.format(tdoc['title']))
 
 
-@app.route('/homework/{tid}/{pid:-?\d+|\w{24}}', 'homework_detail_problem')
+@app.route('/h/{tid}/p/{pid:[a-zA-Z0-9]+}', 'homework_detail_problem')
 class HomeworkDetailProblemHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_HOMEWORK)
@@ -188,7 +188,7 @@ async def get(self, *, tid: objectid.ObjectId, pid: document.convert_doc_id):
                 page_title=pdoc['title'], path_components=path_components)
 
 
-@app.route('/homework/{tid}/{pid}/submit', 'homework_detail_problem_submit')
+@app.route('/h/{tid}/p/{pid}/submit', 'homework_detail_problem_submit')
 class HomeworkDetailProblemSubmitHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_HOMEWORK)
@@ -257,7 +257,7 @@ async def post(self, *, tid: objectid.ObjectId, pid: document.convert_doc_id,
       self.json_or_redirect(self.reverse_url('record_detail', rid=rid))
 
 
-@app.route('/homework/{tid}/scoreboard', 'homework_scoreboard')
+@app.route('/h/{tid}/scoreboard', 'homework_scoreboard')
 class HomeworkScoreboardHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_HOMEWORK)
@@ -275,7 +275,7 @@ async def get(self, *, tid: objectid.ObjectId):
                 page_title=page_title, path_components=path_components)
 
 
-@app.route('/homework/{tid}/scoreboard/download/{ext}', 'homework_scoreboard_download')
+@app.route('/h/{tid}/scoreboard/download/{ext}', 'homework_scoreboard_download')
 class HomeworkScoreboardDownloadHandler(contest.ContestMixin, base.Handler):
   def _export_status_as_csv(self, rows):
     # \r\n for notepad compatibility
@@ -357,7 +357,7 @@ async def post(self, *, title: str, content: str,
     self.json_or_redirect(self.reverse_url('homework_detail', tid=tid))
 
 
-@app.route('/homework/{tid}/edit', 'homework_edit')
+@app.route('/h/{tid}/edit', 'homework_edit')
 class HomeworkEditHandler(contest.ContestMixin, base.Handler):
   @base.require_priv(builtin.PRIV_USER_PROFILE)
   @base.require_perm(builtin.PERM_EDIT_HOMEWORK)

vj4/handler/problem.py

@@ -90,7 +90,7 @@ async def star_unstar(self, *, pid: document.convert_doc_id, star: bool):
   post_unstar = functools.partialmethod(star_unstar, star=False)
 
 
-@app.route('/p/random', 'problem_random')
+@app.route('/problem/random', 'problem_random')
 class ProblemRandomHandler(base.Handler):
   @base.require_perm(builtin.PERM_VIEW_PROBLEM)
   @base.route_argument
@@ -185,7 +185,7 @@ async def get(self, *, category: str):
       self.json_or_redirect(self.referer_or_main)
 
 
-@app.route('/p/{pid:-?\d+|\w{24}}', 'problem_detail')
+@app.route('/p/{pid:[a-zA-Z0-9]+}', 'problem_detail')
 class ProblemDetailHandler(base.OperationHandler):
   async def _get_related_trainings(self, pid):
     if self.has_perm(builtin.PERM_VIEW_TRAINING):
@@ -568,7 +568,7 @@ async def get(self, *, pid: document.convert_doc_id):
                                    secret=fdoc['metadata']['secret']))
 
 
-@app.route('/p/create', 'problem_create')
+@app.route('/problem/create', 'problem_create')
 class ProblemCreateHandler(base.Handler):
   @base.require_priv(builtin.PRIV_USER_PROFILE)
   @base.require_perm(builtin.PERM_CREATE_PROBLEM)
@@ -580,16 +580,15 @@ async def get(self):
   @base.post_argument
   @base.require_csrf_token
   @base.sanitize
-  async def post(self, *, title: str, content: str, hidden: bool=False, numeric_pid: bool=False):
-    pid = None
-    if numeric_pid:
+  async def post(self, *, title: str, content: str, hidden: bool=False, pid: str):
+    if not pid:
       pid = await domain.inc_pid_counter(self.domain_id)
     pid = await problem.add(self.domain_id, title, content, self.user['_id'],
                             hidden=hidden, pid=pid)
     self.json_or_redirect(self.reverse_url('problem_settings', pid=pid))
 
 
-@app.route('/p/copy', 'problem_copy')
+@app.route('/problem/copy', 'problem_copy')
 class ProblemCopyHandler(base.Handler):
   MAX_PROBLEMS_PER_REQUEST = 20
 
@@ -791,7 +790,7 @@ async def get(self, *, pid: document.convert_doc_id):
                 page_title=pdoc['title'], path_components=path_components)
 
 
-@app.route('/p/search', 'problem_search')
+@app.route('/problem/search', 'problem_search')
 class ProblemSearchHandler(base.Handler):
   @base.get_argument
   @base.route_argument

vj4/locale/zh_CN.yaml

@@ -773,7 +773,8 @@ display_name: 显示名
 home_domain_account: 当前域的设置
 'The value `{1}` of {0} already exists.': '{0} 的值 `{1}` 已经存在。'
 Display name {1} you want to set is used by others.: 您想要设置的显示名 {1} 已经被其他人使用了。
-Numeric PID: 数字题号
+Leave blank to use an allocated one.: 留空以自动获取题号
+PID: 题号
 Only {0} problems can be copied in one request, got {1}.: 一次请求只能复制 {0} 个题目，但是您输入了 {1} 个。
 Problem is successfully copied.: 题目复制完成。
 problem_copy: 复制题目

vj4/model/adaptor/problem.py

@@ -39,6 +39,10 @@ async def add(domain_id: str, title: str, content: str, owner_uid: int,
               category: list=[], tag: list=[], hidden: bool=False):
   validator.check_title(title)
   validator.check_content(content)
+  try:
+    pid = int(pid)
+  except ValueError:
+    validator.check_string_pid(pid)
   pid = await document.add(domain_id, content, owner_uid, document.TYPE_PROBLEM,
                            pid, title=title, data=data, category=category, tag=tag,
                            hidden=hidden, num_submit=0, num_accept=0)

vj4/ui/templates/components/problem.html

@@ -10,7 +10,7 @@
   {%- endif %}
   >
   {%- endif %}
-    {% if pdoc['doc_id']|string|length < 10 %}P{{ pdoc['doc_id'] }} {% endif %}{{ pdoc['title'] }}
+  {% if pdoc['doc_id'] is number %}P {{ pdoc['doc_id'] }}{% elif pdoc['doc_id']|string|length < 10 %} {{ pdoc['doc_id'] }} {% endif %}{{ pdoc['title'] }}
   {%- if not invalid %}
   </a>
   {%- endif %}

vj4/ui/templates/problem_edit.html

@@ -6,19 +6,19 @@
       <div class="section__body">
         <form method="post">
           <div class="row">
-            <div class="medium-8 columns">
+            <div class="medium-7 columns">
               <label>
                 {{ _('Title') }}
                 <input name="title" placeholder="{{ _('title') }}" value="{{ pdoc['title']|default('') }}" class="textbox" autofocus>
               </label>
             </div>
             {% if page_name == 'problem_create' %}
-            <div class="medium-2 columns">
+            <div class="medium-3 columns">
               <label>
-                {{ _('Settings') }}
+                {{ _('PID') }}
                 <br>
-                <label class="checkbox">
-                  <input type="checkbox" name="numeric_pid" value="on" checked>{{ _('Numeric PID') }}
+                <label>
+                  <input name="pid" placeholder="{{ _('Leave blank to use an allocated one.') }}" class="textbox">
                 </label>
               </label>
             </div>

vj4/util/validator.py

@@ -12,6 +12,8 @@
 ID_RE = re.compile(r'[^\\/\s\u3000]([^\\/\n\r]*[^\\/\s\u3000])?')
 ROLE_RE = re.compile(r'[_0-9A-Za-z]{1,256}')
 DOMAIN_INVITATION_CODE_RE = re.compile(r'[0-9A-Za-z]{1,64}')
+PID_RE1 = re.compile(r'[a-zA-Z0-9]*[a-zA-Z]+[a-zA-Z0-9]*')
+PID_RE2 = re.compile(r'[a-zA-Z0-9]{3,23}')
 
 
 def is_uid(s):
@@ -23,6 +25,15 @@ def check_uid(s):
     raise error.ValidationError('uid')
 
 
+def is_string_pid(s):
+  return bool(PID_RE1.fullmatch(s)) and bool(PID_RE2.fullmatch(s))
+
+
+def check_string_pid(s):
+  if not is_string_pid(s):
+    raise error.ValidationError('pid')
+
+
 def is_uname(s):
   return bool(UNAME_RE.fullmatch(s))