Merge branch 'main' into bundle-webapp

This commit is contained in:
Abhinav 2022-07-23 16:23:27 +05:30
commit 95b79ddf64
2 changed files with 21 additions and 15 deletions

View file

@ -28,21 +28,27 @@ const getFileStream = async (filePath: string) => {
let offset = 0; let offset = 0;
const readableStream = new ReadableStream<Uint8Array>({ const readableStream = new ReadableStream<Uint8Array>({
async pull(controller) { async pull(controller) {
const buff = new Uint8Array(FILE_STREAM_CHUNK_SIZE); try {
const buff = new Uint8Array(FILE_STREAM_CHUNK_SIZE);
// original types were not working correctly // original types were not working correctly
const bytesRead = (await fs.read( const bytesRead = (await fs.read(
file, file,
buff, buff,
0, 0,
FILE_STREAM_CHUNK_SIZE, FILE_STREAM_CHUNK_SIZE,
offset offset
)) as unknown as number; )) as unknown as number;
offset += bytesRead; offset += bytesRead;
if (bytesRead === 0) { if (bytesRead === 0) {
controller.close(); controller.close();
} else { await fs.close(file);
controller.enqueue(buff); } else {
controller.enqueue(buff);
}
} catch (e) {
logError(e, 'stream pull failed');
await fs.close(file);
} }
}, },
}); });

View file

@ -1,7 +1,7 @@
{ {
"name": "ente", "name": "ente",
"productName": "ente", "productName": "ente",
"version": "2.0.0-alpha.9", "version": "1.6.0",
"private": true, "private": true,
"description": "Desktop client for ente.io", "description": "Desktop client for ente.io",
"main": "app/index.js", "main": "app/index.js",