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

put2

Browse source
This commit is contained in:
Manav Rathi 2024-04-13 08:33:13 +05:30
parent f2aee30f7c
commit e8b779745d
No known key found for this signature in database
2 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/apps/photos/src/services/download/index.ts
View file

@ -128,20 +128,6 @@ class DownloadManagerImpl {
this.progressUpdater = progressUpdater;
}
private async getCachedThumbnail(fileID: number) {
try {
const cacheResp: Response = await this.thumbnailCache?.match(
fileID.toString(),
);
if (cacheResp) {
return new Uint8Array(await cacheResp.arrayBuffer());
}
} catch (e) {
log.error("failed to get cached thumbnail", e);
throw e;
}
}
private async getCachedFile(file: EnteFile): Promise<Response> {
const fileCache = this.fileCache;
if (!fileCache) return null;

39
web/packages/next/blob-cache.ts
View file

@ -60,11 +60,12 @@ export interface BlobCache {
get: (key: string) => Promise<Blob | undefined>;
match: (key: string) => Promise<Response | undefined>;
/**
* Add the given {@link key}-value ({@link data}) pair to the cache.
* Add the given {@link key}-value ({@link blob}) pair to the cache.
*/
put2: (key: string, blob: Blob) => Promise<void>;
put: (key: string, data: Response) => Promise<void>;
/**
* Delete the data corresponding to the given {@link key}.
* Delete the blob corresponding to the given {@link key}.
*
* The returned promise resolves to `true` if a cache entry was found,
* otherwise it resolves to `false`.
@ -125,11 +126,13 @@ const openWebCache = async (name: BlobCacheNamespace) => {
return {
get: async (key: string) => {
const res = await cache.match(key);
console.log("found cache hit", key, res);
return await res?.blob();
},
match: (key: string) => {
return cache.match(key);
},
put2: (key: string, blob: Blob) => cache.put(key, new Response(blob)),
put: (key: string, data: Response) => {
return cache.put(key, data);
},
@ -170,10 +173,15 @@ const openOPFSCacheWeb = async (name: BlobCacheNamespace) => {
match: (key: string) => {
return cache.match(key);
},
put2: async (key: string, blob: Blob) => {
const fileHandle = await _cache.getFileHandle(key, {
create: true,
});
const writable = await fileHandle.createWritable();
await writable.write(blob);
await writable.close();
},
put: async (key: string, data: Response) => {
// const fileHandle = await _cache.getFileHandle(key, { create: true })
// await fileHandle.write(data);
// await fileHandle.close();
await cache.put(key, data);
},
delete: (key: string) => {
@ -196,23 +204,12 @@ export async function cached(
get: () => Promise<Blob>,
): Promise<Blob> {
const cache = await openCache(cacheName);
const cacheResponse = await cache.match(id);
const cachedBlob = await cache.get(id);
if (cachedBlob) return cachedBlob;
let result: Blob;
if (cacheResponse) {
result = await cacheResponse.blob();
} else {
result = await get();
try {
await cache.put(id, new Response(result));
} catch (e) {
// TODO: handle storage full exception.
console.error("Error while storing file to cache: ", id);
}
}
return result;
const blob = await get();
await cache.put2(id, blob);
return blob;
}
/**