config

Author: undefined-moe

judger/case/yaml.js

@@ -7,17 +7,17 @@ const readAutoCases = require('./auto');
 
 const fsp = fs.promises;
 
-module.exports = async function readYamlCases(folder, name, { next }) {
-    const
-        config = {
-            checker_type: 'default',
-            count: 0,
-            subtasks: [],
-            judge_extra_files: [],
-            user_extra_files: [],
-        };
+module.exports = async function readYamlCases(folder, name, args) {
+    const config = {
+        checker_type: 'default',
+        count: 0,
+        subtasks: [],
+        judge_extra_files: [],
+        user_extra_files: [],
+    };
+    const next = args.next;
     const checkFile = ensureFile(folder);
-    let configFile = (await fsp.readFile(path.resolve(folder, name))).toString();
+    let configFile = args.config || (await fsp.readFile(path.resolve(folder, name))).toString();
 
     configFile = yaml.safeLoad(configFile);
     config.checker_type = configFile.checker_type || 'default';

judger/cases.js

@@ -25,10 +25,15 @@ async function readCases(folder, extra_config = {}, args) {
         const s = fs.statSync(path.resolve(folder, d[0]));
         if (s.isDirectory()) folder = path.resolve(folder, d[0]);
     }
-    for (const [filename, handler] of map) {
-        if (fs.existsSync(path.resolve(folder, filename))) {
-            config = await handler(folder, filename, args); // eslint-disable-line no-await-in-loop
-            break;
+    if (args.config) {
+        config = readYamlCases(folder, null, args);
+    } else {
+        for (const [filename, handler] of map) {
+            if (fs.existsSync(path.resolve(folder, filename))) {
+                // eslint-disable-next-line no-await-in-loop
+                config = await handler(folder, filename, args);
+                break;
+            }
         }
     }
     if (!config) {
@@ -39,4 +44,5 @@ async function readCases(folder, extra_config = {}, args) {
     if (config.type !== 'remotejudge' && !config.count) throw new FormatError('没有找到测试数据');
     return config;
 }
+
 module.exports = readCases;

judger/hosts/hydro.js

@@ -33,7 +33,6 @@ class JudgeTask {
             this.lang = this.request.lang;
             this.code = this.request.code;
             this.data = this.request.data;
-            this.config = this.request.config;
             this.next = this.getNext(this);
             this.end = this.getEnd(this.session, this.rid);
             this.tmpdir = path.resolve(TEMP_DIR, 'tmp', this.host, this.rid);
@@ -73,7 +72,7 @@ class JudgeTask {
         this.config = await readCases(
             this.folder,
             { detail: this.session.config.detail },
-            { next: this.next },
+            { next: this.next, config: this.request.config },
         );
         this.stat.judge = new Date();
         await judger[this.config.type || 'default'].judge(this);
@@ -88,40 +87,40 @@ class JudgeTask {
         that.nextId = 1;
         that.nextWaiting = [];
         return (data, id) => {
-            data.key = 'next';
+            data.operation = 'next';
             data.rid = that.rid;
             if (id) {
                 if (id === that.nextId) {
-                    that.session.axios.post('/judge/next', data);
+                    that.session.axios.post('/judge', data);
                     that.nextId++;
                     let t = true;
                     while (t) {
                         t = false;
                         for (const i in that.nextWaiting) {
                             if (that.nextId === that.nextWaiting[i].id) {
-                                that.session.axios.post('/judge/next', that.nextWaiting[i].data);
+                                that.session.axios.post('/judge', that.nextWaiting[i].data);
                                 that.nextId++;
                                 that.nextWaiting.splice(i, 1);
                                 t = true;
                             }
                         }
                     }
                 } else that.nextWaiting.push({ data, id });
-            } else that.session.axios.post('/judge/next', data);
+            } else that.session.axios.post('/judge', data);
         };
     }
 
     getEnd(session, rid) { // eslint-disable-line class-methods-use-this
         return (data) => {
-            data.key = 'end';
+            data.operation = 'end';
             data.rid = rid;
             log.log({
                 status: data.status,
                 score: data.score,
                 time_ms: data.time_ms,
                 memory_kb: data.memory_kb,
             });
-            session.axios.post('/judge/end', data);
+            session.axios.post('/judge', data);
         };
     }
 }