String PID Support

Author: undefined-moe

vj4/handler/contest.py

@@ -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('/contest/{tid}/{pid:[A-Z0-9]+}', 'contest_detail_problem')
 class ContestDetailProblemHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_CONTEST)

vj4/handler/homework.py

@@ -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('/homework/{tid}/{pid:[A-Z0-9]+}', 'homework_detail_problem')
 class HomeworkDetailProblemHandler(contest.ContestMixin, base.Handler):
   @base.route_argument
   @base.require_perm(builtin.PERM_VIEW_HOMEWORK)

vj4/handler/problem.py

@@ -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-Z0-9]+}', 'problem_detail')
 class ProblemDetailHandler(base.OperationHandler):
   async def _get_related_trainings(self, pid):
     if self.has_perm(builtin.PERM_VIEW_TRAINING):
@@ -580,9 +580,8 @@ 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)

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,7 @@ 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)
+  validator.check_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/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,7 @@
 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_RE = re.compile(r'[0-9A-Z]{1,23}')
 
 
 def is_uid(s):
@@ -23,6 +24,15 @@ def check_uid(s):
     raise error.ValidationError('uid')
 
 
+def is_pid(s):
+  return bool(PID_RE.fullmatch(s))
+
+
+def check_uid(s):
+  if not is_pid(s):
+    raise error.ValidationError('pid')
+
+
 def is_uname(s):
   return bool(UNAME_RE.fullmatch(s))