yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Refactor attachment downloads during export to use promises (#5294

Browse Source 
* Refactor attachment downloads during export to use promises instead of streams
Date attachments in zip file correctly

* tsc
This commit is contained in:
Tom Moor
2023-05-04 20:20:33 -04:00
committed by GitHub
parent d096ba486f
commit 9942bbee3e
6 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/queues/tasks/ExportDocumentTreeTask.ts
View File

@@ -9,7 +9,6 @@ import DocumentHelper from "@server/models/helpers/DocumentHelper";
import ZipHelper from "@server/utils/ZipHelper";
import { serializeFilename } from "@server/utils/fs";
import parseAttachmentIds from "@server/utils/parseAttachmentIds";
import { getFileByKey } from "@server/utils/s3";
import ExportTask from "./ExportTask";
export default abstract class ExportDocumentTreeTask extends ExportTask {
@@ -65,13 +64,11 @@ export default abstract class ExportDocumentTreeTask extends ExportTask {
key: attachment.key,
});
const stream = getFileByKey(attachment.key);
const dir = path.dirname(pathInZip);
if (stream) {
zip.file(path.join(dir, attachment.key), stream, {
createFolders: true,
});
}
zip.file(path.join(dir, attachment.key), attachment.buffer, {
date: attachment.updatedAt,
createFolders: true,
});
} catch (err) {
Logger.error(
`Failed to add attachment to archive: ${attachment.key}`,

11
server/queues/tasks/ExportJSONTask.ts
View File

@@ -16,7 +16,6 @@ import { CollectionJSONExport, JSONExportMetadata } from "@server/types";
import ZipHelper from "@server/utils/ZipHelper";
import { serializeFilename } from "@server/utils/fs";
import parseAttachmentIds from "@server/utils/parseAttachmentIds";
import { getFileByKey } from "@server/utils/s3";
import packageJson from "../../../package.json";
import ExportTask from "./ExportTask";
@@ -86,12 +85,10 @@ export default class ExportJSONTask extends ExportTask {
await Promise.all(
attachments.map(async (attachment) => {
try {
const stream = getFileByKey(attachment.key);
if (stream) {
zip.file(attachment.key, stream, {
createFolders: true,
});
}
zip.file(attachment.key, attachment.buffer, {
date: attachment.updatedAt,
createFolders: true,
});
output.attachments[attachment.id] = {
...omit(presentAttachment(attachment), "url"),