Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

vjudge: handle same-code-submission

Browse Source
This commit is contained in:
undefined committed 2021-06-22 12:32:47 +08:00
1 parent 918a97f280
commit a09d7b4b70
4 files changed
+13 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/vjudge/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@hydrooj/vjudge", "name": "@hydrooj/vjudge",
"version": "1.0.10", "version": "1.0.11",
"description": "Submit problems to remote oj", "description": "Submit problems to remote oj",
"main": "package.json", "main": "package.json",
"repository": "https://github.com/hydro-dev/Hydro.git", "repository": "https://github.com/hydro-dev/Hydro.git",
packages/vjudge/src/interface.ts
+1 -1
View File
@@ -25,7 +25,7 @@ export interface IBasicProvider {
content: string; content: string;
}>; }>;
listProblem(page: number): Promise<string[]>; listProblem(page: number): Promise<string[]>;
submitProblem(id: string, lang: string, code: string): Promise<string>; submitProblem(id: string, lang: string, code: string, info): Promise<string>;
waitForSubmission(id: string, next: any, end: any): Promise<void>; waitForSubmission(id: string, next: any, end: any): Promise<void>;
} }
packages/vjudge/src/model.ts
+1 -1
View File
@@ -26,7 +26,7 @@ class Service {
} }
async judge(task) { async judge(task) {
const rid = await this.api.submitProblem(task.target, task.lang, task.code); const rid = await this.api.submitProblem(task.target, task.lang, task.code, task);
const next = (payload) => Judge.next({ ...payload, rid: task.rid }); const next = (payload) => Judge.next({ ...payload, rid: task.rid });
const end = (payload) => Judge.end({ ...payload, rid: task.rid }); const end = (payload) => Judge.end({ ...payload, rid: task.rid });
await this.api.waitForSubmission(rid, next, end); await this.api.waitForSubmission(rid, next, end);
packages/vjudge/src/providers/codeforces.ts
+10 -3
View File
@@ -4,6 +4,7 @@ import { JSDOM } from 'jsdom';
import { STATUS } from '@hydrooj/utils/lib/status'; import { STATUS } from '@hydrooj/utils/lib/status';
import { sleep } from '@hydrooj/utils/lib/utils'; import { sleep } from '@hydrooj/utils/lib/utils';
import { buildContent } from 'hydrooj/dist/lib/content'; import { buildContent } from 'hydrooj/dist/lib/content';
import * as setting from 'hydrooj/dist/model/setting';
import { Logger } from 'hydrooj/dist/logger'; import { Logger } from 'hydrooj/dist/logger';
import { PassThrough } from 'stream'; import { PassThrough } from 'stream';
import { IBasicProvider, RemoteAccount } from '../interface'; import { IBasicProvider, RemoteAccount } from '../interface';
@@ -189,8 +190,14 @@ export default class CodeforcesProvider implements IBasicProvider {
return Array.from($dom.window.document.querySelectorAll('.id>a')).map((i) => `P${i.innerHTML.trim()}`); return Array.from($dom.window.document.querySelectorAll('.id>a')).map((i) => `P${i.innerHTML.trim()}`);
} }
async submitProblem(id: string, lang: string, code: string) { async submitProblem(id: string, lang: string, code: string, info) {
const programTypeId = lang.includes('codeforces.') ? lang.split('codeforces.')[1] : '42'; const programTypeId = lang.includes('codeforces.') ? lang.split('codeforces.')[1] : '42';
const comment = setting.langs[lang].comment;
if (comment) {
const msg = `Hydro submission #${info.rid}@${new Date().getTime()}`;
if (typeof comment === 'string') code = `${comment} ${msg}\n${code}`;
else if (comment instanceof Array) code = `${comment[0]} ${msg} ${comment[1]}\n${code}`;
}
const [, contestId, submittedProblemIndex] = id.startsWith('P921') const [, contestId, submittedProblemIndex] = id.startsWith('P921')
? ['', '921', id.split('P921')[1]] ? ['', '921', id.split('P921')[1]]
: /^P(\d+)([A-Z][0-9]*)$/.exec(id); : /^P(\d+)([A-Z][0-9]*)$/.exec(id);
@@ -210,8 +217,8 @@ export default class CodeforcesProvider implements IBasicProvider {
_tta: 594, _tta: 594,
sourceCodeConfirmed: true, sourceCodeConfirmed: true,
}); });
const { text: info } = await this.get('/problemset/status?my=on'); const { text: status } = await this.get('/problemset/status?my=on');
const $dom = new JSDOM(info); const $dom = new JSDOM(status);
this.csrf = $dom.window.document.querySelector('meta[name="X-Csrf-Token"]').getAttribute('content'); this.csrf = $dom.window.document.querySelector('meta[name="X-Csrf-Token"]').getAttribute('content');
return $dom.window.document.querySelector('[data-submission-id]').getAttribute('data-submission-id'); return $dom.window.document.querySelector('[data-submission-id]').getAttribute('data-submission-id');
} }