Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: restore: ignore old env

Browse Source
This commit is contained in:
undefined committed 2022-09-06 13:02:46 +08:00
1 parent 53ea4e758a
commit a8111c2ecc
2 files changed
+9 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrojudge/src/flow.ts
+8 -7
View File
@@ -46,13 +46,14 @@ function judgeSubtask(subtask: NormalizedSubtask, sid: string, judgeCase: Task['
memory: 0, memory: 0,
message: '', message: '',
} : await runner(ctx, ctxSubtask, runner); } : await runner(ctx, ctxSubtask, runner);
if (!res) return; if (res?.status !== STATUS.STATUS_CANCELED) {
ctxSubtask.score = Score[ctxSubtask.subtask.type](ctxSubtask.score, res.score); ctxSubtask.score = Score[ctxSubtask.subtask.type](ctxSubtask.score, res.score);
ctxSubtask.status = Math.max(ctxSubtask.status, res.status); ctxSubtask.status = Math.max(ctxSubtask.status, res.status);
if (ctxSubtask.status > STATUS.STATUS_ACCEPTED) ctx.failed[sid] = true; if (ctxSubtask.status > STATUS.STATUS_ACCEPTED) ctx.failed[sid] = true;
ctx.total_time += res.time; ctx.total_time += res.time;
ctx.total_memory = Math.max(ctx.total_memory, res.memory); ctx.total_memory = Math.max(ctx.total_memory, res.memory);
ctx.next({ case: res, addProgress: 100 / ctx.config.count }); }
ctx.next({ ...res ? { case: res } : {}, addProgress: 100 / ctx.config.count });
})); }));
} }
try { try {
packages/hydrooj/bin/commands.ts
+1 -6
View File
@@ -63,8 +63,6 @@ if (!argv.args[0] || argv.args[0] === 'cli') {
const url = buildUrl(JSON.parse(dbConfig)); const url = buildUrl(JSON.parse(dbConfig));
const dir = `${os.tmpdir()}/${Math.random().toString(36).substring(2)}`; const dir = `${os.tmpdir()}/${Math.random().toString(36).substring(2)}`;
exec('mongodump', [url, `--out=${dir}/dump`], { stdio: 'inherit' }); exec('mongodump', [url, `--out=${dir}/dump`], { stdio: 'inherit' });
const env = `${os.homedir()}/.hydro/env`;
if (fs.existsSync(env)) fs.copySync(env, `${dir}/env`);
const target = `${process.cwd()}/backup-${new Date().toISOString().replace(':', '-').split(':')[0]}.zip`; const target = `${process.cwd()}/backup-${new Date().toISOString().replace(':', '-').split(':')[0]}.zip`;
exec('zip', ['-r', target, 'dump'], { cwd: dir, stdio: 'inherit' }); exec('zip', ['-r', target, 'dump'], { cwd: dir, stdio: 'inherit' });
if (!argv.options.dbOnly) { if (!argv.options.dbOnly) {
@@ -84,12 +82,9 @@ if (!argv.args[0] || argv.args[0] === 'cli') {
exec('unzip', [filename, '-d', dir], { stdio: 'inherit' }); exec('unzip', [filename, '-d', dir], { stdio: 'inherit' });
exec('mongorestore', [`--uri=${url}`, `--dir=${dir}/dump/hydro`, '--drop'], { stdio: 'inherit' }); exec('mongorestore', [`--uri=${url}`, `--dir=${dir}/dump/hydro`, '--drop'], { stdio: 'inherit' });
if (fs.existsSync(`${dir}/file`)) { if (fs.existsSync(`${dir}/file`)) {
exec('rm', ['-rf', '/data/file/*'], { stdio: 'inherit' }); exec('rm', ['-rf', '/data/file/hydro'], { stdio: 'inherit' });
exec('bash', ['-c', `mv ${dir}/file/* /data/file`], { stdio: 'inherit' }); exec('bash', ['-c', `mv ${dir}/file/* /data/file`], { stdio: 'inherit' });
} }
if (fs.existsSync(`${dir}/env`)) {
fs.copySync(`${dir}/env`, `${os.homedir()}/.hydro/env`, { overwrite: true });
}
fs.removeSync(dir); fs.removeSync(dir);
console.log('Successfully restored.'); console.log('Successfully restored.');
}); });