From 1210957a2a1f8bb74d54a5fd9888b5e88a227143 Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 5 Oct 2022 17:20:37 +0800 Subject: [PATCH] bug fixes --- packages/fps-importer/index.ts | 1 - packages/hydrojudge/src/hosts/builtin.ts | 5 ++--- packages/hydrojudge/src/service.ts | 5 ++--- packages/migrate/scripts/syzoj.ts | 10 ++++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/fps-importer/index.ts b/packages/fps-importer/index.ts index 7cb13cb0..956cdaa0 100644 --- a/packages/fps-importer/index.ts +++ b/packages/fps-importer/index.ts @@ -127,7 +127,6 @@ class FpsProblemImportHandler extends Handler { } } -export const sideEffect = true; export async function apply(ctx: Context) { ctx.Route('problem_import_fps', '/problem/import/fps', FpsProblemImportHandler, PERM.PERM_CREATE_PROBLEM); ctx.inject('ProblemAdd', 'problem_import_fps', { icon: 'copy', text: 'From FPS File' }); diff --git a/packages/hydrojudge/src/hosts/builtin.ts b/packages/hydrojudge/src/hosts/builtin.ts index dec42390..2b872625 100644 --- a/packages/hydrojudge/src/hosts/builtin.ts +++ b/packages/hydrojudge/src/hosts/builtin.ts @@ -4,17 +4,16 @@ import path from 'path'; import fs from 'fs-extra'; import type { JudgeResultBody } from 'hydrooj'; import { - Logger, SettingModel, StorageModel, SystemModel, TaskModel, + SettingModel, StorageModel, SystemModel, TaskModel, } from 'hydrooj'; import { end, next } from 'hydrooj/src/handler/judge'; import { processTestdata } from '../cases'; import { getConfig } from '../config'; import { FormatError, SystemError } from '../error'; import { Context } from '../judge/interface'; +import logger from '../log'; import { JudgeTask } from '../task'; -const logger = new Logger('judge'); - const session = { config: { detail: SystemModel.get('hydrojudge.detail') }, async fetchFile(name: string) { diff --git a/packages/hydrojudge/src/service.ts b/packages/hydrojudge/src/service.ts index a1d7c47c..bb64dd41 100644 --- a/packages/hydrojudge/src/service.ts +++ b/packages/hydrojudge/src/service.ts @@ -16,7 +16,6 @@ declare module 'hydrooj' { } export function apply(ctx: Context) { - if (process.env.NODE_APP_INSTANCE === '0') { - ctx.once('app/started', () => require('./hosts/builtin').postInit()); - } + if (process.env.NODE_APP_INSTANCE !== '0') return; + ctx.once('app/started', () => require('./hosts/builtin').postInit()); } diff --git a/packages/migrate/scripts/syzoj.ts b/packages/migrate/scripts/syzoj.ts index 6b1dd4e4..d2e90913 100644 --- a/packages/migrate/scripts/syzoj.ts +++ b/packages/migrate/scripts/syzoj.ts @@ -370,10 +370,11 @@ export async function run({ const ddocs = await query('SELECT * FROM `article`'); const didMap = {}; for (const ddoc of ddocs) { + const _id = Time.getObjectID(new Date(ddoc.public_time * 1000), false); const data: Partial = { - _id: Time.getObjectID(new Date(ddoc.public_time * 1000), false), + _id, docType: DocumentModel.TYPE_DISCUSSION, - docId: Time.getObjectID(new Date(ddoc.public_time * 1000), false), + docId: _id, owner: uidMap[ddoc.user_id] || 0, title: ddoc.title, content: ddoc.content, @@ -401,10 +402,11 @@ export async function run({ */ const drdocs = await query('SELECT * FROM `article_comment`'); for (const drdoc of drdocs) { + const _id = Time.getObjectID(new Date(drdoc.public_time * 1000), false); const data: Partial = { - _id: Time.getObjectID(new Date(drdoc.public_time * 1000), false), + _id, domainId, - docId: Time.getObjectID(new Date(drdoc.public_time * 1000), false), + docId: _id, docType: DocumentModel.TYPE_DISCUSSION_REPLY, content: drdoc.content, owner: uidMap[drdoc.user_id],