From e94846f868b5703031f20cbe5d68dc02b569bde9 Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 29 Dec 2021 18:06:30 +0800 Subject: [PATCH] vjudge: update verdict --- packages/vjudge/package.json | 2 +- packages/vjudge/src/providers/codeforces.ts | 16 +--------------- packages/vjudge/src/providers/luogu.ts | 5 ++++- packages/vjudge/src/verdict.ts | 9 +++++++++ 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/vjudge/package.json b/packages/vjudge/package.json index b390045a1..8bec6409a 100644 --- a/packages/vjudge/package.json +++ b/packages/vjudge/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/vjudge", - "version": "1.4.7", + "version": "1.4.8", "description": "Submit problems to remote oj", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/vjudge/src/providers/codeforces.ts b/packages/vjudge/src/providers/codeforces.ts index e2ec5f4e8..e1cab7b19 100644 --- a/packages/vjudge/src/providers/codeforces.ts +++ b/packages/vjudge/src/providers/codeforces.ts @@ -9,25 +9,11 @@ import { buildContent } from 'hydrooj/src/lib/content'; import { Logger } from 'hydrooj/src/logger'; import * as setting from 'hydrooj/src/model/setting'; import { IBasicProvider, RemoteAccount } from '../interface'; +import { VERDICT } from '../verdict'; proxy(superagent); const logger = new Logger('remote/codeforces'); -const VERDICT = { - RUNTIME_ERROR: STATUS.STATUS_RUNTIME_ERROR, - WRONG_ANSWER: STATUS.STATUS_WRONG_ANSWER, - OK: STATUS.STATUS_ACCEPTED, - TIME_LIMIT_EXCEEDED: STATUS.STATUS_TIME_LIMIT_EXCEEDED, - MEMORY_LIMIT_EXCEEDED: STATUS.STATUS_MEMORY_LIMIT_EXCEEDED, - IDLENESS_LIMIT_EXCEEDED: STATUS.STATUS_TIME_LIMIT_EXCEEDED, - Accepted: STATUS.STATUS_ACCEPTED, - 'Wrong answer': STATUS.STATUS_WRONG_ANSWER, - 'Runtime error': STATUS.STATUS_RUNTIME_ERROR, - 'Time limit exceeded': STATUS.STATUS_TIME_LIMIT_EXCEEDED, - 'Memory limit exceeded': STATUS.STATUS_MEMORY_LIMIT_EXCEEDED, - 'Idleness limit exceeded': STATUS.STATUS_TIME_LIMIT_EXCEEDED, -}; - export default class CodeforcesProvider implements IBasicProvider { constructor(public account: RemoteAccount, private save: (data: any) => Promise) { if (account.cookie) this.cookie = account.cookie; diff --git a/packages/vjudge/src/providers/luogu.ts b/packages/vjudge/src/providers/luogu.ts index 4f57dd32b..aa7430353 100644 --- a/packages/vjudge/src/providers/luogu.ts +++ b/packages/vjudge/src/providers/luogu.ts @@ -30,7 +30,10 @@ const STATUS_MAP = [ STATUS.STATUS_WRONG_ANSWER, ]; -const UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36'; +const UA = [ + `Hydro/${require('hydrooj/package.json').version}`, + `Vjudge/${require('@hydrooj/vjudge/package.json').version}`, +].join(' '); export default class LuoguProvider implements IBasicProvider { constructor(public account: RemoteAccount, private save: (data: any) => Promise) { diff --git a/packages/vjudge/src/verdict.ts b/packages/vjudge/src/verdict.ts index 020198c65..dc1dcc65c 100644 --- a/packages/vjudge/src/verdict.ts +++ b/packages/vjudge/src/verdict.ts @@ -18,4 +18,13 @@ export const VERDICT = { 'EXTRA TEST PASSED': STATUS.STATUS_ACCEPTED, 'COMPILE ERROR': STATUS.STATUS_COMPILE_ERROR, 'RUNNING & JUDGING': STATUS.STATUS_JUDGING, + + Accepted: STATUS.STATUS_ACCEPTED, + 'Wrong answer': STATUS.STATUS_WRONG_ANSWER, + 'Runtime error': STATUS.STATUS_RUNTIME_ERROR, + 'Time limit exceeded': STATUS.STATUS_TIME_LIMIT_EXCEEDED, + 'Memory limit exceeded': STATUS.STATUS_MEMORY_LIMIT_EXCEEDED, + 'Idleness limit exceeded': STATUS.STATUS_TIME_LIMIT_EXCEEDED, + + 'Happy New Year!': STATUS.STATUS_ACCEPTED, // Codeforces };