Merge branch 'main' into bundle-webapp
This commit is contained in:
commit
95b79ddf64
|
@ -28,21 +28,27 @@ const getFileStream = async (filePath: string) => {
|
|||
let offset = 0;
|
||||
const readableStream = new ReadableStream<Uint8Array>({
|
||||
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
|
||||
const bytesRead = (await fs.read(
|
||||
file,
|
||||
buff,
|
||||
0,
|
||||
FILE_STREAM_CHUNK_SIZE,
|
||||
offset
|
||||
)) as unknown as number;
|
||||
offset += bytesRead;
|
||||
if (bytesRead === 0) {
|
||||
controller.close();
|
||||
} else {
|
||||
controller.enqueue(buff);
|
||||
// original types were not working correctly
|
||||
const bytesRead = (await fs.read(
|
||||
file,
|
||||
buff,
|
||||
0,
|
||||
FILE_STREAM_CHUNK_SIZE,
|
||||
offset
|
||||
)) as unknown as number;
|
||||
offset += bytesRead;
|
||||
if (bytesRead === 0) {
|
||||
controller.close();
|
||||
await fs.close(file);
|
||||
} else {
|
||||
controller.enqueue(buff);
|
||||
}
|
||||
} catch (e) {
|
||||
logError(e, 'stream pull failed');
|
||||
await fs.close(file);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "ente",
|
||||
"productName": "ente",
|
||||
"version": "2.0.0-alpha.9",
|
||||
"version": "1.6.0",
|
||||
"private": true,
|
||||
"description": "Desktop client for ente.io",
|
||||
"main": "app/index.js",
|
||||
|
|
Loading…
Reference in a new issue