From 2f87c3cf5a36cfcd09070ad7b50d7607c5d5b517 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Mon, 6 May 2024 11:50:03 +0530 Subject: [PATCH] Debug 2 --- web/apps/cast/src/pages/slideshow.tsx | 2 +- web/apps/cast/src/services/cast.ts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/apps/cast/src/pages/slideshow.tsx b/web/apps/cast/src/pages/slideshow.tsx index 75ef0827f..98426a857 100644 --- a/web/apps/cast/src/pages/slideshow.tsx +++ b/web/apps/cast/src/pages/slideshow.tsx @@ -46,7 +46,7 @@ export default function Slideshow() { }; }, []); - log.info("Rendering slideshow", { loading, imageURL, nextImageURL }); + console.log("Rendering slideshow", { loading, imageURL, nextImageURL }); if (loading) return ; diff --git a/web/apps/cast/src/services/cast.ts b/web/apps/cast/src/services/cast.ts index 8ead8962a..75ab743f3 100644 --- a/web/apps/cast/src/services/cast.ts +++ b/web/apps/cast/src/services/cast.ts @@ -7,7 +7,7 @@ import { shuffled } from "@/utils/array"; import { ensure, ensureString } from "@/utils/ensure"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import HTTPService from "@ente/shared/network/HTTPService"; -import { getCastFileURL, getEndpoint } from "@ente/shared/network/api"; +import { getCastFileURL, getCastThumbnailURL, getEndpoint } from "@ente/shared/network/api"; import { wait } from "@ente/shared/utils"; import { detectMediaMIMEType } from "services/detect-type"; import { @@ -140,7 +140,8 @@ export const renderableImageURLs = async function* (castData: CastData) { if (urls.length < 4) continue; const oldestURL = urls.shift(); - if (oldestURL && i !== 1) URL.revokeObjectURL(oldestURL); + console.log("Not revoking", oldestURL); + // if (oldestURL && i !== 1) URL.revokeObjectURL(oldestURL); i += 1; const urlPair: RenderableImageURLPair = [ @@ -298,7 +299,7 @@ const downloadFile = async (castToken: string, file: EnteFile) => { if (!isImageOrLivePhoto(file)) throw new Error("Can only cast images and live photos"); - const url = getCastFileURL(file.id); + const url = getCastThumbnailURL(file.id); const resp = await HTTPService.get( url, null, @@ -312,7 +313,7 @@ const downloadFile = async (castToken: string, file: EnteFile) => { const cryptoWorker = await ComlinkCryptoWorker.getInstance(); const decrypted = await cryptoWorker.decryptFile( new Uint8Array(resp.data), - await cryptoWorker.fromB64(file.file.decryptionHeader), + await cryptoWorker.fromB64(file.thumbnail.decryptionHeader), file.key, ); return new Response(decrypted).blob();