From 93dddbd0d52b006981b81a2d1cb1ee2c087377df Mon Sep 17 00:00:00 2001 From: undefined Date: Mon, 18 Jan 2021 12:24:28 +0800 Subject: [PATCH] =?UTF-8?q?core:=20=E4=BF=AE=E5=A4=8D=E4=BB=8Esyzoj2?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=A2=98=E7=9B=AE=E6=97=B6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE=E6=8A=93=E5=8F=96=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/import.syzoj.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index b625e1859..d85666264 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.15.22", + "version": "2.15.23", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/handler/import.syzoj.ts b/packages/hydrooj/src/handler/import.syzoj.ts index c8ed04199..f3c255dfa 100644 --- a/packages/hydrooj/src/handler/import.syzoj.ts +++ b/packages/hydrooj/src/handler/import.syzoj.ts @@ -18,7 +18,7 @@ import storage from '../service/storage'; import { isPid } from '../lib/validator'; import download from '../lib/download'; -const RE_SYZOJ = /(https?):\/\/([a-zA-Z0-9.:]+)\/(problem|p)\/([0-9]+)\/?/i; +const RE_SYZOJ = /(https?):\/\/([^/]+)\/(problem|p)\/([0-9]+)\/?/i; const logger = new Logger('import.syzoj'); class ProblemImportSYZOJHandler extends Handler { @@ -112,11 +112,12 @@ class ProblemImportSYZOJHandler extends Handler { // eslint-disable-next-line no-await-in-loop await problem.addTestdata(domainId, docId, entry.entryName, entry.getData()); } + const filename = p.file_io_input_name ? p.file_io_input_name?.split('.')[0] : null; await problem.edit(domainId, docId, { config: { time: `${p.time_limit}ms`, memory: `${p.memory_limit}m`, - filename: p.file_io_input_name.split('.')[0], + filename, type: p.type === 'traditional' ? 'default' : p.type, }, });