Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds archive uploading to add missing attachments #1506

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename MemoryWritableStream.ts => streams.ts
Spoffy committed Mar 7, 2025
commit f7cd2ac8181aee93706164e511b0b507ce8f729a
2 changes: 1 addition & 1 deletion app/server/lib/AttachmentStore.ts
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import {
ExternalStorage,
joinKeySegments,
} from 'app/server/lib/ExternalStorage';
import {MemoryWritableStream} from 'app/server/utils/MemoryWritableStream';
import {MemoryWritableStream} from 'app/server/utils/streams';
import * as fse from 'fs-extra';
import * as stream from 'node:stream';
import * as path from 'path';
File renamed without changes.
2 changes: 1 addition & 1 deletion test/server/lib/ActiveDoc.ts
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ import log from 'app/server/lib/log';
import {timeoutReached} from 'app/server/lib/serverUtils';
import {Throttle} from 'app/server/lib/Throttle';
import {createTmpDir as createTmpUploadDir, globalUploadSet} from 'app/server/lib/uploads';
import {MemoryWritableStream} from 'app/server/utils/MemoryWritableStream';
import {MemoryWritableStream} from 'app/server/utils/streams';
import {promisify} from 'bluebird';
import {assert} from 'chai';
import decompress from 'decompress';
2 changes: 1 addition & 1 deletion test/server/lib/Archive.ts
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import {
create_tar_archive,
create_zip_archive
} from 'app/server/lib/Archive';
import {MemoryWritableStream} from 'app/server/utils/MemoryWritableStream';
import {MemoryWritableStream} from 'app/server/utils/streams';
import decompress from 'decompress';
import {assert} from 'chai';
import * as stream from 'node:stream';