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

core: fix signDownloadLink

Browse Source
This commit is contained in:
undefined committed 2024-08-27 23:16:04 +08:00
1 parent e14c3584f8
commit 00b90f4456
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
packages/hydrooj/src/model/storage.ts
+6 -3
View File
@@ -104,7 +104,7 @@ export class StorageModel {
{ path: target, autoDelete: null }, { path: target, autoDelete: null },
{ $set: { lastUsage: new Date() } }, { $set: { lastUsage: new Date() } },
); );
return await storage.signDownloadLink(res.value?._id || target, filename, noExpire, useAlternativeEndpointFor); return await storage.signDownloadLink(res.value?.link || res.value?._id || target, filename, noExpire, useAlternativeEndpointFor);
} }
static async copy(src: string, dst: string) { static async copy(src: string, dst: string) {
@@ -142,7 +142,7 @@ async function cleanFiles() {
let res = await StorageModel.coll.findOneAndDelete({ autoDelete: { $lte: new Date() } }); let res = await StorageModel.coll.findOneAndDelete({ autoDelete: { $lte: new Date() } });
while (res.value) { while (res.value) {
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
await storage.del(res.value._id); if (!res.value.link) await storage.del(res.value._id);
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
res = await StorageModel.coll.findOneAndDelete({ autoDelete: { $lte: new Date() } }); res = await StorageModel.coll.findOneAndDelete({ autoDelete: { $lte: new Date() } });
} }
@@ -160,11 +160,14 @@ export function apply(ctx: Context) {
]); ]);
await StorageModel.del(problemFiles.concat(contestFiles).concat(trainingFiles).map((i) => i.path)); await StorageModel.del(problemFiles.concat(contestFiles).concat(trainingFiles).map((i) => i.path));
}); });
if (process.env.NODE_APP_INSTANCE !== '0') return;
ctx.on('ready', async () => { ctx.on('ready', async () => {
if (process.env.NODE_APP_INSTANCE !== '0') return;
await db.ensureIndexes( await db.ensureIndexes(
StorageModel.coll, StorageModel.coll,
{ key: { path: 1 }, name: 'path' },
{ key: { path: 1, autoDelete: 1 }, sparse: true, name: 'autoDelete' }, { key: { path: 1, autoDelete: 1 }, sparse: true, name: 'autoDelete' },
{ key: { link: 1 }, sparse: true, name: 'link' },
); );
if (!await ScheduleModel.count({ type: 'schedule', subType: 'storage.prune' })) { if (!await ScheduleModel.count({ type: 'schedule', subType: 'storage.prune' })) {
await ScheduleModel.add({ await ScheduleModel.add({