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

Simplify

Browse source
This commit is contained in:
Manav Rathi 2024-05-04 10:24:37 +05:30
parent 3ca1bd7729
commit a058897c48
No known key found for this signature in database
2 changed files with 26 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
web/apps/cast/src/pages/slideshow.tsx
View file

@ -4,17 +4,15 @@ import { SlideView } from "components/Slide";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import {
createRenderableURL,
getCastCollection,
getLocalFiles,
getPreviewableImage,
isFileEligibleForCast,
syncPublicFiles,
} from "services/cast";
import { Collection } from "types/collection";
import { EnteFile } from "types/file";
const renderableFileURLCache = new Map<number, string>();
export default function Slideshow() {
const [loading, setLoading] = useState(true);
const [castToken, setCastToken] = useState<string>("");
@ -114,46 +112,23 @@ export default function Slideshow() {
const nextFile = collectionFiles[nextIndex];
const nextNextFile = collectionFiles[nextNextIndex];
let nextURL = renderableFileURLCache.get(nextFile.id);
let nextNextURL = renderableFileURLCache.get(nextNextFile.id);
if (!nextURL) {
try {
console.log("nextURL doesn't exist yet");
const blob = await getPreviewableImage(nextFile, castToken);
console.log("nextURL blobread");
const url = URL.createObjectURL(blob);
console.log("nextURL", url);
renderableFileURLCache.set(nextFile.id, url);
console.log("nextUrlCache set");
nextURL = url;
} catch (e) {
console.log("error in nextUrl", e);
return;
}
} else {
console.log("nextURL already exists");
let nextURL: string
try {
nextURL = await createRenderableURL(nextFile, castToken);
} catch (e) {
console.log("error in nextUrl", e);
return;
}
if (!nextNextURL) {
try {
console.log("nextNextURL doesn't exist yet");
const blob = await getPreviewableImage(
nextNextFile,
castToken,
);
console.log("nextNextURL blobread");
const url = URL.createObjectURL(blob);
console.log("nextNextURL", url);
renderableFileURLCache.set(nextNextFile.id, url);
console.log("nextNextURCacheL set");
nextNextURL = url;
} catch (e) {
console.log("error in nextNextURL", e);
return;
}
} else {
console.log("nextNextURL already exists");
let nextNextURL: string
try {
nextNextURL = await createRenderableURL(
nextNextFile,
castToken,
);
} catch (e) {
console.log("error in nextNextURL", e);
return;
}
setLoading(false);

10
web/apps/cast/src/services/cast.ts
View file

@ -400,6 +400,16 @@ export function mergeMetadata(files: EnteFile[]): EnteFile[] {
});
}
/**
* Create and return a new data URL that can be used to show the given
* {@link file} in our slideshow image viewer.
*
* Once we're done showing the file, the URL should be revoked using
* {@link URL.revokeObjectURL} to free up browser resources.
*/
export const createRenderableURL = async (file: EnteFile, castToken: string) =>
URL.createObjectURL(await getPreviewableImage(file, castToken));
export const getPreviewableImage = async (
file: EnteFile,
castToken: string,