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

Account for processing in the timings

Browse source
This commit is contained in:
Manav Rathi 2024-05-04 17:32:02 +05:30
parent 2ae2b73c59
commit 42089403fd
No known key found for this signature in database
2 changed files with 36 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,101 +16,35 @@ export default function Slideshow() {
const pair = () => router.push("/");
useEffect(() => {
let urlGenerator: AsyncGenerator<[string, string], void>;
try {
urlGenerator = renderableImageURLs(readCastData());
} catch (e) {
log.error("Failed to prepare generator", e);
pair();
}
let stop = false;
advance(urlGenerator);
const loop = async () => {
try {
const urlGenerator = renderableImageURLs(readCastData());
while (!stop) {
const { value: urls, done } = await urlGenerator.next();
if (done) {
log.warn("Empty collection");
pair();
return;
}
const interval = window.setInterval(() => {
advance(urlGenerator);
}, 10000);
return () => clearInterval(interval);
}, []);
const advance = async (
urlGenerator: AsyncGenerator<[string, string], void>,
) => {
try {
const { value: urls, done } = await urlGenerator.next();
if (done) {
log.warn("Empty collection");
setImageURL(urls[0]);
setNextImageURL(urls[1]);
setLoading(false);
}
} catch (e) {
log.error("Failed to prepare generator", e);
pair();
return;
}
};
setImageURL(urls[0]);
setNextImageURL(urls[1]);
setLoading(false);
} catch (e) {
log.error("Failed to generate image URL", e);
pair();
}
};
void loop();
/*
const showNextSlide = async () => {
try {
console.log("showNextSlide");
const currentIndex = collectionFiles.findIndex(
(file) => file.id === currentFileId,
);
console.log(
"showNextSlide-index",
currentIndex,
collectionFiles.length,
);
const nextIndex = (currentIndex + 1) % collectionFiles.length;
const nextNextIndex = (nextIndex + 1) % collectionFiles.length;
console.log(
"showNextSlide-nextIndex and nextNextIndex",
nextIndex,
nextNextIndex,
);
const nextFile = collectionFiles[nextIndex];
const nextNextFile = collectionFiles[nextNextIndex];
let nextURL: string;
try {
nextURL = await createRenderableURL(nextFile, castToken);
} catch (e) {
console.log("error in nextUrl", e);
return;
}
let nextNextURL: string;
try {
nextNextURL = await createRenderableURL(
nextNextFile,
castToken,
);
} catch (e) {
console.log("error in nextNextURL", e);
return;
}
setLoading(false);
setCurrentFileId(nextFile.id);
// TODO: These might be the same in case the album has < 3 files
// so commenting this out for now.
// if (currentFileURL) URL.revokeObjectURL(currentFileURL);
setCurrentFileURL(nextURL);
// if (nextFileURL) URL.revokeObjectURL(nextFileURL);
setNextFileURL(nextNextURL);
} catch (e) {
console.log("error in showNextSlide", e);
}
};
*/
return () => {
stop = true;
};
}, []);
if (loading) return <PairedSuccessfullyOverlay />;

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

@ -9,6 +9,7 @@ import { CustomError, parseSharingErrorCodes } from "@ente/shared/error";
import HTTPService from "@ente/shared/network/HTTPService";
import { getCastFileURL, getEndpoint } from "@ente/shared/network/api";
import localForage from "@ente/shared/storage/localForage";
import { wait } from "@ente/shared/utils";
import { detectMediaMIMEType } from "services/detect-type";
import { Collection, CollectionPublicMagicMetadata } from "types/collection";
import {
@ -107,6 +108,13 @@ export const renderableImageURLs = async function* (castData: CastData) {
*/
const urls: string[] = [""];
let i = 0;
/**
* Time when we last yielded.
*
* We use this to keep an roughly periodic spacing between yields that
* accounts for the time we spend fetching and processing the images.
*/
let lastYieldTime = Date.now();
while (true) {
const collection = await getCastCollection(castToken, collectionKey);
@ -136,6 +144,11 @@ export const renderableImageURLs = async function* (castData: CastData) {
ensure(urls[0]),
ensure(urls[1]),
];
const elapsedTime = Date.now() - lastYieldTime;
if (elapsedTime < 10000) await wait(10000 - elapsedTime);
lastYieldTime = Date.now();
yield urlPair;
}