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

fix in-memory cache checked before download

Browse source
This commit is contained in:
Abhinav 2023-12-07 12:52:14 +05:30
parent dfcf91b8ae
commit 92c52e4237
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/photos/src/services/download/index.ts
View file

@ -222,15 +222,12 @@ class DownloadManager {
async getFile(
file: EnteFile,
useCache = false
cacheInMemory = false
): Promise<ReadableStream<Uint8Array>> {
try {
if (!this.ready) {
throw Error(CustomError.DOWNLOAD_MANAGER_NOT_READY);
}
if (!useCache) {
return await this.downloadFile(file);
}
const getFilePromise = async (): Promise<SourceURLs> => {
const fileStream = await this.downloadFile(file);
const fileBlob = await new Response(fileStream).blob();
@ -250,14 +247,14 @@ class DownloadManager {
} else {
return await this.downloadFile(file);
}
} else if (!cacheInMemory) {
return await this.downloadFile(file);
} else {
const fileURLs = getFilePromise();
this.fileObjectURLPromises.set(file.id, fileURLs);
}
} catch (e) {
if (useCache) {
this.fileObjectURLPromises.delete(file.id);
}
this.fileObjectURLPromises.delete(file.id);
logError(e, 'download manager getFile Failed');
throw e;
}
@ -267,6 +264,7 @@ class DownloadManager {
file: EnteFile
): Promise<ReadableStream<Uint8Array>> {
try {
addLogLine(`download attempted for fileID:${file.id}`);
const onDownloadProgress = this.trackDownloadProgress(
file.id,
file.info?.fileSize