From a9c4d175280e366561f7da91445c213bb01ca364 Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 18 Aug 2022 16:26:43 +0800 Subject: [PATCH] ui: remove outdated progress api --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/ui.ts | 24 ------------------------ packages/hydrooj/src/upgrade.ts | 7 ++----- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 202f534e..0d6a9058 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "3.15.13", + "version": "3.15.14", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/ui.ts b/packages/hydrooj/src/ui.ts index f7da308f..c7609da2 100644 --- a/packages/hydrooj/src/ui.ts +++ b/packages/hydrooj/src/ui.ts @@ -2,30 +2,6 @@ import { Logger } from './logger'; import * as bus from './service/bus'; -export namespace Progress { - export class Progress { - constructor(public args) { - console.log('progress start: ', args); - } - - startItem(args) { - console.log('progress: ', this.args, args); - } - - itemDone(args) { - console.log('done: ', this.args, args); - } - - stop() { - console.log('stop', this.args); - } - } - - export function create(args) { - return new Progress(args); - } -} - async function terminate() { let hasError = false; try { diff --git a/packages/hydrooj/src/upgrade.ts b/packages/hydrooj/src/upgrade.ts index f94bf6e7..1f563cf2 100644 --- a/packages/hydrooj/src/upgrade.ts +++ b/packages/hydrooj/src/upgrade.ts @@ -29,7 +29,6 @@ import { } from './pipelineUtils'; import db from './service/db'; import storage from './service/storage'; -import { Progress } from './ui'; import { streamToBuffer } from './utils'; import welcome from './welcome'; @@ -88,10 +87,9 @@ const scripts: UpgradeScript[] = [ const ddoc = ddocs[i]; logger.info('Domain %s (%d/%d)', ddoc._id, i + 1, ddocs.length); const pdocs = await problem.getMulti(ddoc._id, { data: { $ne: null } }, ['domainId', 'docId', 'data', 'title']).toArray(); - const domainProgress = Progress.create({ items: pdocs.length, title: 'Problems', inline: true }); for (let j = 0; j < pdocs.length; j++) { const pdoc = pdocs[j]; - domainProgress.startItem(`${pdoc.docId}: ${pdoc.title}`); + console.log(`${pdoc.docId}: ${pdoc.title}`); if (!savedProgress.pdocs.includes(`${pdoc.domainId}/${pdoc.docId}`) && pdoc.data instanceof ObjectID) { try { const [file, current] = await Promise.all([ @@ -115,9 +113,8 @@ const scripts: UpgradeScript[] = [ savedProgress.pdocs.push(`${pdoc.domainId}/${pdoc.docId}`); } system.set('upgrade.file.progress.domain', JSON.stringify(savedProgress)); - domainProgress.itemDone(`${pdoc.docId}: ${pdoc.title}`); + console.log(`${pdoc.docId}: ${pdoc.title} done`); } - domainProgress.stop(); } logger.success('Files copied successfully. You can now remove collection `file` `fs.files` `fs.chunks` in the database.'); return true;