core: 支持显示时空限制 (#65)

虽然有点丑，但是能用

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.21.19",
+    "version": "2.22.0",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/handler/problem.ts

@@ -11,6 +11,7 @@ import {
 import paginate from '../lib/paginate';
 import { isPid } from '../lib/validator';
 import difficultyAlgorithm from '../lib/difficulty';
+import { parseConfig } from '../lib/testdataConfig';
 import * as system from '../model/system';
 import problem from '../model/problem';
 import record from '../model/record';
@@ -189,6 +190,12 @@ export class ProblemDetailHandler extends ProblemHandler {
         // e.g. ![img](a.jpg) will navigate to ![img](./pid/file/a.jpg)
         this.response.body.pdoc.content = this.response.body.pdoc.content
             .replace(/\(file:\/\//g, `(./${this.pdoc.docId}/file/`);
+        // Get time and memory limit
+        try {
+            this.response.body.pdoc.config = await parseConfig(this.pdoc.config);
+        } catch (e) {
+            this.response.body.pdoc.config = `Cannot parse: ${e.message}`;
+        }
     }
 
     @param('pid', Types.UnsignedInt)

packages/hydrooj/src/interface.ts

@@ -189,7 +189,6 @@ declare module './model/problem' {
         data: FileInfo[],
         additional_file: FileInfo[],
         hidden: boolean,
-        acMsg?: string,
         html?: boolean,
         difficulty?: number,
         /** @deprecated */

packages/hydrooj/src/lib/testdataConfig.ts

@@ -21,24 +21,26 @@ export async function parseConfig(config: string | ProblemConfig) {
     let cfg: ProblemConfig = {};
     if (typeof config === 'string') {
         // TODO should validate here?
-        cfg = readYamlCases(load(config) as Record<string, any>) as ProblemConfig;
+        cfg = await readYamlCases(load(config) as Record<string, any>) as ProblemConfig;
     } else cfg = config;
-    if (cfg.cases) {
-        for (const c of cfg.cases) {
-            result.memoryMax = Math.max(result.memoryMax, c.memory);
-            result.memoryMin = Math.min(result.memoryMin, c.memory);
-            result.timeMax = Math.max(result.timeMax, c.time);
-            result.timeMin = Math.min(result.timeMin, c.time);
-            result.count++;
-        }
-    } else if (cfg.subtasks) {
+    if (cfg.subtasks.length) {
         for (const subtask of cfg.subtasks) {
             result.memoryMax = Math.max(result.memoryMax, subtask.memory);
             result.memoryMin = Math.min(result.memoryMin, subtask.memory);
             result.timeMax = Math.max(result.timeMax, subtask.time);
             result.timeMin = Math.min(result.timeMin, subtask.time);
         }
+    } else if (cfg.time || cfg.memory) {
+        if (cfg.time) result.timeMax = result.timeMin = cfg.time as unknown as number;
+        if (cfg.memory) result.memoryMax = result.memoryMin = cfg.memory as unknown as number;
     }
+    if (result.memoryMax < result.memoryMin) {
+        result.memoryMax = result.memoryMin = 256;
+    }
+    if (result.timeMax < result.timeMin) {
+        result.timeMax = result.timeMin = 1000;
+    }
+    return result;
 }
 
 global.Hydro.lib.testdataConfig = { parseConfig };

packages/hydrooj/src/model/problem.ts

@@ -28,8 +28,7 @@ export class ProblemModel {
 
     static PROJECTION_PUBLIC: Field[] = [
         ...ProblemModel.PROJECTION_LIST,
-        'content', 'html', 'data', 'config', 'acMsg',
-        'additional_file',
+        'content', 'html', 'data', 'config', 'additional_file',
     ];
 
     static extend(getter: Getter) {
@@ -258,7 +257,6 @@ ProblemModel.extend((docId, pid) => ({
     additional_file: [],
     hidden: true,
     config: '',
-    acMsg: '',
     difficulty: 0,
 }));