beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Let the caller decide

Browse source
This commit is contained in:
Manav Rathi 2024-04-23 13:07:27 +05:30
parent a286b11adb
commit 66c64d0c58
No known key found for this signature in database
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/apps/photos/src/services/upload/uploadService.ts
View file

@ -438,14 +438,12 @@ const readFileOrPath = async (
}
} else {
const path = fileOrPath;
const { stream, size } = await readStream(path);
const { response, size } = await readStream(path);
if (size > MULTIPART_PART_SIZE) {
const chunkCount = Math.ceil(size / FILE_READER_CHUNK_SIZE);
dataOrStream = { stream, chunkCount };
dataOrStream = { stream: response.body, chunkCount };
} else {
dataOrStream = new Uint8Array(
await new Response(stream).arrayBuffer(),
);
dataOrStream = new Uint8Array(await response.arrayBuffer());
}
}

14
web/apps/photos/src/utils/native-stream.ts
View file

@ -14,13 +14,17 @@
* @param path The path on the file on the user's local filesystem whose
* contents we want to stream.
*
* @return A (ReadableStream, size) tuple. The {@link ReadableStream} can be
* used to read the files contents in a streaming manner. The size value is the
* the size of the file that we'll be reading from disk.
* @return A ({@link Response}, size) tuple.
*
* * The response contains the contents of the file. In particular, the `body`
* {@link ReadableStream} property of this response can be used to read the
* files contents in a streaming manner.
*
* * The size is the size of the file that we'll be reading from disk.
*/
export const readStream = async (
path: string,
): Promise<{ stream: ReadableStream; size: number }> => {
): Promise<{ response: Response; size: number }> => {
const req = new Request(`stream://read${path}`, {
method: "GET",
});
@ -37,7 +41,7 @@ export const readStream = async (
`Got a numeric Content-Length when reading a stream. The response was ${res}`,
);
return { stream: res.body, size };
return { response: res, size };
};
/**