ui: remove outdated progress api

This commit is contained in:
undefined committed 2022-08-18 16:26:43 +08:00
1 parent 9e3f650afc
commit a9c4d17528
3 files changed
+3 -30

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "3.15.13", "version": "3.15.14",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
-24
View File
@@ -2,30 +2,6 @@
import { Logger } from './logger'; import { Logger } from './logger';
import * as bus from './service/bus'; 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() { async function terminate() {
let hasError = false; let hasError = false;
try { try {
+2 -5
View File
@@ -29,7 +29,6 @@ import {
} from './pipelineUtils'; } from './pipelineUtils';
import db from './service/db'; import db from './service/db';
import storage from './service/storage'; import storage from './service/storage';
import { Progress } from './ui';
import { streamToBuffer } from './utils'; import { streamToBuffer } from './utils';
import welcome from './welcome'; import welcome from './welcome';
@@ -88,10 +87,9 @@ const scripts: UpgradeScript[] = [
const ddoc = ddocs[i]; const ddoc = ddocs[i];
logger.info('Domain %s (%d/%d)', ddoc._id, i + 1, ddocs.length); 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 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++) { for (let j = 0; j < pdocs.length; j++) {
const pdoc = pdocs[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) { if (!savedProgress.pdocs.includes(`${pdoc.domainId}/${pdoc.docId}`) && pdoc.data instanceof ObjectID) {
try { try {
const [file, current] = await Promise.all([ const [file, current] = await Promise.all([
@@ -115,9 +113,8 @@ const scripts: UpgradeScript[] = [
savedProgress.pdocs.push(`${pdoc.domainId}/${pdoc.docId}`); savedProgress.pdocs.push(`${pdoc.domainId}/${pdoc.docId}`);
} }
system.set('upgrade.file.progress.domain', JSON.stringify(savedProgress)); 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.'); logger.success('Files copied successfully. You can now remove collection `file` `fs.files` `fs.chunks` in the database.');
return true; return true;